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 - system service offering page - (1) add System VM Type dropdown in Add Service Offering dialog. (2) add System VM Type in detailView.

This commit is contained in:
Jessica Wang 2012-04-04 16:34:02 -07:00
parent 6e6fedc79a
commit a7b2fbe9fc
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,9 @@ label.rules=Rules
label.traffic.label=Traffic label
label.vm.state=VM state
message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
label.domain.router=Domain router
label.console.proxy=Console proxy
label.secondary.storage.vm=Secondary storage VM
#new labels (end) ************************************************************************************************

5
ui/index.jsp
View File

@ -2921,6 +2921,9 @@ dictionary = {
'label.physical.network': '<fmt:message key="label.physical.network" />',
'label.devices': '<fmt:message key="label.devices" />',
'label.rules': '<fmt:message key="label.rules" />',
'label.vm.state': '<fmt:message key="label.vm.state" />'
'label.vm.state': '<fmt:message key="label.vm.state" />',
'label.domain.router' : '<fmt:message key="label.domain.router" />',
'label.console.proxy' : '<fmt:message key="label.console.proxy" />',
'label.secondary.storage.vm' : '<fmt:message key="label.secondary.storage.vm" />'
};
</script>

35
ui/scripts/configuration.js
View File

@ -374,7 +374,17 @@
description: {
label: 'label.description',
validation: { required: true }
},
},
systemvmtype: {
label: 'label.system.vm.type',
select: function(args) {
var items = [];
items.push({id: 'domainrouter', description: dictionary['label.domain.router']});
items.push({id: 'consoleproxy', description: dictionary['label.console.proxy']});
items.push({id: 'secondarystoragevm', description: dictionary['label.secondary.storage.vm']});
args.response.success({data: items});
}
},
storageType: {
label: 'label.storage.type',
select: function(args) {
@ -461,6 +471,7 @@
var array1 = [];
array1.push("&name=" + args.data.name);
array1.push("&displaytext=" + todb(args.data.description));
array1.push("&systemvmtype=" + todb(args.data.systemvmtype));
array1.push("&storageType=" + todb(args.data.storageType));
array1.push("&cpuNumber=" + args.data.cpuNumber);
array1.push("&cpuSpeed="+ args.data.cpuSpeed);
@ -601,7 +612,25 @@
displaytext: {
label: 'label.description',
isEditable: true
},
},
systemvmtype: {
label: 'label.system.vm.type',
converter: function(args) {
var text = '';
switch(args) {
case 'domainrouter':
text = dictionary['label.domain.router'];
break;
case 'consoleproxy':
text = dictionary['label.console.proxy'];
break;
case 'secondarystoragevm':
text = dictionary['label.secondary.storage.vm'];
break;
}
return text;
}
},
storagetype: { label: 'label.storage.type' },
cpunumber: { label: 'label.num.cpu.cores' },
cpuspeed: {
@ -1732,5 +1761,5 @@
return allowedActions;
};
})(cloudStack, jQuery);