Closes-Bug: #1469454 - Performance/Usability Issues and code cleanup

Change-Id: I919f37b8962cf5f41cca4dc8ccb2529818c15d03
Juniper · Jun 27, 2015 · 8e54b3c · 8e54b3c
1 parent 46d92f5
commit 8e54b3c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/webroot/common/ui/js/sm.detail.tmpls.js b/webroot/common/ui/js/sm.detail.tmpls.js
@@ -36,20 +36,6 @@ define([
                                     title: smwl.TITLE_OPENSTACK,
                                     theme: detailTheme,
                                     templateGeneratorConfig: [
-                                        {
-                                            key: 'parameters.openstack_mgmt_ip',
-                                            templateGenerator: 'LinkGenerator',
-                                            templateGeneratorConfig: {
-                                                template: 'http://{{params.openstack_mgmt_ip}}/horizon',
-                                                params: {
-                                                    openstack_mgmt_ip: 'parameters.openstack_mgmt_ip'
-                                                }
-                                            }
-                                        },
-                                        {
-                                            key: 'parameters.keystone_ip',
-                                            templateGenerator: 'TextGenerator'
-                                        },
                                         {
                                             key: 'parameters.keystone_tenant',
                                             templateGenerator: 'TextGenerator'
@@ -65,6 +51,20 @@ define([
                                         {
                                             key: 'parameters.keystone_region_name',
                                             templateGenerator: 'TextGenerator'
+                                        },
+                                        {
+                                            key: 'parameters.openstack_mgmt_ip',
+                                            templateGenerator: 'LinkGenerator',
+                                            templateGeneratorConfig: {
+                                                template: 'http://{{params.openstack_mgmt_ip}}/horizon',
+                                                params: {
+                                                    openstack_mgmt_ip: 'parameters.openstack_mgmt_ip'
+                                                }
+                                            }
+                                        },
+                                        {
+                                            key: 'parameters.keystone_ip',
+                                            templateGenerator: 'TextGenerator'
                                         }
                                     ]
                                 },

diff --git a/webroot/common/ui/js/sm.grid.config.js b/webroot/common/ui/js/sm.grid.config.js
@@ -251,7 +251,7 @@ define([
                         if ($.isEmptyObject(dc.roles)) {
                             return ''
                         } else {
-                            return (dc.roles.indexOf(roleValue) != -1) ? '<i class="icon-ok green"></i>' : '';
+                            return (dc.roles.indexOf(roleValue) != -1) ? '<i class="icon-ok green cursor-default"></i>' : '';
                         }
                     },
                     exportConfig: {

diff --git a/webroot/setting/sm/ui/js/views/ClusterTabView.js b/webroot/setting/sm/ui/js/views/ClusterTabView.js
@@ -32,6 +32,7 @@ define([
                                 view: "TabsView",
                                 viewConfig: {
                                     theme: 'overcast',
+                                    active: 1,
                                     activate: function (e, ui) {
                                         var selTab = $(ui.newTab.context).text();
                                         if (selTab == smwl.TITLE_SERVERS) {