Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: Stop->Power Off (#857327) ......................................................................
userportal,webadmin: Stop->Power Off (#857327) https://bugzilla.redhat.com/857327 Changed the label of stopping of the VM from Stop to Power Off. The constants moved to CommonApplicationConstants Change-Id: I589689d139dfd6cfb7adae366f4254f448fd33fd Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java 5 files changed, 10 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/8043/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 2c9e5ec..2c6d932 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.common; import com.google.gwt.i18n.client.Constants; +import com.google.gwt.i18n.client.Constants.DefaultStringValue; public interface CommonApplicationConstants extends Constants { @@ -195,6 +196,12 @@ String no(); // Vm + @DefaultStringValue("Power Off") + String powerOffVm(); + + @DefaultStringValue("Shutdown") + String shutDownVm(); + @DefaultStringValue("Name") String nameVm(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java index a381133..2412804 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java @@ -154,14 +154,8 @@ @DefaultStringValue("Return VM") String returnVmLabel(); - @DefaultStringValue("Shutdown") - String shutdownVmLabel(); - @DefaultStringValue("Suspend") String suspendVmLabel(); - - @DefaultStringValue("Stop") - String stopVmLabel(); @DefaultStringValue("Open Console") String openConsoleLabel(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java index 8e1de9b..d12ad02 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java @@ -321,7 +321,7 @@ @Override protected UserPortalImageButtonDefinition<UserPortalItemModel> createButtonDefinition(final UserPortalItemModel data) { return new UserPortalImageButtonDefinition<UserPortalItemModel>( - data.getIsPool() ? constants.returnVmLabel() : constants.shutdownVmLabel(), + data.getIsPool() ? constants.returnVmLabel() : constants.shutDownVm(), applicationResources.stopIcon(), applicationResources.stopDisabledIcon() ) { @@ -359,7 +359,7 @@ @Override protected UserPortalImageButtonDefinition<UserPortalItemModel> createButtonDefinition(final UserPortalItemModel data) { return new UserPortalImageButtonDefinition<UserPortalItemModel>( - constants.stopVmLabel(), + constants.powerOffVm(), applicationResources.powerIcon(), applicationResources.powerDisabledIcon() ) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 18e952e..9f978d2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1199,12 +1199,6 @@ @DefaultStringValue("Suspend") String suspendVm(); - @DefaultStringValue("Shut down") - String shutDownVm(); - - @DefaultStringValue("Stop") - String stopVm(); - @DefaultStringValue("Console") String consoleVm(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java index 8788cc7..62b6c1d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java @@ -210,7 +210,7 @@ return getMainModel().getShutdownCommand(); } }); - getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.stopVm(), CommandLocation.OnlyFromFromContext) { + getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.powerOffVm(), CommandLocation.OnlyFromFromContext) { @Override protected UICommand resolveCommand() { return getMainModel().getStopCommand(); -- To view, visit http://gerrit.ovirt.org/8043 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I589689d139dfd6cfb7adae366f4254f448fd33fd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
