Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: radiobutton text is truncated & unaligned ......................................................................
webadmin: radiobutton text is truncated & unaligned Discovered in pt-BR locale Cluster dialog: radio buttons labels in "optimization" section are truncated and unaligned for long text Change-Id: I5bd4ef709ada858140cd33d909aed3dc3171f6df Bug-Url: https://bugzilla.redhat.com/1018382 Signed-off-by: Gilad Chaplik <[email protected]> --- 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, 25 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/20977/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 4bcf536..d4f6c78 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 @@ -142,4 +142,7 @@ @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); } 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 f905e1f..2f994c9 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 @@ -251,10 +251,13 @@ private final ApplicationMessages messages; + private final ApplicationTemplates templates; + @Inject public ClusterPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationMessages messages, ApplicationTemplates templates) { super(eventBus, resources); this.messages = messages; + this.templates = templates; initListBoxEditors(); initRadioButtonEditors(); initCheckBoxEditors(); @@ -274,11 +277,6 @@ migrateOnErrorOption_NOEditor.addContentWidgetStyleName(style.label()); migrateOnErrorOption_YESEditor.addContentWidgetStyleName(style.label()); migrateOnErrorOption_HA_ONLYEditor.addContentWidgetStyleName(style.label()); - - optimizationNoneEditor.setContentWidgetStyleName(style.fullWidth()); - optimizationForServerEditor.setContentWidgetStyleName(style.fullWidth()); - optimizationForDesktopEditor.setContentWidgetStyleName(style.fullWidth()); - optimizationCustomEditor.setContentWidgetStyleName(style.fullWidth()); countThreadsAsCoresEditor.setContentWidgetStyleName(style.fullWidth()); enableTrustedServiceEditor.setContentWidgetStyleName(style.fullWidth()); @@ -308,7 +306,8 @@ optimizationTab.setLabel(constants.clusterPopupOptimizationTabLabel()); memoryOptimizationPanelTitle.setText(constants.clusterPopupMemoryOptimizationPanelTitle()); - optimizationNoneEditor.setLabel(constants.clusterPopupOptimizationNoneLabel()); + optimizationNoneEditor.asRadioButton() + .setHTML(templates.radioButtonLabel(constants.clusterPopupOptimizationNoneLabel())); cpuThreadsPanelTitle.setText(constants.clusterPopupCpuThreadsPanelTitle()); countThreadsAsCoresEditor.setLabel(constants.clusterPopupCountThreadsAsCoresLabel()); @@ -479,16 +478,18 @@ private void optimizationForServerFormatter(ClusterModel object) { if (object.getOptimizationForServer() != null && object.getOptimizationForServer().getEntity() != null) { - optimizationForServerEditor.setLabel(messages.clusterPopupMemoryOptimizationForServerLabel( - object.getOptimizationForServer().getEntity().toString())); + optimizationForServerEditor.asRadioButton() + .setHTML(templates.radioButtonLabel(messages.clusterPopupMemoryOptimizationForServerLabel( + object.getOptimizationForServer().getEntity().toString()))); } } private void optimizationForDesktopFormatter(ClusterModel object) { if (object.getOptimizationForDesktop() != null && object.getOptimizationForDesktop().getEntity() != null) { - optimizationForDesktopEditor.setLabel(messages.clusterPopupMemoryOptimizationForDesktopLabel( - object.getOptimizationForDesktop().getEntity().toString())); + optimizationForDesktopEditor.asRadioButton() + .setHTML(templates.radioButtonLabel(messages.clusterPopupMemoryOptimizationForDesktopLabel( + object.getOptimizationForDesktop().getEntity().toString()))); } } @@ -496,8 +497,9 @@ if (object.getOptimizationCustom() != null && object.getOptimizationCustom().getEntity() != null) { // Use current value because object.getOptimizationCustom.getEntity() can be null - optimizationCustomEditor.setLabel(messages.clusterPopupMemoryOptimizationCustomLabel( - String.valueOf(object.getMemoryOverCommit()))); + optimizationCustomEditor.asRadioButton() + .setHTML(templates.radioButtonLabel(messages.clusterPopupMemoryOptimizationCustomLabel( + String.valueOf(object.getMemoryOverCommit())))); } } 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 184d520..461122f 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 @@ -62,6 +62,10 @@ padding: 0 5px; line-height: 26px; } + .radioButtonPositioning { + padding: 0 5px; + margin-top: 5px; + } .panelTitle { font-size: 14px; padding-left: 3px; @@ -178,10 +182,10 @@ <g:FlowPanel addStyleNames="{style.radioButtonsTabContent}"> <g:Label ui:field="memoryOptimizationPanelTitle" addStyleNames="{style.panelTitle}" /> <d:InfoIcon ui:field="memoryOptimizationInfo" addStyleNames="{style.panelInfo}" /> - <e:EntityModelRadioButtonEditor ui:field="optimizationNoneEditor" /> - <e:EntityModelRadioButtonEditor ui:field="optimizationForServerEditor" /> - <e:EntityModelRadioButtonEditor ui:field="optimizationForDesktopEditor" /> - <e:EntityModelRadioButtonEditor ui:field="optimizationCustomEditor" /> + <e:EntityModelRadioButtonEditor ui:field="optimizationNoneEditor" addStyleNames="{style.radioButtonPositioning}"/> + <e:EntityModelRadioButtonEditor ui:field="optimizationForServerEditor" addStyleNames="{style.radioButtonPositioning}"/> + <e:EntityModelRadioButtonEditor ui:field="optimizationForDesktopEditor" addStyleNames="{style.radioButtonPositioning}"/> + <e:EntityModelRadioButtonEditor ui:field="optimizationCustomEditor" addStyleNames="{style.radioButtonPositioning}"/> </g:FlowPanel> <g:FlowPanel ui:field="cpuThreadsPanel" addStyleNames="{style.nestedSubsequentPanel}"> <g:Label ui:field="cpuThreadsPanelTitle" addStyleNames="{style.panelTitle}" /> -- To view, visit http://gerrit.ovirt.org/20977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bd4ef709ada858140cd33d909aed3dc3171f6df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
