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: account page - localize Enable Account action.

Browse Source
This commit is contained in:
Jessica Wang 2011-01-26 17:07:46 -08:00
parent 244d8c198b
commit ef1f1eb614
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,6 +427,8 @@ label.action.disable.account=Disable account
label.action.disable.account.processing=Disabling account....
label.action.lock.account=Lock account
label.action.lock.account.processing=Locking account....
label.action.enable.account=Enable account
label.action.enable.account.processing=Enabling account....
#Messages
message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create.

4
ui/jsp/account.jsp
View File

@ -16,7 +16,9 @@ var dictionary = {
"label.action.disable.account": '<fmt:message key="label.action.disable.account"/>',
"label.action.disable.account.processing": '<fmt:message key="label.action.disable.account.processing"/>',
"label.action.lock.account": '<fmt:message key="label.action.lock.account"/>',
"label.action.lock.account.processing": '<fmt:message key="label.action.lock.account.processing"/>'
"label.action.lock.account.processing": '<fmt:message key="label.action.lock.account.processing"/>',
"label.action.enable.account": '<fmt:message key="label.action.enable.account"/>',
"label.action.enable.account.processing": '<fmt:message key="label.action.enable.account.processing"/>'
};
</script>

6
ui/scripts/cloud.core.account.js
View File

@ -403,7 +403,7 @@ function accountJsonToDetailsTab() {
buildActionLinkForTab("label.action.lock.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
}
else if(jsonObj.state == "disabled" || jsonObj.state == "locked") {
buildActionLinkForTab("Enable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("label.action.enable.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
}
buildActionLinkForTab("Delete account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
@ -562,10 +562,10 @@ var accountActionMap = {
}
}
,
"Enable account": {
"label.action.enable.account": {
isAsyncJob: false,
dialogBeforeActionFn : doEnableAccount,
inProcessText: "Enabling account....",
inProcessText: "label.action.enable.account.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
var item = json.enableaccountresponse.account;
accountToMidmenu(item, $midmenuItem1);

13
ui/scripts/cloud.core.js
View File

@ -74,10 +74,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
var afterActionSeccessFn = apiInfo.afterActionSeccessFn;
var $spinningWheel = $thisTab.find("#spinning_wheel");
if(inProcessText in dictionary)
$spinningWheel.find("#description").text(dictionary[inProcessText]);
else
$spinningWheel.find("#description").text(label);
$spinningWheel.find("#description").text(inProcessText2);
$spinningWheel.show();
$midmenuItem1.find("#content").removeClass("selected").addClass("inaction");
@ -127,7 +124,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
error: function(XMLHttpResponse) {
$("body").stopTime(timerKey);
handleError(XMLHttpResponse, function() {
handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label, $afterActionInfoContainer, $midmenuItem1);
handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label2, $afterActionInfoContainer, $midmenuItem1);
});
}
});
@ -137,7 +134,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
},
error: function(XMLHttpResponse) {
handleError(XMLHttpResponse, function() {
handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label, $afterActionInfoContainer, $midmenuItem1);
handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label2, $afterActionInfoContainer, $midmenuItem1);
});
}
});
@ -153,11 +150,11 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
success: function(json) {
$spinningWheel.hide();
afterActionSeccessFn(json, $midmenuItem1, id); //afterActionSeccessFn() will update $midmenuItem1.data("jsonObj")
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label + " action succeeded.")); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " action succeeded.")); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
},
error: function(XMLHttpResponse) {
handleError(XMLHttpResponse, function() {
handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label, $afterActionInfoContainer, $midmenuItem1);
handleErrorInDetailsTab(XMLHttpResponse, $thisTab, label2, $afterActionInfoContainer, $midmenuItem1);
});
}
});