diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 7f94636d687..dfb9dea1f9e 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,6 +1,7 @@
#new labels (begin) **********************************************************************************************
label.management.ips=Management IP Addresses
label.devices=Devices
+label.rules=Rules
#new labels (end) ************************************************************************************************
diff --git a/ui/index.jsp b/ui/index.jsp
index 08b6dcd8aa0..6fa021e5e4c 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2913,6 +2913,7 @@ dictionary = {
'label.action.delete.physical.network': '',
'message.action.delete.physical.network': '',
'label.physical.network': '',
-'label.devices': ''
+'label.devices': '',
+'label.rules': ''
};
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 5ce0421542f..9308a0b8ccb 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -63,7 +63,7 @@
var zoneObjs, podObjs, clusterObjs, domainObjs, networkOfferingObjs, physicalNetworkObjs;
var selectedClusterObj, selectedZoneObj, selectedPublicNetworkObj, selectedManagementNetworkObj, selectedPhysicalNetworkObj, selectedGuestNetworkObj;
var nspMap = {}; //from listNetworkServiceProviders API
- var networkProviderData = []; //for service providers listView (hardcoding, not from listNetworkServiceProviders API)
+ var nspArray = []; //for service providers listView (hardcoding, not from listNetworkServiceProviders API)
var getTrafficType = function(physicalNetwork, typeID) {
var trafficType = {};
@@ -316,7 +316,7 @@
}
});
- networkProviderData = [
+ nspArray = [
{
id: 'netscaler',
name: 'NetScaler',
@@ -330,7 +330,7 @@
];
if(selectedZoneObj.networktype == "Basic") {
- networkProviderData.push(
+ nspArray.push(
{
id: 'securityGroups',
name: 'Security Groups',
@@ -339,14 +339,14 @@
);
}
else if(selectedZoneObj.networktype == "Advanced"){
- networkProviderData.push(
+ nspArray.push(
{
id: 'f5',
name: 'F5',
state: nspMap.f5 ? nspMap.f5.state : 'Disabled'
}
);
- networkProviderData.push(
+ nspArray.push(
{
id: 'srx',
name: 'SRX',
@@ -356,7 +356,7 @@
}
args.response.success({
- data: networkProviderData
+ data: nspArray
})
},
@@ -2386,7 +2386,7 @@
],
dataProvider: function(args) {
var providerObj;
- $(networkProviderData).each(function(){
+ $(nspArray).each(function(){
if(this.id == "netscaler") {
providerObj = this;
return false; //break each loop
@@ -2620,7 +2620,7 @@
],
dataProvider: function(args) {
var providerObj;
- $(networkProviderData).each(function(){
+ $(nspArray).each(function(){
if(this.id == "f5") {
providerObj = this;
return false; //break each loop
@@ -2852,7 +2852,7 @@
],
dataProvider: function(args) {
var providerObj;
- $(networkProviderData).each(function(){
+ $(nspArray).each(function(){
if(this.id == "srx") {
providerObj = this;
return false; //break each loop
@@ -3080,12 +3080,12 @@
}
},
- // Security groups provider list view
+ // Security groups detail view
securityGroups: {
id: 'securityGroup-providers',
label: 'Security Groups',
type: 'detailView',
- viewAll: { label: 'Security Groups', path: 'network.securityGroups' },
+ viewAll: { label: 'label.rules', path: 'network.securityGroups' },
tabs: {
details: {
title: 'label.details',
@@ -3099,7 +3099,7 @@
],
dataProvider: function(args) {
var providerObj;
- $(networkProviderData).each(function(){
+ $(nspArray).each(function(){
if(this.id == "securityGroups") {
providerObj = this;
return false; //break each loop