From 4068603193480be50a5ea8cbeb4d68d8c29ab19f Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 26 Jan 2011 16:20:35 -0800 Subject: [PATCH] bug 4556: account page - localize Resource Limits and Disable Account. --- .../classes/resources/messages.properties | 3 +++ ui/jsp/account.jsp | 5 ++++- ui/scripts/cloud.core.account.js | 19 ++++++++----------- ui/scripts/cloud.core.js | 11 +++++++++-- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 0e54ac6a63e..1cc76106ed4 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -422,6 +422,9 @@ label.vm.reboot=Reboot VM label.vm.destroy=Destroy VM label.action.edit.account=Edit account +label.action.resource.limits=Resource limits +label.action.disable.account=Disable account +label.action.disable.account.processing=Disabling account.... #Messages message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create. diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp index 388c87cd453..12a8bb86bdd 100644 --- a/ui/jsp/account.jsp +++ b/ui/jsp/account.jsp @@ -11,7 +11,10 @@ var dictionary = { "message.lock.account" : '', "message.enable.account" : '', "message.delete.account" : '', - "label.action.edit.account" : '' + "label.action.edit.account" : '', + "label.action.resource.limits": '', + "label.action.disable.account": '', + "label.action.disable.account.processing": '' }; diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js index 88d2a4d2573..0685aa00320 100644 --- a/ui/scripts/cloud.core.account.js +++ b/ui/scripts/cloud.core.account.js @@ -395,11 +395,11 @@ function accountJsonToDetailsTab() { buildActionLinkForTab("label.action.edit.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab); if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) { - buildActionLinkForTab("Resource limits", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab); + buildActionLinkForTab("label.action.resource.limits", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab); } if(jsonObj.state == "enabled") { - buildActionLinkForTab("Disable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab); + buildActionLinkForTab("label.action.disable.account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab); buildActionLinkForTab("Lock account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab); } else if(jsonObj.state == "disabled" || jsonObj.state == "locked") { @@ -536,19 +536,18 @@ var accountActionMap = { "label.action.edit.account": { dialogBeforeActionFn: doEditAccount }, - "Resource limits": { + "label.action.resource.limits": { dialogBeforeActionFn : doResourceLimitsForAccount } , - "Disable account": { + "label.action.disable.account": { isAsyncJob: true, asyncJobResponse: "disableaccountresponse", dialogBeforeActionFn : doDisableAccount, - inProcessText: "Disabling account....", + inProcessText: "label.action.disable.account.processing", afterActionSeccessFn: function(json, $midmenuItem1, id) { var item = json.queryasyncjobresultresponse.jobresult.account; - accountToMidmenu(item, $midmenuItem1); - //accountJsonToDetailsTab(); + accountToMidmenu(item, $midmenuItem1); } } , @@ -559,8 +558,7 @@ var accountActionMap = { inProcessText: "Locking account....", afterActionSeccessFn: function(json, $midmenuItem1, id) { var item = json.queryasyncjobresultresponse.jobresult.account; - accountToMidmenu(item, $midmenuItem1); - //accountJsonToDetailsTab(); + accountToMidmenu(item, $midmenuItem1); } } , @@ -570,8 +568,7 @@ var accountActionMap = { inProcessText: "Enabling account....", afterActionSeccessFn: function(json, $midmenuItem1, id) { var item = json.enableaccountresponse.account; - accountToMidmenu(item, $midmenuItem1); - //accountJsonToDetailsTab(); + accountToMidmenu(item, $midmenuItem1); } } , diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 72a06a0e67a..5106b06e4c4 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -60,7 +60,10 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) { var afterActionSeccessFn = apiInfo.afterActionSeccessFn; var $spinningWheel = $thisTab.find("#spinning_wheel"); - $spinningWheel.find("#description").text(inProcessText); + if(inProcessText in dictionary) + $spinningWheel.find("#description").text(dictionary[inProcessText]); + else + $spinningWheel.find("#description").text(label); $spinningWheel.show(); $midmenuItem1.find("#content").removeClass("selected").addClass("inaction"); @@ -525,7 +528,11 @@ function copyActionInfoFromMidMenuToRightPanel($midmenuItem1) { if($midMenuSpinningWheel.css("display") != "none") { if($detailsTabSpinningWheel.css("display") == "none") { var inProcessText = $midMenuSpinningWheel.data("inProcessText"); - $detailsTabSpinningWheel.find("#description").text(inProcessText); + $detailsTabSpinningWheel.find("#description").text(inProcessText); + if(inProcessText in dictionary) + $detailsTabSpinningWheel.find("#description").text(dictionary[inProcessText]); + else + $detailsTabSpinningWheel.find("#description").text(label); $detailsTabSpinningWheel.show(); } }