apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix syntax errors which break IE7

Browse Source
This commit is contained in:
bfederle 2012-01-26 15:31:25 -08:00
parent 203cdedf87
commit e6f6437afa
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts-test/dashboard.js
View File

@ -21,7 +21,7 @@
accountType: 'user',
accountDomainID: 12
}
})
});
}
},

6
ui/scripts-test/system.js
View File

@ -113,7 +113,7 @@
state: 'Enabled'
}
]
})
});
},
detailView: function(args) {
@ -968,7 +968,7 @@
}
}
}
},
}
}
}
},
@ -1027,7 +1027,7 @@
internaldns2: { label: 'Internal DNS 2', isEditable: true },
networktype: { label: 'Network Type' },
securitygroupsenabled: {
label: 'Security Groups Enabled',
label: 'Security Groups Enabled'
},
domain: {
label: 'Network domain',

4
ui/scripts-test/test-data.js
View File

@ -8,7 +8,7 @@
window.g_capabilities = {
projectinviterequired: false
}
};
window.testData = {
actionFilter: function(args) {
@ -2488,7 +2488,7 @@
"isextractable": false
},
{
"id": 0259,
"id": 259,
"name": "RightImage_CentOS_5.4_x64_v5.6.32.1_CDC_XEN",
desc: 'XenServer image by RightImage',
"displaytext": "RightImage CentOS 5.4 x64 v5.6 CDC XEN",

10
ui/scripts-test/zoneWizard.js
View File

@ -32,7 +32,7 @@
label: 'Remove Rule',
action: function(args) {
multiEditData = $.grep(multiEditData, function(item) {
return item.index != args.context.multiRule[0].index
return item.index != args.context.multiRule[0].index;
});
args.response.success();
}
@ -108,13 +108,13 @@
description: domain.name
};
})
})
});
}
},
'security-groups-enabled': {
label: 'Security Groups Enabled',
isBoolean: true,
isReverse: true,
isReverse: true
},
networkOfferingIdWithoutSG: {
@ -143,7 +143,7 @@
description: offering.name
};
})
})
});
}
}
}
@ -229,7 +229,7 @@
var array1 = [];
var selectedZoneObj = {
securitygroupsenabled: args.context.zones[0]['security-groups-enabled']
}
};
if(selectedZoneObj.securitygroupsenabled) {
array1.push({id: 'account-specific', description: 'Account'});
}

6
ui/scripts/configuration.js
View File

@ -1257,7 +1257,7 @@
label: "Redundant router capability",
isHidden: true,
dependsOn: 'service.SourceNat.isEnabled',
isBoolean: true,
isBoolean: true
},
"service.SourceNat.sourceNatTypeDropdown": {
@ -1277,7 +1277,7 @@
label: "Elastic LB",
isHidden: true,
dependsOn: 'service.Lb.isEnabled',
isBoolean: true,
isBoolean: true
},
"service.Lb.lbIsolationDropdown": {
label: 'LB isolation',
@ -1296,7 +1296,7 @@
label: "Elastic IP",
isHidden: true,
dependsOn: 'service.StaticNat.isEnabled',
isBoolean: true,
isBoolean: true
},
conservemode: { label: 'Conserve mode', isBoolean: true },

2
ui/scripts/network.js
View File

@ -1111,7 +1111,7 @@
args.complete({
data: {
isstaticnat: true
},
}
});
ipChangeNotice();

2
ui/scripts/system.js
View File

@ -6290,7 +6290,7 @@
},
{
id: { label: 'ID' },
created: { label: 'Created', converter: cloudStack.converters.toLocalDate },
created: { label: 'Created', converter: cloudStack.converters.toLocalDate }
}
],

14
ui/scripts/ui-custom/zoneChart.js
View File

@ -96,35 +96,35 @@
pods: {
label: 'Pods',
viewAll: {
action: actions.listView('pods', context),
action: actions.listView('pods', context)
}
},
clusters: {
label: 'Clusters',
viewAll: {
action: actions.listView('clusters', context),
action: actions.listView('clusters', context)
}
},
hosts: {
label: 'Hosts',
viewAll: {
action: actions.listView('hosts', context),
action: actions.listView('hosts', context)
}
},
primaryStorage: {
label: 'Primary Storage',
viewAll: {
action: actions.listView('primary-storage', context),
action: actions.listView('primary-storage', context)
}
},
secondaryStorage: {
label: 'Secondary Storage',
viewAll: {
action: actions.listView('secondary-storage', context),
action: actions.listView('secondary-storage', context)
}
}
};
@ -313,7 +313,7 @@
var $stats = $('<div>').addClass('stats');
var $container = $('<div>').addClass('dashboard-container head');
var $top = $('<div>').addClass('top');
var $title = $('<div>').addClass('title').append($('<span>').html('System-wide capacity'))
var $title = $('<div>').addClass('title').append($('<span>').html('System-wide capacity'));
var chartItems = {
// The keys are based on the internal type ID associated with each capacity
@ -340,7 +340,7 @@
6: {
name: 'Secondary Storage'
}
}
};
$top.append($title);
$container.append($top, $stats.append($chartItems));