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

cloudstack 3.0 new UI - system page - localize IP Ranges sections.

This commit is contained in:
Jessica Wang 2012-02-15 15:52:50 -08:00 committed by Salvatore Orlando
parent 3fac17c577
commit 701352add1
4 changed files with 29 additions and 2 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

@ -2551,6 +2551,9 @@ resource.state=Resource state
>>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
=======
LUN.number=LUN #
confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
>>>>>>> 50fadb4... cloudstack 3.0 new UI - system page - localize primary storage section.

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

@ -1693,7 +1693,6 @@ resource.state=リソースの状態
>>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
=======
LUN.number=LUN #
confirm.remove.IP.range=あなたがこのIPアドレス範囲の削除を希望することを確認してください。
>>>>>>> 50fadb4... cloudstack 3.0 new UI - system page - localize primary storage section.

5
ui/index.jsp
View File

@ -2976,7 +2976,12 @@ dictionary = {
>>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
=======
'resource.state': '<fmt:message key="resource.state" />',
<<<<<<< HEAD
'LUN.number': '<fmt:message key="LUN.number" />'
>>>>>>> 50fadb4... cloudstack 3.0 new UI - system page - localize primary storage section.
=======
'LUN.number': '<fmt:message key="LUN.number" />',
'confirm.remove.IP.range': '<fmt:message key="confirm.remove.IP.range" />'
>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
};
</script>

20
ui/scripts/system.js
View File

@ -8273,9 +8273,13 @@
guestIpRanges: {
=======
guestIpRanges: { //Advanced zone - Guest traffic type - Network tab - Network detailView - View IP Ranges
<<<<<<< HEAD
>>>>>>> 250b296... cloudstack 3.0 new UI - system page - Advanced zone - Guest traffic type - Network tab - Network detailView - View IP Ranges - remove obsolete code for Basic zone since this section is only available for Advanced zone now.
title: 'label.guest.ip.range', //Jes
>>>>>>> 6ee8ecf... cloudstack 3.0 new UI - system page - localize secondary storage section.
=======
title: 'label.guest.ip.range',
>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
id: 'guestIpRanges',
listView: {
section: 'guest-IP-range',
@ -8390,6 +8394,7 @@
}
},
<<<<<<< HEAD
'remove': {
label: 'label.remove.ip.range' ,
messages: {
@ -8398,6 +8403,16 @@
},
notification: function(args) {
return 'label.remove.ip.range';
=======
'delete': {
label: 'remove.IP.range' ,
messages: {
confirm: function(args) {
return 'confirm.remove.IP.range';
},
notification: function(args) {
return 'remove.IP.range';
>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
}
},
action: function(args) {
@ -8422,8 +8437,13 @@
}
}
};
<<<<<<< HEAD
function addExternalLoadBalancer(args, physicalNetworkObj, apiCmd, apiCmdRes, apiCmdObj) {
=======
function addExternalLoadBalancer(args, physicalNetworkObj, apiCmd, apiCmdRes, apiCmdObj) {
>>>>>>> 0341d00... cloudstack 3.0 new UI - system page - localize IP Ranges sections.
var array1 = [];
array1.push("&physicalnetworkid=" + physicalNetworkObj.id);
array1.push("&username=" + todb(args.data.username));