apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6272: Fix recover/restore VM actions

Browse Source 
-Label recoverVirtualMachine as 'Recover VM'
-Label restoreVirtualMachine as 'Reinstall VM'
-Change confirmation text for restoreVirtualMachine to be more explicit
-Change restoreVirtualMachine icon to 'recycle' symbol, to avoid
 confusion with the reboot VM icon
This commit is contained in:
Brian Federle 2014-03-21 13:26:47 -07:00
parent 2adb9af898
commit 15729f342c
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
label.reinstall.vm=Reinstall VM
message.reinstall.vm=NOTE: Proceed with caution. This will cause the VM to be reinstalled from the template; data on the root disk will be lost. Extra data volumes, if any, will not be touched.
label.recover.vm=Recover VM
message.recover.vm=Please confirm that you would like to recover this VM.
label.port=Port
label.remove.ldap=Remove LDAP
label.configure.ldap=Configure LDAP

4
ui/dictionary.jsp
View File

@ -25,6 +25,10 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script type="text/javascript">
dictionary = {
'label.recover.vm': '<fmt:message key="label.recover.vm" />',
'message.recover.vm': '<fmt:message key="message.recover.vm" />',
'label.reinstall.vm': '<fmt:message key="label.reinstall.vm" />',
'message.reinstall.vm': '<fmt:message key="message.reinstall.vm" />',
'label.port': '<fmt:message key="label.port" />',
'label.remove.ldap': '<fmt:message key="label.remove.ldap" />',
'message.remove.ldap': '<fmt:message key="message.remove.ldap" />',

BIN
ui/images/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 207 KiB

13
ui/scripts/instances.js
View File

@ -661,14 +661,14 @@
}
},
restore: {
label: 'label.action.restore.instance',
label: 'label.recover.vm',
compactLabel: 'label.restore',
messages: {
confirm: function(args) {
return 'message.action.restore.instance';
return 'message.recover.vm';
},
notification: function(args) {
return 'label.action.restore.instance';
return 'label.recover.vm';
}
},
action: function(args) {
@ -695,14 +695,13 @@
}
},
reset: {
label: 'label.resetVM',
textLabel: 'label.resetVM',
label: 'label.reinstall.vm',
messages: {
confirm: function(args) {
return 'message.restoreVM';
return 'message.reinstall.vm';
},
notification: function(args) {
return 'label.resetVM';
return 'label.reinstall.vm';
},
complete: function(args) {
if (args.password != null && args.password.length > 0)