Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: added visual indicator for tooltips ......................................................................
userportal, webadmin: added visual indicator for tooltips In AbstractValidatedWidgetWithLabel, added a visual indicator (a dotted underline) to all labels when they get tooltips set on them. This is similar to the functionality we currently have for grid headers that have tooltips. Change-Id: I68ed5a61677bf798e692122452c8fed5d493c1fb Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/css/OvirtCss.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/SafeHtmlHeader.java M packaging/branding/ovirt.brand/ovirt.css 5 files changed, 28 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/41296/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/css/OvirtCss.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/css/OvirtCss.java index b6e8bc9..21ddd55 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/css/OvirtCss.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/css/OvirtCss.java @@ -7,7 +7,14 @@ */ public class OvirtCss { + // labels + public final static String LABEL_ENABLED = "labelEnabled"; //$NON-NLS-1$ public final static String LABEL_DISABLED = "labelDisabled"; //$NON-NLS-1$ + + // tooltips + + public final static String HAS_TOOLTIP = "hasTooltip"; //$NON-NLS-1$ + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java index d3542c3..e74d1d0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java @@ -312,6 +312,7 @@ } labelTooltip.setText(labelConfiguredTooltip); labelTooltip.reconfigure(); + setLabelTooltipStyle(labelConfiguredTooltip); contentWidgetContainerTooltip.setText(contentWidgetContainerConfiguredTooltip); contentWidgetContainerTooltip.reconfigure(); } @@ -322,6 +323,7 @@ String tooltipText = getValidationTooltipText(validationHints); labelTooltip.setText(tooltipText); labelTooltip.reconfigure(); + addLabelStyleName(OvirtCss.HAS_TOOLTIP); contentWidgetContainerTooltip.setText(tooltipText); contentWidgetContainerTooltip.reconfigure(); } @@ -341,6 +343,19 @@ labelConfiguredTooltip = tooltipText; labelTooltip.setText(tooltipText); labelTooltip.reconfigure(); + setLabelTooltipStyle(tooltipText); + } + + /** + * Toggle the label tooltip style (to give a visual clue that this label can be hovered over). + */ + protected void setLabelTooltipStyle(String tooltipText) { + if (tooltipText == null || tooltipText.isEmpty()) { + removeLabelStyleName(OvirtCss.HAS_TOOLTIP); + } + else { + addLabelStyleName(OvirtCss.HAS_TOOLTIP); + } } // set styleNames on my components diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.ui.xml index 72b909f..9ba716a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.ui.xml @@ -8,13 +8,14 @@ .wrapper_legacy { line-height: 30px; text-align: left; + padding: 0 5px; } .label_legacy { font-size: 13px; - padding: 0 5px; font-family: Arial, sans-serif; line-height: 16px; + padding: 0; } .contentWidgetContainer_legacy { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/SafeHtmlHeader.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/SafeHtmlHeader.java index 9b3f986..00682a0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/SafeHtmlHeader.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/SafeHtmlHeader.java @@ -29,8 +29,8 @@ public static final SafeHtmlHeader BLANK_HEADER = new SafeHtmlHeader(SafeHtmlUtils.fromSafeConstant("")); //$NON-NLS-1$ interface CellTemplate extends SafeHtmlTemplates { - @Template("<span class=\"underlinedHeader\">{0}</span>") - SafeHtml underlinedHeader(SafeHtml html); + @Template("<span class=\"hasTooltip\">{0}</span>") + SafeHtml hasTooltip(SafeHtml html); } private static final CellTemplate templates = GWT.create(CellTemplate.class); @@ -93,7 +93,7 @@ protected void setValue(SafeHtml headerText) { if (showUnderline) { - this.headerText = templates.underlinedHeader(headerText); + this.headerText = templates.hasTooltip(headerText); } else { this.headerText = headerText; diff --git a/packaging/branding/ovirt.brand/ovirt.css b/packaging/branding/ovirt.brand/ovirt.css index e7fed80..0e4ecd4 100644 --- a/packaging/branding/ovirt.brand/ovirt.css +++ b/packaging/branding/ovirt.brand/ovirt.css @@ -53,6 +53,6 @@ TODO: use SASS, break into columns.scss ****************************************/ -.underlinedHeader { +.hasTooltip { border-bottom: 1px dotted #000; } -- To view, visit https://gerrit.ovirt.org/41296 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68ed5a61677bf798e692122452c8fed5d493c1fb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches