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

bug 4556: IP Address page - details tab - localize all actions.

Browse Source
This commit is contained in:
Jessica Wang 2011-01-27 15:55:32 -08:00
parent fcee9497ad
commit c4a2b620a6
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,6 +461,13 @@ label.action.create.volume.processing=Creating Volume....
label.action.delete.snapshot=Delete Snapshot
label.action.delete.snapshot.processing=Deleting Snapshot....
label.action.release.ip=Release IP
label.action.release.ip.processing=Releasing IP....
label.action.enable.static.NAT=Enable Static NAT
label.action.enable.static.NAT.processing=Enabling Static NAT....
label.action.disable.static.NAT=Disable Static NAT
label.action.disable.static.NAT.processing=Disabling Static NAT....
label.action.edit.account=Edit account
label.action.resource.limits=Resource limits
label.action.disable.account=Disable account
@ -494,6 +501,8 @@ message.action.delete.volume=Please confirm you want to delete volume
message.action.take.snapshot=Please confirm you want to take snapshot
message.action.delete.snapshot=Please confirm you want to delete snapshot
message.action.release.ip=Please confirm you want to release IP
message.action.disable.static.NAT=Please confirm you want to disable static NAT
message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create.
message.disable.account=Please confirm you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down.

12
ui/jsp/ipaddress.jsp
View File

@ -5,6 +5,18 @@
</c:if>
<fmt:setBundle basename="resources/messages"/>
<script language="javascript">
dictionary = {
'label.action.release.ip' : '<fmt:message key="label.action.release.ip"/>',
'label.action.release.ip.processing' : '<fmt:message key="label.action.release.ip.processing"/>',
'message.action.release.ip' : '<fmt:message key="message.action.release.ip"/>',
'label.action.enable.static.NAT' : '<fmt:message key="label.action.enable.static.NAT"/>',
'label.action.enable.static.NAT.processing' : '<fmt:message key="label.action.enable.static.NAT.processing"/>',
'label.action.disable.static.NAT' : '<fmt:message key="label.action.disable.static.NAT"/>',
'label.action.disable.static.NAT.processing' : '<fmt:message key="label.action.disable.static.NAT.processing"/>',
'message.action.disable.static.NAT' : '<fmt:message key="message.action.disable.static.NAT"/>'
};
</script>
<!-- IP Address detail panel (begin) -->
<div class="main_title" id="right_panel_header">

22
ui/scripts/cloud.core.ipaddress.js
View File

@ -1142,7 +1142,7 @@ function ipJsonToDetailsTab() {
ipPopulateVMDropdown($vmSelect);
if(ipObj.isstaticnat == true) {
buildActionLinkForTab("Disable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("label.action.disable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
} else {
if(ipObj.issourcenat != true) {
@ -1152,12 +1152,12 @@ function ipJsonToDetailsTab() {
var staticNatCapabilityObj = ipFindCapabilityByName("StaticNat", firewallServiceObj);
if(staticNatCapabilityObj != null) {
if(staticNatCapabilityObj.value == "true")
buildActionLinkForTab("Enable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("label.action.enable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
}
}
}
buildActionLinkForTab("Release IP", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("label.action.release.ip", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
}
@ -1228,10 +1228,10 @@ function setNetworkTypeField(value, $field) {
}
var ipActionMap = {
"Release IP": {
"label.action.release.ip": {
isAsyncJob: false,
dialogBeforeActionFn : doReleaseIp,
inProcessText: "Releasing IP....",
inProcessText: "label.action.release.ip.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
$midmenuItem1.slideUp("slow", function(){
$(this).remove();
@ -1243,10 +1243,10 @@ var ipActionMap = {
}
},
"Enable Static NAT": {
"label.action.enable.static.NAT": {
isAsyncJob: false,
dialogBeforeActionFn: doEnableStaticNAT,
inProcessText: "Enabling Static NAT....",
inProcessText: "label.action.enable.static.NAT.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id) { //id is ipaddress
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#ipaddress").text()) { //id is ipaddress
$.ajax({
@ -1263,11 +1263,11 @@ var ipActionMap = {
}
}
},
"Disable Static NAT": {
"label.action.disable.static.NAT": {
isAsyncJob: true,
asyncJobResponse: "disablestaticnatresponse",
dialogBeforeActionFn: doDisableStaticNAT,
inProcessText: "Disabling Static NAT....",
inProcessText: "label.action.disable.static.NAT.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id) { //id is ipaddress
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#ipaddress").text()) { //id is ipaddress
$.ajax({
@ -1291,7 +1291,7 @@ function doReleaseIp($actionLink, $detailsTab, $midmenuItem1) {
var ipaddress = jsonObj.ipaddress;
$("#dialog_confirmation")
.text("Please confirm you want to release this IP address")
.text(dictionary["message.action.release.ip"])
.dialog('option', 'buttons', {
"Confirm": function() {
$(this).dialog("close");
@ -1334,7 +1334,7 @@ function doDisableStaticNAT($actionLink, $detailsTab, $midmenuItem1) {
var ipaddress = jsonObj.ipaddress;
$("#dialog_info")
.text("Please confirm you want to disable static NAT")
.text(dictionary["message.action.disable.static.NAT"])
.dialog('option', 'buttons', {
"Confirm": function() {
$(this).dialog("close");