mirror of https://github.com/apache/cloudstack.git
bug 4556: instance page - localize details tab action Restore Instance, Edit Instance, Attach ISO, Detach ISO, Reset Password, Change Service.
This commit is contained in:
Jessica Wang
parent
e7c8872651
commit
6871106dc8
|
|
@ -428,6 +428,17 @@ label.action.reboot.instance=Reboot Instance
|
|||
label.action.reboot.instance.processing=Rebooting Instance....
|
||||
label.action.destroy.instance=Destroy Instance
|
||||
label.action.destroy.instance.processing=Destroying Instance....
|
||||
label.action.restore.instance=Restore Instance
|
||||
label.action.restore.instance.processing=Restoring Instance....
|
||||
label.action.edit.instance=Edit Instance
|
||||
label.action.attach.iso=Attach ISO
|
||||
label.action.attach.iso.processing=Attaching ISO....
|
||||
label.action.detach.iso=Detach ISO
|
||||
label.action.detach.iso.processing=Detaching ISO....
|
||||
label.action.reset.password=Reset Password
|
||||
label.action.reset.password.processing=Resetting Password....
|
||||
label.action.change.service=Change Service
|
||||
label.action.change.service.processing=Changing Service....
|
||||
|
||||
label.action.edit.account=Edit account
|
||||
label.action.resource.limits=Resource limits
|
||||
|
|
@ -456,6 +467,7 @@ message.action.start.instance=Please confirm you want to start instance
|
|||
message.action.stop.instance=Please confirm you want to stop instance
|
||||
message.action.reboot.instance=Please confirm you want to reboot instance
|
||||
message.action.destroy.instance=Please confirm you want to destroy instance
|
||||
message.action.restore.instance=Please confirm you want to restore instance
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,19 @@ dictionary = {
|
|||
'message.action.reboot.instance' : '<fmt:message key="message.action.reboot.instance"/>',
|
||||
'label.action.destroy.instance' : '<fmt:message key="label.action.destroy.instance"/>',
|
||||
'label.action.destroy.instance.processing' : '<fmt:message key="label.action.destroy.instance.processing"/>',
|
||||
'message.action.destroy.instance' : '<fmt:message key="message.action.destroy.instance"/>'
|
||||
'message.action.destroy.instance' : '<fmt:message key="message.action.destroy.instance"/>',
|
||||
'label.action.restore.instance' : '<fmt:message key="label.action.restore.instance"/>',
|
||||
'label.action.restore.instance.processing' : '<fmt:message key="label.action.restore.instance.processing"/>',
|
||||
'message.action.restore.instance' : '<fmt:message key="message.action.restore.instance"/>',
|
||||
'label.action.edit.instance' : '<fmt:message key="label.action.edit.instance"/>',
|
||||
'label.action.attach.iso' : '<fmt:message key="label.action.attach.iso"/>',
|
||||
'label.action.attach.iso.processing' : '<fmt:message key="label.action.attach.iso.processing"/>',
|
||||
'label.action.detach.iso' : '<fmt:message key="label.action.detach.iso"/>',
|
||||
'label.action.detach.iso.processing' : '<fmt:message key="label.action.detach.iso.processing"/>',
|
||||
'label.action.reset.password' : '<fmt:message key="label.action.reset.password"/>',
|
||||
'label.action.reset.password.processing' : '<fmt:message key="label.action.reset.password.processing"/>',
|
||||
'label.action.change.service' : '<fmt:message key="label.action.change.service"/>',
|
||||
'label.action.change.service.processing' : '<fmt:message key="label.action.change.service.processing"/>'
|
||||
};
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -1270,44 +1270,42 @@ var vmActionMap = {
|
|||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
}
|
||||
},
|
||||
"Restore Instance": {
|
||||
"label.action.restore.instance": {
|
||||
isAsyncJob: false,
|
||||
inProcessText: "Restoring Instance....",
|
||||
inProcessText: "label.action.restore.instance.processing",
|
||||
dialogBeforeActionFn : doRestoreVM,
|
||||
afterActionSeccessFn: function(json, $midmenuItem1, id) {
|
||||
var jsonObj = json.recovervirtualmachineresponse.virtualmachine;
|
||||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
}
|
||||
},
|
||||
"Edit Instance": {
|
||||
"label.action.edit.instance": {
|
||||
dialogBeforeActionFn: doEditVM
|
||||
},
|
||||
"Attach ISO": {
|
||||
"label.action.attach.iso": {
|
||||
isAsyncJob: true,
|
||||
asyncJobResponse: "attachisoresponse",
|
||||
inProcessText: "Attaching ISO....",
|
||||
inProcessText: "label.action.attach.iso.processing",
|
||||
dialogBeforeActionFn : doAttachISO,
|
||||
afterActionSeccessFn: function(json, $midmenuItem1, id) {
|
||||
var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine;
|
||||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
//setBooleanReadField((jsonObj.isoid != null), $("#right_panel_content").find("#tab_content_details").find("#iso"));
|
||||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
}
|
||||
},
|
||||
"Detach ISO": {
|
||||
"label.action.detach.iso": {
|
||||
isAsyncJob: true,
|
||||
asyncJobResponse: "detachisoresponse",
|
||||
inProcessText: "Detaching ISO....",
|
||||
inProcessText: "label.action.detach.iso.processing",
|
||||
dialogBeforeActionFn : doDetachISO,
|
||||
afterActionSeccessFn: function(json, $midmenuItem1, id) {
|
||||
var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine;
|
||||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
//setBooleanReadField((jsonObj.isoid != null), $("#right_panel_content").find("#tab_content_details").find("#iso"));
|
||||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
}
|
||||
},
|
||||
"Reset Password": {
|
||||
"label.action.reset.password": {
|
||||
isAsyncJob: true,
|
||||
asyncJobResponse: "resetpasswordforvirtualmachineresponse",
|
||||
inProcessText: "Resetting Password....",
|
||||
inProcessText: "label.action.reset.password.processing",
|
||||
dialogBeforeActionFn : doResetPassword,
|
||||
afterActionSeccessFn: function(json, $midmenuItem1, id) {
|
||||
var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine;
|
||||
|
|
@ -1324,9 +1322,9 @@ var vmActionMap = {
|
|||
return "New password is " + fromdb(jsonObj.password);
|
||||
}
|
||||
},
|
||||
"Change Service": {
|
||||
"label.action.change.service": {
|
||||
isAsyncJob: false,
|
||||
inProcessText: "Changing Service....",
|
||||
inProcessText: "label.action.change.service",
|
||||
dialogBeforeActionFn : doChangeService,
|
||||
afterActionSeccessFn: function(json, $midmenuItem1, id) {
|
||||
var jsonObj = json.changeserviceforvirtualmachineresponse.virtualmachine;
|
||||
|
|
@ -1716,36 +1714,36 @@ function vmJsonToDetailsTab(){
|
|||
// Show State of the VM
|
||||
if (jsonObj.state == 'Destroyed') {
|
||||
if(isAdmin() || isDomainAdmin()) {
|
||||
buildActionLinkForTab("Restore Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.restore.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
noAvailableActions = false;
|
||||
}
|
||||
}
|
||||
else if (jsonObj.state == 'Running') {
|
||||
buildActionLinkForTab("Edit Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.edit.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.stop.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.reboot.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.destroy.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
|
||||
if (jsonObj.isoid == null)
|
||||
buildActionLinkForTab("Attach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.attach.iso", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
else
|
||||
buildActionLinkForTab("Detach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.detach.iso", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
|
||||
buildActionLinkForTab("Reset Password", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.reset.password", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
noAvailableActions = false;
|
||||
}
|
||||
else if (jsonObj.state == 'Stopped') {
|
||||
buildActionLinkForTab("Edit Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.edit.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.start.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.destroy.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
|
||||
if (jsonObj.isoid == null)
|
||||
buildActionLinkForTab("Attach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.attach.iso", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
else
|
||||
buildActionLinkForTab("Detach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.detach.iso", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
|
||||
buildActionLinkForTab("Reset Password", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("Change Service", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.reset.password", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
buildActionLinkForTab("label.action.change.service", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
|
||||
noAvailableActions = false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue