diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 167362c4aca..5268bc17a1c 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -473,6 +473,15 @@ label.action.delete.security.group.processing=Deleting Security Group.... label.action.delete.ingress.rule=Delete Ingress Rule label.action.delete.ingress.rule.processing=Deleting Ingress Rule.... +label.action.edit.template=Edit Template +label.action.delete.template=Delete Template +label.action.delete.template.processing=Deleting Template.... +label.action.copy.template=Copy Template +label.action.copy.template.processing=Coping Template.... +label.action.create.vm=Create VM +label.action.create.vm.processing=Creating VM.... +label.action.download.template=Download Template + label.action.edit.account=Edit account label.action.resource.limits=Resource limits @@ -513,6 +522,9 @@ message.action.disable.static.NAT=Please confirm you want to disable static NAT message.action.delete.security.group=Please confirm you want to delete security group message.action.delete.ingress.rule=Please confirm you want to delete ingress rule +message.action.delete.template=Please confirm you want to delete template +message.action.delete.template.for.all.zones=The template is used by all zones. Please confirm you want to delete it from all zones. + 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/template.jsp b/ui/jsp/template.jsp index c7a55209f48..08695687177 100644 --- a/ui/jsp/template.jsp +++ b/ui/jsp/template.jsp @@ -5,6 +5,21 @@ + +
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index 3b85297223e..d6b99f5b33e 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -354,12 +354,12 @@ function templateJsonToDetailsTab() { //do nothing } else { - buildActionLinkForTab("Edit Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.edit.template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); - buildActionLinkForTab("Copy Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.copy.template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); // For Beta2, this simply doesn't work without a network. - //buildActionLinkForTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); + //buildActionLinkForTab("label.action.create.vm", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); noAvailableActions = false; } @@ -370,7 +370,7 @@ function templateJsonToDetailsTab() { //do nothing } else { - buildActionLinkForTab("Download Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.download.template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); noAvailableActions = false; } @@ -381,7 +381,7 @@ function templateJsonToDetailsTab() { //do nothing } else { - buildActionLinkForTab("Delete Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.delete.template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab); noAvailableActions = false; } @@ -451,14 +451,14 @@ function templateClearDetailsTab() { } var templateActionMap = { - "Edit Template": { + "label.action.edit.template": { dialogBeforeActionFn : doEditTemplate }, - "Delete Template": { + "label.action.delete.template": { isAsyncJob: true, asyncJobResponse: "deletetemplateresponse", dialogBeforeActionFn : doDeleteTemplate, - inProcessText: "Deleting Template....", + inProcessText: "label.action.delete.template.processing", afterActionSeccessFn: function(json, $midmenuItem1, id){ $midmenuItem1.slideUp("slow", function() { $(this).remove(); @@ -470,22 +470,22 @@ var templateActionMap = { } }, - "Copy Template": { + "label.action.copy.template": { isAsyncJob: true, asyncJobResponse: "copytemplateresponse", dialogBeforeActionFn : doCopyTemplate, - inProcessText: "Copying Template....", + inProcessText: "label.action.copy.template.processing", afterActionSeccessFn: function(json, $midmenuItem1, id){} } , - "Create VM": { + "label.action.create.vm": { isAsyncJob: true, asyncJobResponse: "deployvirtualmachineresponse", dialogBeforeActionFn : doCreateVMFromTemplate, - inProcessText: "Creating VM....", + inProcessText: "label.action.create.vm.processing", afterActionSeccessFn: function(json, $midmenuItem1, id){} }, - "Download Template": { + "label.action.download.template": { dialogBeforeActionFn : doDownloadTemplate } } @@ -603,9 +603,9 @@ function doDeleteTemplate($actionLink, $detailsTab, $midmenuItem1) { var $dialog1; if(jsonObj.crossZones == true) - $dialog1 = $("#dialog_confirmation").text("The template is used by all zones. Please confirm you want to delete it from all zones."); + $dialog1 = $("#dialog_confirmation").text(dictionary["message.action.delete.template.for.all.zones"]); else - $dialog1 = $("#dialog_confirmation").text("Please confirm you want to delete the template"); + $dialog1 = $("#dialog_confirmation").text(dictionary["message.action.delete.template"]); $dialog1 .dialog('option', 'buttons', {