diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 80b5fdac48e..c3e77cde1ad 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -489,7 +489,10 @@ label.action.copy.ISO=Copy ISO
label.action.copy.ISO.processing=Coping ISO....
label.action.download.ISO=Download ISO
-
+label.action.edit.domain=Edit Domain
+label.action.delete.domain=Delete Domain
+label.action.delete.domain.processing=Deleting Domain....
+label.action.edit.resource.limits=Edit Resource Limits
label.action.edit.account=Edit account
label.action.resource.limits=Resource limits
@@ -536,6 +539,8 @@ message.action.delete.template.for.all.zones=The template is used by all zones.
message.action.delete.ISO=Please confirm you want to delete ISO
message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please confirm you want to delete it from all zones.
+message.action.delete.domain=Please confirm you want to delete domain
+
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/domain.jsp b/ui/jsp/domain.jsp
index 476dfc3ac4d..e63992f5951 100644
--- a/ui/jsp/domain.jsp
+++ b/ui/jsp/domain.jsp
@@ -5,6 +5,16 @@
+
+
diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js
index 582cb0c632a..6ed9a5b5220 100644
--- a/ui/scripts/cloud.core.domain.js
+++ b/ui/scripts/cloud.core.domain.js
@@ -306,8 +306,8 @@ function domainJsonToDetailsTab() {
$actionMenu.find("#action_list").empty();
var noAvailableActions = true;
if(domainId != 1 && isAdmin()) { //"ROOT" domain is not allowed to edit or delete
- buildActionLinkForTab("Edit Domain", domainActionMap, $actionMenu, $midmenuItem1, $thisTab);
- buildActionLinkForTab("Delete Domain", domainActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.edit.domain", domainActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.delete.domain", domainActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
// no available actions
@@ -476,7 +476,7 @@ function domainToResourceLimitsTab() {
$actionMenu.find("#action_list").empty();
var noAvailableActions = true;
if(isAdmin()) {
- buildActionLinkForTab("Edit Resource Limits", domainResourceLimitsActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.edit.resource.limits", domainResourceLimitsActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
// no available actions
@@ -547,7 +547,7 @@ function listAdminAccounts(domainId) {
}
var domainResourceLimitsActionMap = {
- "Edit Resource Limits": {
+ "label.action.edit.resource.limits": {
dialogBeforeActionFn: doEditResourceLimits
}
}
@@ -671,7 +671,7 @@ function doDeleteDomain($actionLink, $detailsTab, $midmenuItem1) {
var id = jsonObj.id;
$("#dialog_confirmation")
- .text("Please confirm you want to delete this domain")
+ .text(dictionary["message.action.delete.domain"])
.dialog('option', 'buttons', {
"Confirm": function() {
$(this).dialog("close");
@@ -685,14 +685,14 @@ function doDeleteDomain($actionLink, $detailsTab, $midmenuItem1) {
}
var domainActionMap = {
- "Edit Domain": {
+ "label.action.edit.domain": {
dialogBeforeActionFn: doEditDomain
},
- "Delete Domain": {
+ "label.action.delete.domain": {
isAsyncJob: true,
dialogBeforeActionFn : doDeleteDomain,
asyncJobResponse: "deletedomainresponse",
- inProcessText: "Deleting Domain....",
+ inProcessText: "label.action.delete.domain.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
$midmenuItem1.slideUp(function() {
$(this).remove();