Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: fix alignment in New Cluster dialog / Optimization ......................................................................
webadmin: fix alignment in New Cluster dialog / Optimization New Cluster dialog / Optimization tab had alignment and spacing issues. Fixed. Change-Id: Iae1712442dec2988e51312461df4c8669441f4ea Bug-Url: https://bugzilla.redhat.com/1123319 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml 3 files changed, 18 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/32433/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java index 1675406..ffe3ed8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java @@ -161,9 +161,6 @@ @Template("<div style='max-width: 500px; word-wrap:break-word; font-style: italic;'>{0}</div>") SafeHtml italicWordWrapMaxWidth(String text); - @Template("<div style='width:90%; display:inline-block; vertical-align: top;'>{0}</div>") - SafeHtml radioButtonLabel(String text); - @Template("<div style='max-width: 250px; display:inline-block;'>{0}</div>") SafeHtml maxWidthNteworkItemPopup(String text); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java index d69f145..0b8ce6a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java @@ -451,8 +451,7 @@ optimizationTab.setLabel(constants.clusterPopupOptimizationTabLabel()); memoryOptimizationPanelTitle.setText(constants.clusterPopupMemoryOptimizationPanelTitle()); - optimizationNoneEditor.asRadioButton() - .setHTML(templates.radioButtonLabel(constants.clusterPopupOptimizationNoneLabel())); + optimizationNoneEditor.setLabel(constants.clusterPopupOptimizationNoneLabel()); cpuThreadsPanelTitle.setText(constants.clusterPopupCpuThreadsPanelTitle()); countThreadsAsCoresEditor.setLabel(constants.clusterPopupCountThreadsAsCoresLabel()); @@ -730,18 +729,16 @@ private void optimizationForServerFormatter(ClusterModel object) { if (object.getOptimizationForServer() != null && object.getOptimizationForServer().getEntity() != null) { - optimizationForServerEditor.asRadioButton() - .setHTML(templates.radioButtonLabel(messages.clusterPopupMemoryOptimizationForServerLabel( - object.getOptimizationForServer().getEntity().toString()))); + optimizationForServerEditor.setLabel(messages.clusterPopupMemoryOptimizationForServerLabel( + object.getOptimizationForServer().getEntity().toString())); } } private void optimizationForDesktopFormatter(ClusterModel object) { if (object.getOptimizationForDesktop() != null && object.getOptimizationForDesktop().getEntity() != null) { - optimizationForDesktopEditor.asRadioButton() - .setHTML(templates.radioButtonLabel(messages.clusterPopupMemoryOptimizationForDesktopLabel( - object.getOptimizationForDesktop().getEntity().toString()))); + optimizationForDesktopEditor.setLabel(messages.clusterPopupMemoryOptimizationForDesktopLabel( + object.getOptimizationForDesktop().getEntity().toString())); } } @@ -749,9 +746,8 @@ if (object.getOptimizationCustom() != null && object.getOptimizationCustom().getEntity() != null) { // Use current value because object.getOptimizationCustom.getEntity() can be null - optimizationCustomEditor.asRadioButton() - .setHTML(templates.radioButtonLabel(messages.clusterPopupMemoryOptimizationCustomLabel( - String.valueOf(object.getMemoryOverCommit())))); + optimizationCustomEditor.setLabel(messages.clusterPopupMemoryOptimizationCustomLabel( + String.valueOf(object.getMemoryOverCommit()))); } } @@ -783,6 +779,8 @@ String fullWidth(); String timeTextBoxEditorWidget(); + + String optimizationTabPanel(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml index bdd279f..8adb0e4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml @@ -144,6 +144,14 @@ margin-bottom: 5px; } + .optimizationTabPanel { + height: 470px; + } + + .optimizationTabPanel label { + display: inline; + } + </ui:style> <d:SimpleDialogPanel width="800px" height="560px"> @@ -189,7 +197,7 @@ <t:tab> <t:DialogTab ui:field="optimizationTab"> <t:content> - <g:FlowPanel> + <g:FlowPanel addStyleNames="{style.optimizationTabPanel}"> <g:FlowPanel addStyleNames="{style.radioButtonsTabContent}"> <g:Label ui:field="memoryOptimizationPanelTitle" addStyleNames="{style.panelTitle}" /> <d:InfoIcon ui:field="memoryOptimizationInfo" addStyleNames="{style.panelInfo} cpv_panelInfo_pfly_fix" /> -- To view, visit http://gerrit.ovirt.org/32433 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae1712442dec2988e51312461df4c8669441f4ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
