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 2 files changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/20580/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 e7035b7..397e742 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 @@ -145,4 +145,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..f0a3925 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(); @@ -308,7 +311,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 +483,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 +502,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())))); } } -- To view, visit http://gerrit.ovirt.org/20580 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bd4ef709ada858140cd33d909aed3dc3171f6df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
