Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: Fixed layout issues in es locale ......................................................................
userportal,webadmin: Fixed layout issues in es locale Some CSS tweaks to have the layout correct on es locale Change-Id: Ic8d116081da88304ae71f3ea6b40c3e893a6177d Bug-Url: https://bugzilla.redhat.com/999855 Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java 4 files changed, 30 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/30697/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml index 90323fe..f461c72 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml @@ -10,7 +10,6 @@ float: left; padding-left: 5px; margin-left: 5px; - width: 400px; } .headerLabel { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 9704a00..f4af3d5 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -844,7 +844,6 @@ isDeleteProtectedEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isSmartcardEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isConsoleDeviceEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer(), true); - isRngEnabledEditor = new EntityModelCheckBoxOnlyEditor(new ModeSwitchingVisibilityRenderer()); rngPeriodEditor = new IntegerEntityModelTextBoxEditor(new ModeSwitchingVisibilityRenderer()); rngBytesEditor = new IntegerEntityModelTextBoxEditor(new ModeSwitchingVisibilityRenderer()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index ba9c4f1..4a5f8e6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -69,7 +69,7 @@ .migrationDowntimeLabel { display: inline-block; float: left; - max-width: 200px; + max-width: 184px; } .migrationDowntimeInfoIcon { @@ -84,15 +84,23 @@ } <!-- turns off the original styles --> - .checkboxWithLongLabel, .checkbox { + .checkbox { margin-left: -9px; + } + + .checkboxWithLongLabel { + width: 400px; + float: left; + clear: both; } .checkboxWithLongLabel label { margin-left: 26px; - margin-top: -26px; + margin-top: -18px; display: block; line-height: 20px; + width: 400px; + float: left; } .longCheckboxContent { @@ -343,7 +351,7 @@ } .cpuPinningTextBox { - width: 202px; + width: 197px; padding-left: 5px; } @@ -359,13 +367,23 @@ float: left; } - .floatLeft { + .floatLeft, .detachableCheckBox { float: left; + } + + + .detachableCheckBox { + width: 400px; } .fullWidth { width: 100%; } + + .detachableStyle { + display: inline-block; + } + </ui:style> <t:DialogTabPanel width="100%" height="100%" ui:field="mainTabPanel"> @@ -528,15 +546,13 @@ <ge:EntityModelCheckBoxEditor ui:field="allowConsoleReconnectEditor" addStyleNames="{style.checkboxWithLongLabel}" /> </g:FlowPanel> - <g:FlowPanel> - <ge:EntityModelDetachableWidget ui:field="isSoundcardEnabledEditorWithDetachable" addStyleNames="{style.checkbox}" /> - <ge:EntityModelDetachableWidget ui:field="isConsoleDeviceEnabledEditorWithDetachable" addStyleNames="{style.checkbox}" /> - </g:FlowPanel> + <ge:EntityModelDetachableWidget ui:field="isSoundcardEnabledEditorWithDetachable" addStyleNames="{style.checkboxWithLongLabel}" /> + <ge:EntityModelDetachableWidget ui:field="isConsoleDeviceEnabledEditorWithDetachable" addStyleNames="{style.checkboxWithLongLabel}" /> <w:EntityModelWidgetWithInfo ui:field="spiceProxyEnabledCheckboxWithInfoIcon" /> - <ge:StringEntityModelTextBoxEditor ui:field="spiceProxyEditor"/> - <ge:EntityModelCheckBoxEditor ui:field="spiceFileTransferEnabledEditor" addStyleNames="{style.checkbox}" /> - <ge:EntityModelCheckBoxEditor ui:field="spiceCopyPasteEnabledEditor" addStyleNames="{style.checkbox}" /> + <ge:StringEntityModelTextBoxEditor ui:field="spiceProxyEditor" /> + <ge:EntityModelCheckBoxEditor ui:field="spiceFileTransferEnabledEditor" addStyleNames="{style.checkboxWithLongLabel}" /> + <ge:EntityModelCheckBoxEditor ui:field="spiceCopyPasteEnabledEditor" addStyleNames="{style.checkboxWithLongLabel}" /> </g:FlowPanel> </t:content> </t:DialogTab> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java index 3ac361d..a808329 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java @@ -508,6 +508,7 @@ sysprepDomainEditor.addStyleName(customizableStyle.primaryOption()); networkStartOnBootEditor.addStyleName(customizableStyle.primaryOption()); networkDhcpEditor.addStyleName(customizableStyle.primaryOption()); + windowsSysprepTimeZoneEditor.addStyleName(customizableStyle.primaryOption()); inputLocaleEditor.addStyleName(customizableStyle.primaryOption()); uiLanguageEditor.addStyleName(customizableStyle.primaryOption()); @@ -529,7 +530,6 @@ cloudInitPasswordSetEditor.addStyleName(customizableStyle.primaryOption()); sysprepPasswordSetEditor.addStyleName(customizableStyle.primaryOption()); regenerateKeysEnabledEditor.addStyleName(customizableStyle.primaryOption()); - networkExpanderContent.addStyleName(customizableStyle.primaryOption()); customScriptEditor.setContentWidgetStyleName(customizableStyle.customScript()); @@ -538,6 +538,7 @@ sysprepScriptExpanderContent.addStyleName(customizableStyle.expanderContent()); sysprepPasswordExpanderContent.addStyleName(customizableStyle.expanderContent()); sysprepInputsExpanderContent.addStyleName(customizableStyle.expanderContent()); + networkExpanderContent.addStyleName(customizableStyle.expanderContent()); } /* Controls style for network options based on network selection */ -- To view, visit http://gerrit.ovirt.org/30697 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8d116081da88304ae71f3ea6b40c3e893a6177d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
