etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 4556: Domain page - localize all actions.

This commit is contained in:
Jessica Wang 2011-01-27 17:26:04 -08:00
parent 52dd679d95
commit f19c10d53a
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.

10
ui/jsp/domain.jsp
View File

@ -5,6 +5,16 @@
</c:if>
<fmt:setBundle basename="resources/messages"/>
<script language="javascript">
dictionary = {
'label.action.edit.domain' : '<fmt:message key="label.action.edit.domain"/>',
'label.action.delete.domain' : '<fmt:message key="label.action.delete.domain"/>',
'label.action.delete.domain.processing' : '<fmt:message key="label.action.delete.domain.processing"/>',
'message.action.delete.domain' : '<fmt:message key="message.action.delete.domain"/>',
'label.action.edit.resource.limits' : '<fmt:message key="label.action.edit.resource.limits"/>'
};
</script>
<!-- domain detail panel (begin) -->
<div class="main_title" id="right_panel_header">

16
ui/scripts/cloud.core.domain.js
View File

@ -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();