Better network provider status UI handling

brogue · brogue · commit fc6c6fb5cbbd · 2011-11-21T15:23:47.000-08:00
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
@@ -3701,7 +3701,7 @@ Dialogs*/
   background-position: -6px -459px;
 }
 
-.zone-chart .resources.naas .system-main .network-providers li.shutdown .status {
+.zone-chart .resources.naas .system-main .network-providers li.disabled .status {
   background-position: -7px -495px;
 }
 
diff --git a/ui/scripts-test/system.js b/ui/scripts-test/system.js
@@ -241,13 +241,19 @@
         statusCheck: function(args) {
           return {
             virtualRouter: 'enabled',
-            netscaler: 'disabled',
-            f5: 'enabled',
+            netscaler: 'not-configured',
+            f5: 'disabled',
             srx: 'enabled',
             securityGroups: 'enabled'
           };
         },
 
+        statusLabels: {
+          enabled: 'Enabled',
+          'not-configured': 'Not setup',
+          disabled: 'Disabled'
+        },
+
         types: {
           // Virtual router list view
           virtualRouter: {
diff --git a/ui/scripts/ui-custom/zoneChart.js b/ui/scripts/ui-custom/zoneChart.js
@@ -75,6 +75,8 @@
 
         $.each(naas.networkProviders.types, function(name, type) {
           var status = networkStatus[name];
+          var statusLabel = naas.networkProviders.statusLabels ? 
+                naas.networkProviders.statusLabels[status] : {};
 
           var $item = $('<li>').addClass('provider')
                 .attr('rel', name)
@@ -83,7 +85,9 @@
                 .appendTo($networkProviders)
                 .append($('<div>').addClass('name').html(type.label))
                 .append($('<div>').addClass('status')
-                        .append($('<span>').html(status)))
+                        .append($('<span>').html(
+                          statusLabel ? statusLabel : status
+                        )))
                 .append($('<div>').addClass('view-all configure').html('Configure'));
         });
 
@@ -348,7 +352,7 @@
                     title: itemName + ' details',
                     maximizeIfSelected: true,
                     complete: function($newPanel) {
-                      if (status == 'disabled') {
+                      if (status == 'not-configured') {
                         // Create form
                         var formData = cloudStack.dialog.createForm({
                           form: createForm,

Original file line number	Diff line number	Diff line change
`@@ -3701,7 +3701,7 @@ Dialogs*/`
`3701`	`3701`	`background-position: -6px -459px;`
`3702`	`3702`	`}`
`3703`	`3703`
`3704`		`-.zone-chart .resources.naas .system-main .network-providers li.shutdown .status {`
	`3704`	`+.zone-chart .resources.naas .system-main .network-providers li.disabled .status {`
`3705`	`3705`	`background-position: -7px -495px;`
`3706`	`3706`	`}`
`3707`	`3707`