From bd026c50a705eae1033c7c3a7c93c22c9e3370fc Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 23 Jan 2012 12:22:57 -0800 Subject: [PATCH] cloudstack 3.0 new UI - network page - IP address page - detailView - add Elastic and VirtualMachine. --- ui/scripts/network.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 30c3b1ae16b..916923bbd4a 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -584,7 +584,8 @@ } }, zonename: { label: 'Zone' }, - vlanname: { label: 'VLAN' }, + //vlanname: { label: 'VLAN' }, + iselastic: { label: 'Elastic', converter: cloudStack.converters.toBooleanText }, account: { label: 'Account' }, state: { label: 'State', indicator: { 'Allocated': 'on', 'Released': 'off' } } }, @@ -999,12 +1000,10 @@ account: { label: 'Account' }, zonename: { label: 'Zone' }, vlanname: { label: 'VLAN' }, - issourcenat: { label: 'Source NAT', isBoolean: true, converter: function(value) { - return value ? 'Yes' : 'No'; - } }, - isstaticnat: { label: 'Static NAT', isBoolean: true, converter: function(value) { - return value ? 'Yes' : 'No'; - } } + issourcenat: { label: 'Source NAT', converter: cloudStack.converters.toBooleanText }, + isstaticnat: { label: 'Static NAT', converter: cloudStack.converters.toBooleanText }, + iselastic: { label: 'Elastic', converter: cloudStack.converters.toBooleanText }, + virtualmachinedisplayname: { label: 'Virtual machine' } } ],