[PATCH conductor] BZ787810: Display availability status of providers and realms
ifarkas at redhat.com
ifarkas at redhat.com
Fri Feb 10 14:38:45 UTC 2012
From: Imre Farkas <ifarkas at redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=787810
---
src/app/helpers/provider_realms_helper.rb | 7 ++++++-
src/app/views/provider_realms/_list.html.haml | 1 +
src/app/views/provider_realms/show.html.haml | 5 +++++
.../providers/_provider_availability.html.haml | 4 ++++
src/app/views/providers/edit.html.haml | 1 +
src/app/views/providers/show.html.haml | 1 +
src/config/locales/en.yml | 6 ++++++
7 files changed, 24 insertions(+), 1 deletions(-)
create mode 100644 src/app/views/providers/_provider_availability.html.haml
diff --git a/src/app/helpers/provider_realms_helper.rb b/src/app/helpers/provider_realms_helper.rb
index 5a4151e..9c36f0b 100644
--- a/src/app/helpers/provider_realms_helper.rb
+++ b/src/app/helpers/provider_realms_helper.rb
@@ -16,7 +16,12 @@
module ProviderRealmsHelper
def provider_realms_header
[
- {:name => t("realms.index.realm_name"), :sort_attr => :name}
+ {:name => t("realms.index.realm_name"), :sort_attr => :name},
+ {:name => t("realms.index.realm_availability")}
]
end
+
+ def availability_label(available)
+ available ? t('realms.index.realm_available.true_value') : t('realms.index.realm_available.false_value')
+ end
end
diff --git a/src/app/views/provider_realms/_list.html.haml b/src/app/views/provider_realms/_list.html.haml
index 82d3732..4ac5741 100644
--- a/src/app/views/provider_realms/_list.html.haml
+++ b/src/app/views/provider_realms/_list.html.haml
@@ -21,3 +21,4 @@
= filter_table(provider_realms_header, @realms) do |realm|
%tr{:class => cycle('nostripe','stripe')}
%td= link_to realm.name, provider_realm_path(realm)
+ %td= availability_label(realm.available)
diff --git a/src/app/views/provider_realms/show.html.haml b/src/app/views/provider_realms/show.html.haml
index 041b199..afa895a 100644
--- a/src/app/views/provider_realms/show.html.haml
+++ b/src/app/views/provider_realms/show.html.haml
@@ -2,6 +2,11 @@
%header.admin-page-header
%h1{:class => controller.controller_name}= @realm.name
+- unless @realm.available
+ %section.admin-content-section
+ %header.align-center
+ %h2.disabled= t('realms.show.realm_unavailable', :name => @realm.name)
+
%section.admin-content-section.realm
%header
%h2= t'realms.show.properties'
diff --git a/src/app/views/providers/_provider_availability.html.haml b/src/app/views/providers/_provider_availability.html.haml
new file mode 100644
index 0000000..7969389
--- /dev/null
+++ b/src/app/views/providers/_provider_availability.html.haml
@@ -0,0 +1,4 @@
+- unless @provider.available
+ %section.admin-content-section
+ %header.align-center
+ %h2.disabled= t('providers.edit.provider_unavailable', :name => @provider.name)
diff --git a/src/app/views/providers/edit.html.haml b/src/app/views/providers/edit.html.haml
index 671aace..86d3301 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -1,5 +1,6 @@
= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
+= render :partial => 'provider_availability'
- unless @provider.enabled
%section.admin-content-section
diff --git a/src/app/views/providers/show.html.haml b/src/app/views/providers/show.html.haml
index 2a9896e..0bb23ec 100644
--- a/src/app/views/providers/show.html.haml
+++ b/src/app/views/providers/show.html.haml
@@ -1,5 +1,6 @@
= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
+= render :partial => 'provider_availability'
%section.admin-content-section.provider
%header
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 822962d..08a69f2 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -528,6 +528,10 @@ en:
index:
realm: Realm
realm_name: Realm Name
+ realm_availability: Available?
+ realm_available:
+ true_value: "Yes"
+ false_value: "No"
tab_captions:
properties: Properties
mapping: Mapping
@@ -553,6 +557,7 @@ en:
properties: Properties
realm_mapping: Realm Mapping
sure_to_delete: Are you sure you want to delete?
+ realm_unavailable: "The realm %{name} is currently not available."
flash:
notice:
added_mapping: "Realm mapping was added."
@@ -969,6 +974,7 @@ en:
toggle_alerts: Toggle Alerts
provider_disabled: "The provider %{name} is currently disabled."
enable_configure_providers: "To enable and configure provider, click the slide switch in the upper-right-hand corner of this window."
+ provider_unavailable: "The provider %{name} is currently not available."
form:
x_deltacloud_provider: "X-Deltacloud-Provider:"
provider_name: "Provider Name:"
--
1.7.6.5
More information about the aeolus-devel
mailing list