diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index c3e77cde1ad..c32e5768dcb 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -515,6 +515,9 @@ label.action.enable.user.processing=Enabling User.... label.action.delete.user=Delete User label.action.delete.user.processing=Deleting User.... +label.action.edit.zone=Edit Zone +label.action.delete.zone=Delete Zone +label.action.delete.zone.processing=Deleting Zone.... #Messages message.action.start.instance=Please confirm you want to start instance @@ -541,6 +544,8 @@ message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please con message.action.delete.domain=Please confirm you want to delete domain +message.action.delete.zone=Please confirm you want to delete zone + 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. message.lock.account=Please confirm you want to lock this account. By locking the account, all users for this account will no longer be able to manage their cloud resources. Existing resources can still be accessed. diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp index 22e90f4e741..462bc77ff8b 100644 --- a/ui/jsp/zone.jsp +++ b/ui/jsp/zone.jsp @@ -5,11 +5,20 @@ + +

- +

diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index 734054d646d..9ecc680524d 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -162,8 +162,8 @@ function zoneJsonToDetailsTab() { }); var $actionMenu = $thisTab.find("#action_link #action_menu"); $actionMenu.find("#action_list").empty(); - buildActionLinkForTab("Edit Zone", zoneActionMap, $actionMenu, $leftmenuItem1, $thisTab); - buildActionLinkForTab("Delete Zone", zoneActionMap, $actionMenu, $leftmenuItem1, $thisTab); + buildActionLinkForTab("label.action.edit.zone", zoneActionMap, $actionMenu, $leftmenuItem1, $thisTab); + buildActionLinkForTab("label.action.delete.zone", zoneActionMap, $actionMenu, $leftmenuItem1, $thisTab); $thisTab.find("#tab_spinning_wheel").hide(); $thisTab.find("#tab_container").show(); @@ -339,13 +339,13 @@ function bindAddPodButton($button, $leftmenuItem1) { } var zoneActionMap = { - "Edit Zone": { + "label.action.edit.zone": { dialogBeforeActionFn: doEditZone }, - "Delete Zone": { + "label.action.delete.zone": { isAsyncJob: false, dialogBeforeActionFn : doDeleteZone, - inProcessText: "Deleting Zone....", + inProcessText: "label.action.delete.zone.processing", afterActionSeccessFn: function(json, $leftmenuItem1, id) { $leftmenuItem1.slideUp(function() { $(this).remove(); @@ -473,7 +473,7 @@ function doDeleteZone($actionLink, $detailsTab, $midmenuItem1) { var id = jsonObj.id; $("#dialog_confirmation") - .text("Please confirm you want to delete this zone") + .text(dictionary["message.action.delete.zone"]) .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close");