etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudstack 3.0 UI - infrastructure - service providers - security group provider detail view - correct view all from view security groups to view rules.

This commit is contained in:
Jessica Wang 2012-03-26 14:10:07 -07:00
parent 56e8e0673c
commit c91c9b3f3d
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -1,6 +1,7 @@
#new labels (begin) **********************************************************************************************
label.management.ips=Management IP Addresses
label.devices=Devices
label.rules=Rules
#new labels (end) ************************************************************************************************

3
ui/index.jsp
View File

@ -2913,6 +2913,7 @@ dictionary = {
'label.action.delete.physical.network': '<fmt:message key="label.action.delete.physical.network" />',
'message.action.delete.physical.network': '<fmt:message key="message.action.delete.physical.network" />',
'label.physical.network': '<fmt:message key="label.physical.network" />',
'label.devices': '<fmt:message key="label.devices" />'
'label.devices': '<fmt:message key="label.devices" />',
'label.rules': '<fmt:message key="label.rules" />'
};
</script>

24
ui/scripts/system.js
View File

@ -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