You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/08/15 20:43:38 UTC

git commit: cloudstack 3.0 UI - IP Address page - detailView - Network Name is referring to name of associated network.

Updated Branches:
  refs/heads/master dc07b2e3e -> 07efdb640


cloudstack 3.0 UI - IP Address page - detailView - Network Name is referring to name of associated network.


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

Branch: refs/heads/master
Commit: 07efdb6409427eaddc54f509b149a40b34005445
Parents: dc07b2e
Author: Jessica Wang <je...@citrix.com>
Authored: Wed Aug 15 11:25:39 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Wed Aug 15 11:41:38 2012 -0700

----------------------------------------------------------------------
 ui/scripts/network.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/07efdb64/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 65917f6..a1bf726 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1658,11 +1658,11 @@
                     ipaddress: { label: 'IP' }
                   },
                   {
-                    id: { label: 'label.id' },
-                    networkname: { label: 'label.network.name' },
-                    networkid: { label: 'label.network.id' },
+                    id: { label: 'label.id' },    
                     associatednetworkid: { label: 'label.associated.network.id' },
+										networkname: { label: 'Associated Network' },
                     state: { label: 'label.state' },
+										networkid: { label: 'label.network.id' },
                     issourcenat: { label: 'label.source.nat', converter: cloudStack.converters.toBooleanText },
                     isstaticnat: { label: 'label.static.nat', converter: cloudStack.converters.toBooleanText },
                     issystem: { label: 'label.is.system', converter: cloudStack.converters.toBooleanText }, //(basic zone only)