Tomas Jelinek has uploaded a new change for review. Change subject: userportal, webadmin: Run once dialog redesign (#852057) ......................................................................
userportal, webadmin: Run once dialog redesign (#852057) https://bugzilla.redhat.com/852057 Changes: - DisclosurePanel titels are in bold - boot sequence up/down buttons moved to be outside of the list and have "Up" and "Down" labels instead of arrows - width of dialog made bigger to avoid horizontal scroll Change-Id: I55f58598dc8d627c31da31588cfe8530997e05b1 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/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmRunOncePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmRunOncePopupView.java 5 files changed, 41 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/7942/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..ae06d87 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 @@ -67,6 +67,12 @@ @DefaultStringValue("Boot Options") String runOncePopupBootOptionsLabel(); + @DefaultStringValue("Up") + String bootSequenceUpButtonLabel(); + + @DefaultStringValue("Down") + String bootSequenceDownButtonLabel(); + @DefaultStringValue("Display Protocol") String runOncePopupDisplayProtocolLabel(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java index a65139b..c90daea 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java @@ -196,6 +196,8 @@ private CommonApplicationResources resources; + private final CommonApplicationConstants constants; + @UiFactory protected DisclosurePanel createPanel(String label) { @@ -203,6 +205,7 @@ } public VmRunOncePopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources) { + this.constants = constants; this.resources = resources; initCheckBoxEditors(); initRadioButtonEditors(); @@ -210,14 +213,14 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); initBootSequenceBox(); - localize(constants); + localize(); addStyles(); ViewIdHandler.idHandler.generateAndSetIds(this); Driver.driver.initialize(this); } - void localize(CommonApplicationConstants constants) { + void localize() { // Boot Options runAsStatelessEditor.setLabel(constants.runOncePopupRunAsStatelessLabel()); runAndPauseEditor.setLabel(constants.runOncePopupRunAndPauseLabel()); @@ -264,13 +267,15 @@ void initBootSequenceBox() { bootSequenceBox = new ListBox(false); - bootSequenceBox.setWidth("100%"); //$NON-NLS-1$ + bootSequenceBox.setWidth("370px"); //$NON-NLS-1$ bootSequenceBox.setHeight("60px"); //$NON-NLS-1$ VerticalPanel boxPanel = new VerticalPanel(); boxPanel.setWidth("100%"); //$NON-NLS-1$ boxPanel.add(bootSequenceBox); bootSequencePanel.add(boxPanel); + + localizeBootSequenceButtons(); } void addStyles() { @@ -369,10 +374,19 @@ bootSequenceUpButton.setEnabled(bootSequenceModel.getMoveItemUpCommand().getIsExecutionAllowed()); bootSequenceDownButton.setEnabled(bootSequenceModel.getMoveItemDownCommand().getIsExecutionAllowed()); + + // the setEnabled resets the label for some reason, so need to set it back + localizeBootSequenceButtons(); } + }); } + protected void localizeBootSequenceButtons() { + bootSequenceUpButton.setText(constants.bootSequenceUpButtonLabel()); + bootSequenceDownButton.setText(constants.bootSequenceDownButtonLabel()); + } + private void updateBootSequenceItems() { // Update list box bootSequenceBox.clear(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml index aa612c2..77847ba 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml @@ -74,35 +74,42 @@ } .bootSequenceButton { - height: 13px; - width: 13px; - background: white; - border: 0px; + font-size: 10px; + font-weight: bold; + text-align: center; + width: 35px; + position: relative; + left: 5px; } .bootSequenceButtonUp { - + padding-top: 2px; } .bootSequenceButtonDown { position: relative; - top: 10px; + top: -5px; } .bootSequenceButtonPanel { position: absolute; - background: white; + background: #e5ecff; right: 0px; bottom: 0px; - top: 16px; + top: 15px; height: 60px; - width: 25px + width: 75px } .panelStyle { background: #e5ecff; border-top: 2px solid white; width: 100%; + } + +<!-- DisclosurePanel header section --> + .panelStyle a[class=header] { + font-weight: bold; } </ui:style> @@ -127,12 +134,10 @@ <g:VerticalPanel addStyleNames="{style.bootSequenceButtonPanel}"> <g:PushButton ui:field="bootSequenceUpButton" addStyleNames="{style.bootSequenceButton} {style.bootSequenceButtonUp}" enabled="false"> - <g:upFace image='{resources.bootSequenceListBoxButtonUp}' /> </g:PushButton> <g:PushButton ui:field="bootSequenceDownButton" addStyleNames="{style.bootSequenceButton} {style.bootSequenceButtonDown}" enabled="false"> - <g:upFace image='{resources.bootSequenceListBoxButtonDown}' /> </g:PushButton> </g:VerticalPanel> </g:AbsolutePanel> diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmRunOncePopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmRunOncePopupView.java index 9122f0e..4fa3418 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmRunOncePopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmRunOncePopupView.java @@ -20,7 +20,7 @@ @Inject public VmRunOncePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { - super(eventBus, resources, new VmRunOncePopupWidget(constants, resources), "460px", "640px"); //$NON-NLS-1$ //$NON-NLS-2$ + super(eventBus, resources, new VmRunOncePopupWidget(constants, resources), "475px", "640px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmRunOncePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmRunOncePopupView.java index fd3946b..319d5a7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmRunOncePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmRunOncePopupView.java @@ -20,7 +20,7 @@ @Inject public VmRunOncePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { - super(eventBus, resources, new VmRunOncePopupWidget(constants, resources), "460px", "640px"); //$NON-NLS-1$ //$NON-NLS-2$ + super(eventBus, resources, new VmRunOncePopupWidget(constants, resources), "475px", "640px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); } -- To view, visit http://gerrit.ovirt.org/7942 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55f58598dc8d627c31da31588cfe8530997e05b1 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
