cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/2] git commit: updated refs/heads/4.7 to 2d68893
Date Mon, 11 Apr 2016 12:44:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.7 f33b4a1b6 -> 2d68893ee


Improve ordering of fields of VPC router detail tab

The field we use most are now on the top:
- name
- state
- hypervisor
- link local ip
- redundant state

The other fields are nice, but not needed most of the time.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2fdab07
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2fdab07
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2fdab07

Branch: refs/heads/4.7
Commit: d2fdab0750468e21fda350bbed8f9d1d2c3f262f
Parents: a243339
Author: Remi Bergsma <github@remi.nl>
Authored: Sun Feb 21 20:20:56 2016 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Sun Feb 21 20:26:46 2016 +0100

----------------------------------------------------------------------
 ui/scripts/network.js | 50 +++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2fdab07/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index bb599fd..f4e0f9a 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -5838,15 +5838,36 @@
                                         label: 'label.name'
                                     }
                                 }, {
+                                    state: {
+                                        label: 'label.state'
+                                    },
+                                    hostname: {
+                                        label: 'label.host'
+                                    },
+                                    linklocalip: {
+                                        label: 'label.linklocal.ip'
+                                    },
+                                    isredundantrouter: {
+                                        label: 'label.redundant.router',
+                                        converter: function(booleanValue) {
+                                            if (booleanValue == true) {
+                                                return "Yes";
+                                            }
+                                            return "No";
+                                        }
+                                    },
+                                    redundantstate: {
+                                        label: 'label.redundant.state'
+                                    },
                                     id: {
                                         label: 'label.id'
                                     },
+                                    serviceofferingname: {
+                                        label: 'label.service.offering'
+                                    },
                                     zonename: {
                                         label: 'label.zone'
                                     },
-                                    dns1: {
-                                        label: 'label.dns'
-                                    },
                                     gateway: {
                                         label: 'label.gateway'
                                     },
@@ -5856,26 +5877,8 @@
                                     guestipaddress: {
                                         label: 'label.guest.ip'
                                     },
-                                    linklocalip: {
-                                        label: 'label.linklocal.ip'
-                                    },
-                                    hostname: {
-                                        label: 'label.host'
-                                    },
-                                    state: {
-                                        label: 'label.state'
-                                    },
-                                    serviceofferingname: {
-                                        label: 'label.service.offering'
-                                    },
-                                    isredundantrouter: {
-                                        label: 'label.redundant.router',
-                                        converter: function(booleanValue) {
-                                            if (booleanValue == true) {
-                                                return "Yes";
-                                            }
-                                            return "No";
-                                        }
+                                    dns1: {
+                                        label: 'label.dns'
                                     },
                                     account: {
                                         label: 'label.account'
@@ -5884,6 +5887,7 @@
                                         label: 'label.domain'
                                     }
                                 }],
+
                                 dataProvider: function(args) {
                                     $.ajax({
                                         url: createURL("listRouters&listAll=true&vpcid="
+ args.context.vpc[0].id),


Mime
View raw message