From e4b4f5b470cecb019ed61a90904bad65a90efda5 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 11 Apr 2012 11:31:21 -0700 Subject: [PATCH] cloudstack 3.0 UI - infrastructure - physical network - network service providers - SRX - devices - change breadcrumb to show Devices instead of SRX (to distinguish between provider and devices). --- .../WEB-INF/classes/resources/messages.properties | 1 + ui/index.jsp | 3 ++- ui/scripts/system.js | 15 ++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 0b32b0ee820..797683de6c6 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -10,6 +10,7 @@ label.console.proxy=Console proxy label.secondary.storage.vm=Secondary storage VM label.add.netScaler.device=Add Netscaler device label.add.F5.device=Add F5 device +label.add.SRX.device=Add SRX device #new labels (end) ************************************************************************************************ diff --git a/ui/index.jsp b/ui/index.jsp index c93bfc15a8e..889b872906e 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -2930,6 +2930,7 @@ dictionary = { 'label.console.proxy' : '', 'label.secondary.storage.vm' : '', 'label.add.netScaler.device': '', -'label.add.F5.device': '' +'label.add.F5.device': '', +'label.add.SRX.device': '' }; diff --git a/ui/scripts/system.js b/ui/scripts/system.js index d144f5319a0..f4efea440dd 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -2815,9 +2815,9 @@ }, actions: { add: { - label: 'label.add.new.SRX', + label: 'label.add.SRX.device', createForm: { - title: 'label.add.new.SRX', + title: 'label.add.SRX.device', fields: { ip: { label: 'label.ip.address' @@ -2926,7 +2926,7 @@ }, messages: { notification: function(args) { - return 'label.add.new.SRX'; + return 'label.add.SRX.device'; } }, notification: { @@ -4399,9 +4399,10 @@ } }, + //SRX devices listView srxProviders: { id: 'srxProviders', - title: 'label.srx', + title: 'label.devices', listView: { id: 'srxProviders', fields: { @@ -4411,9 +4412,9 @@ }, actions: { add: { - label: 'label.add.new.SRX', + label: 'label.add.SRX.device', createForm: { - title: 'label.add.new.SRX', + title: 'label.add.SRX.device', fields: { ip: { label: 'label.ip.address' @@ -4522,7 +4523,7 @@ }, messages: { notification: function(args) { - return 'label.add.new.SRX'; + return 'label.add.SRX.device'; } }, notification: {