Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: convert InfoIcons to PatternFly tooltips ......................................................................
userportal, webadmin: convert InfoIcons to PatternFly tooltips Converted InfoIcon to use PatternFly tooltips. Because some InfoIcons require a longer length than 220px (usual tooltip width), added infrastructure for setting a custom width on a tooltip. Note: this infrastructure required a custom copy of gwtbootstrap3's Tooltip class. I will submit a patch to gwtbootstrap3 to incorporate this behavior. When that is release and we upgrade, the custom copy of Tooltip can be replaced. There is a TODO-GWT in the code for this. Enforced italic HTML in InfoIcon, with an option to disable. Bug-Url: https://bugzilla.redhat.com/1067318 Bug-Url: https://bugzilla.redhat.com/1109816 Change-Id: Ie6a4cce6c708eacccc2733cd653b6ae135ad3d64 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/InfoIcon.java A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/Tooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/TooltipConfig.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/WidgetTooltip.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java 6 files changed, 766 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/37990/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/InfoIcon.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/InfoIcon.java index 6f96e51..77ead73 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/InfoIcon.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/InfoIcon.java @@ -1,37 +1,36 @@ package org.ovirt.engine.ui.common.widget.dialog; import org.ovirt.engine.ui.common.CommonApplicationResources; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipConfig.Width; +import org.ovirt.engine.ui.common.widget.tooltip.WidgetTooltip; import com.google.gwt.event.dom.client.MouseOutEvent; import com.google.gwt.event.dom.client.MouseOutHandler; import com.google.gwt.event.dom.client.MouseOverEvent; import com.google.gwt.event.dom.client.MouseOverHandler; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.user.client.ui.DecoratedPopupPanel; import com.google.gwt.user.client.ui.FocusPanel; -import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Image; public class InfoIcon extends FocusPanel { private Image infoImage; - private Image infoImageHover; - private final DecoratedPopupPanel infoPanel = new DecoratedPopupPanel(true); + private final WidgetTooltip tooltip; + private boolean useItalic = true; - public InfoIcon(SafeHtml text, CommonApplicationResources resources) { + public InfoIcon(SafeHtml text, final CommonApplicationResources resources) { super(); - initInfoImages(resources); + infoImage = new Image(resources.dialogIconHelp()); - setWidget(infoImage); - infoPanel.setWidget(new HTML(text)); - infoPanel.getElement().getStyle().setZIndex(1); + tooltip = new WidgetTooltip(infoImage); + _setText(text.asString()); + setWidget(tooltip); addMouseOutHandler(new MouseOutHandler() { @Override public void onMouseOut(MouseOutEvent event) { - setWidget(infoImage); - infoPanel.hide(true); + infoImage.setUrl(resources.dialogIconHelp().getSafeUri()); } }); @@ -39,18 +38,43 @@ @Override public void onMouseOver(MouseOverEvent event) { - setWidget(infoImageHover); - infoPanel.showRelativeTo(InfoIcon.this); + infoImage.setUrl(resources.dialogIconHelpRollover().getSafeUri()); } }); } - private void initInfoImages(CommonApplicationResources resources) { - infoImage = new Image(resources.dialogIconHelp()); - infoImageHover = new Image(resources.dialogIconHelpRollover()); + public void setText(SafeHtml text) { + _setText(text.asString()); + tooltip.reconfigure(); } - public void setText(SafeHtml text) { - infoPanel.setWidget(new HTML(text)); + private void _setText(String text) { + if (useItalic) { + text = wrapItalic(text); + } + tooltip.setText(text); } + + /** + * Return the tooltip text, wrapped in italic if there wasn't already italic detected. + */ + private String wrapItalic(String text) { + if (text == null || text.isEmpty() || text.contains("<i>")) { //$NON-NLS-1$ + return text; + } + return text = "<i>" + text + "</i>"; //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void setTooltipMaxWidth(Width width) { + tooltip.setMaxWidth(width); + } + + public boolean isUseItalic() { + return useItalic; + } + + public void setUseItalic(boolean useItalic) { + this.useItalic = useItalic; + } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/Tooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/Tooltip.java new file mode 100644 index 0000000..81593be --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/Tooltip.java @@ -0,0 +1,710 @@ +package org.ovirt.engine.ui.common.widget.tooltip; + +/* + * #%L + * GwtBootstrap3 + * %% + * Copyright (C) 2013 GwtBootstrap3 + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +import java.util.Iterator; +import java.util.NoSuchElementException; + +import org.gwtbootstrap3.client.shared.event.HiddenEvent; +import org.gwtbootstrap3.client.shared.event.HiddenHandler; +import org.gwtbootstrap3.client.shared.event.HideEvent; +import org.gwtbootstrap3.client.shared.event.HideHandler; +import org.gwtbootstrap3.client.shared.event.ShowEvent; +import org.gwtbootstrap3.client.shared.event.ShowHandler; +import org.gwtbootstrap3.client.shared.event.ShownEvent; +import org.gwtbootstrap3.client.shared.event.ShownHandler; +import org.gwtbootstrap3.client.ui.base.HasHover; +import org.gwtbootstrap3.client.ui.base.HasId; +import org.gwtbootstrap3.client.ui.constants.Placement; +import org.gwtbootstrap3.client.ui.constants.Trigger; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.logical.shared.AttachEvent; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.ui.HasOneWidget; +import com.google.gwt.user.client.ui.HasWidgets; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Widget; +import com.google.web.bindery.event.shared.HandlerRegistration; + +/** + * ======================================================================================== + * oVirt customization of gwtbootstrap3 tooltip + * ======================================================================================== + * TODO-GWT switch back to using native gwtbootstrap3 tooltip when upstream patch + * xxx is merged and released. + * ======================================================================================== + * ======================================================================================== + * + * Basic implementation for the Bootstrap tooltip + * <p/> + * <a href="http://getbootstrap.com/javascript/#tooltips";>Bootstrap Documentation</a> + * <p/> + * <p/> + * <h3>UiBinder example</h3> + * <p/> + * <pre> + * {@code + * <t:Tooltip text="..."> + * ... + * </t:Tooltip> + * } + * </pre> + * <p/> + * ** Must call reconfigure() after altering any/all Tooltips! + * + * @author Joshua Godi + * @author Pontus Enmark + * @author Greg Sheremeta + */ +public class Tooltip implements IsWidget, HasWidgets, HasOneWidget, HasId, HasHover { + private static final String TOGGLE = "toggle"; //$NON-NLS-1$ + private static final String SHOW = "show"; //$NON-NLS-1$ + private static final String HIDE = "hide"; //$NON-NLS-1$ + private static final String DESTROY = "destroy"; //$NON-NLS-1$ + + // Defaults from http://getbootstrap.com/javascript/#tooltips + private boolean isAnimated = true; + private boolean isHTML = false; + private Placement placement = Placement.TOP; + private Trigger trigger = Trigger.HOVER; + private String title = ""; //$NON-NLS-1$ + private int hideDelayMs = 0; + private int showDelayMs = 0; + private String container = null; + private final String selector = null; + + private String tooltipClassNames = "tooltip"; //$NON-NLS-1$ + private String tooltipArrowClassNames = "tooltip-arrow"; //$NON-NLS-1$ + private String tooltipInnerClassNames = "tooltip-inner"; //$NON-NLS-1$ + + private final static String DEFAULT_TEMPLATE = "<div class=\"{0}\"><div class=\"{1}\"></div><div class=\"{2}\"></div></div>"; //$NON-NLS-1$ + private String alternateTemplate = null; + + private Widget widget; + private String id; + + /** + * Creates the empty Tooltip + */ + public Tooltip() { + } + + /** + * Creates the tooltip around this widget + * + * @param w widget for the tooltip + */ + public Tooltip(final Widget w) { + setWidget(w); + } + + /** + * {@inheritDoc} + */ + @Override + public void setWidget(final Widget w) { + // Validate + if (w == widget) { + return; + } + + // Detach new child + if (w != null) { + w.removeFromParent(); + } + + // Remove old child + if (widget != null) { + remove(widget); + } + + // Logical attach, but don't physical attach; done by jquery. + widget = w; + if (widget == null) { + return; + } + + // Bind jquery events + bindJavaScriptEvents(widget.getElement()); + + // When we attach it, configure the tooltip + widget.addAttachHandler(new AttachEvent.Handler() { + @Override + public void onAttachOrDetach(final AttachEvent event) { + reconfigure(); + } + }); + } + + /** + * {@inheritDoc} + */ + @Override + public void add(final Widget child) { + if (getWidget() != null) { + throw new IllegalStateException("Can only contain one child widget"); //$NON-NLS-1$ + } + setWidget(child); + } + + /** + * {@inheritDoc} + */ + @Override + public void setWidget(final IsWidget w) { + widget = (w == null) ? null : w.asWidget(); + } + + /** + * {@inheritDoc} + */ + @Override + public Widget getWidget() { + return widget; + } + + /** + * {@inheritDoc} + */ + @Override + public void setId(final String id) { + this.id = id; + if (widget != null) { + widget.getElement().setId(id); + } + } + + /** + * {@inheritDoc} + */ + @Override + public String getId() { + return (widget == null) ? id : widget.getElement().getId(); + } + + @Override + public void setIsAnimated(final boolean isAnimated) { + this.isAnimated = isAnimated; + } + + /** + * {@inheritDoc} + */ + @Override + public boolean isAnimated() { + return isAnimated; + } + + /** + * {@inheritDoc} + */ + @Override + public void setIsHtml(final boolean isHTML) { + this.isHTML = isHTML; + } + + /** + * {@inheritDoc} + */ + @Override + public boolean isHtml() { + return isHTML; + } + + /** + * {@inheritDoc} + */ + @Override + public void setPlacement(final Placement placement) { + this.placement = placement; + } + + /** + * {@inheritDoc} + */ + @Override + public Placement getPlacement() { + return placement; + } + + /** + * {@inheritDoc} + */ + @Override + public void setTrigger(final Trigger trigger) { + this.trigger = trigger; + } + + /** + * {@inheritDoc} + */ + @Override + public Trigger getTrigger() { + return trigger; + } + + @Override + public void setShowDelayMs(final int showDelayMs) { + this.showDelayMs = showDelayMs; + } + + /** + * {@inheritDoc} + */ + @Override + public int getShowDelayMs() { + return showDelayMs; + } + + /** + * {@inheritDoc} + */ + @Override + public void setHideDelayMs(final int hideDelayMs) { + this.hideDelayMs = hideDelayMs; + } + + /** + * {@inheritDoc} + */ + @Override + public int getHideDelayMs() { + return hideDelayMs; + } + + /** + * {@inheritDoc} + */ + @Override + public void setContainer(final String container) { + this.container = container; + } + + /** + * {@inheritDoc} + */ + @Override + public String getContainer() { + return container; + } + + /** + * Gets the tooltip's display string + * + * @return String tooltip display string + */ + public String getTitle() { + return title; + } + + /** + * Sets the tooltip's display string + * + * @param text String display string + */ + public void setText(final String text) { + setTitle(text); + } + + /** + * Sets the tooltip's display string + * + * @param title String display string + */ + public void setTitle(final String title) { + this.title = title; + } + + public boolean isHTML() { + return isHTML; + } + + public void setHTML(boolean isHTML) { + this.isHTML = isHTML; + } + + public String getSelector() { + return selector; + } + + public void setAnimated(boolean isAnimated) { + this.isAnimated = isAnimated; + } + + public String getTooltipClassNames() { + return tooltipClassNames; + } + + public void setTooltipClassNames(String tooltipClassNames) { + this.tooltipClassNames = tooltipClassNames; + } + + public void addTooltipClassName(String tooltipClassName) { + this.tooltipClassNames += " " + tooltipClassName; //$NON-NLS-1$ + } + + public String getTooltipArrowClassNames() { + return tooltipArrowClassNames; + } + + public void setTooltipArrowClassNames(String tooltipArrowClassNames) { + this.tooltipArrowClassNames = tooltipArrowClassNames; + } + + public void addTooltipArrowClassName(String tooltipArrowClassName) { + this.tooltipArrowClassNames += " " + tooltipArrowClassName; //$NON-NLS-1$ + } + + public String getTooltipInnerClassNames() { + return tooltipInnerClassNames; + } + + public void setTooltipInnerClassNames(String tooltipInnerClassNames) { + this.tooltipInnerClassNames = tooltipInnerClassNames; + } + + public void addTooltipInnerClassName(String tooltipInnerClassName) { + this.tooltipInnerClassNames += " " + tooltipInnerClassName; //$NON-NLS-1$ + } + + public String getTemplate() { + return alternateTemplate; + } + + public void setTemplate(String alternateTemplate) { + this.alternateTemplate = alternateTemplate; + } + + /** + * Reconfigures the tooltip, must be called when altering any tooltip after it has already been shown + */ + public void reconfigure() { + // First destroy the old tooltip + destroy(); + + // prepare template + String template = null; + if (alternateTemplate == null) { + template = DEFAULT_TEMPLATE.replace("{0}", getTooltipClassNames()); //$NON-NLS-1$ + template = template.replace("{1}", getTooltipArrowClassNames()); //$NON-NLS-1$ + template = template.replace("{2}", getTooltipInnerClassNames()); //$NON-NLS-1$ + } + else { + template = alternateTemplate; + } + + // TODO clean this up + + // Setup the new tooltip + if (container != null && selector != null) { + tooltip(widget.getElement(), isAnimated, isHTML, placement.getCssName(), selector, title, + trigger.getCssName(), showDelayMs, hideDelayMs, container, template); + } else if (container != null) { + tooltip(widget.getElement(), isAnimated, isHTML, placement.getCssName(), title, + trigger.getCssName(), showDelayMs, hideDelayMs, container, template); + } else if (selector != null) { + tooltip(widget.getElement(), isAnimated, isHTML, placement.getCssName(), selector, title, + trigger.getCssName(), showDelayMs, hideDelayMs, template); + } else { + tooltip(widget.getElement(), isAnimated, isHTML, placement.getCssName(), title, + trigger.getCssName(), showDelayMs, hideDelayMs, template); + } + } + + /** + * Toggle the Tooltip to either show/hide + */ + public void toggle() { + call(widget.getElement(), TOGGLE); + } + + /** + * Force show the Tooltip + */ + public void show() { + call(widget.getElement(), SHOW); + } + + /** + * Force hide the Tooltip + */ + public void hide() { + call(widget.getElement(), HIDE); + } + + /** + * Force the Tooltip to be destroyed + */ + public void destroy() { + call(widget.getElement(), DESTROY); + } + + /** + * Can be override by subclasses to handle Tooltip's "show" event however + * it's recommended to add an event handler to the tooltip. + * + * @param evt Event + * @see org.gwtbootstrap3.client.shared.event.ShowEvent + */ + protected void onShow(final Event evt) { + widget.fireEvent(new ShowEvent(evt)); + } + + /** + * Can be override by subclasses to handle Tooltip's "shown" event however + * it's recommended to add an event handler to the tooltip. + * + * @param evt Event + * @see ShownEvent + */ + protected void onShown(final Event evt) { + widget.fireEvent(new ShownEvent(evt)); + } + + /** + * Can be override by subclasses to handle Tooltip's "hide" event however + * it's recommended to add an event handler to the tooltip. + * + * @param evt Event + * @see org.gwtbootstrap3.client.shared.event.HideEvent + */ + protected void onHide(final Event evt) { + widget.fireEvent(new HideEvent(evt)); + } + + /** + * Can be override by subclasses to handle Tooltip's "hidden" event however + * it's recommended to add an event handler to the tooltip. + * + * @param evt Event + * @see org.gwtbootstrap3.client.shared.event.HiddenEvent + */ + protected void onHidden(final Event evt) { + widget.fireEvent(new HiddenEvent(evt)); + } + + /** + * Adds a show handler to the Tooltip that will be fired when the Tooltip's show event is fired + * + * @param showHandler ShowHandler to handle the show event + * @return HandlerRegistration of the handler + */ + public HandlerRegistration addShowHandler(final ShowHandler showHandler) { + return widget.addHandler(showHandler, ShowEvent.getType()); + } + + /** + * Adds a shown handler to the Tooltip that will be fired when the Tooltip's shown event is fired + * + * @param shownHandler ShownHandler to handle the shown event + * @return HandlerRegistration of the handler + */ + public HandlerRegistration addShownHandler(final ShownHandler shownHandler) { + return widget.addHandler(shownHandler, ShownEvent.getType()); + } + + /** + * Adds a hide handler to the Tooltip that will be fired when the Tooltip's hide event is fired + * + * @param hideHandler HideHandler to handle the hide event + * @return HandlerRegistration of the handler + */ + public HandlerRegistration addHideHandler(final HideHandler hideHandler) { + return widget.addHandler(hideHandler, HideEvent.getType()); + } + + /** + * Adds a hidden handler to the Tooltip that will be fired when the Tooltip's hidden event is fired + * + * @param hiddenHandler HiddenHandler to handle the hidden event + * @return HandlerRegistration of the handler + */ + public HandlerRegistration addHiddenHandler(final HiddenHandler hiddenHandler) { + return widget.addHandler(hiddenHandler, HiddenEvent.getType()); + } + + /** + * {@inheritDoc} + */ + @Override + public void clear() { + widget = null; + } + + /** + * {@inheritDoc} + */ + @Override + public Iterator<Widget> iterator() { + // Simple iterator for the widget + return new Iterator<Widget>() { + boolean hasElement = widget != null; + Widget returned = null; + + @Override + public boolean hasNext() { + return hasElement; + } + + @Override + public Widget next() { + if (!hasElement || (widget == null)) { + throw new NoSuchElementException(); + } + hasElement = false; + return (returned = widget); + } + + @Override + public void remove() { + if (returned != null) { + Tooltip.this.remove(returned); + } + } + }; + } + + /** + * {@inheritDoc} + */ + @Override + public boolean remove(final Widget w) { + // Validate. + if (widget != w) { + return false; + } + + // Logical detach. + clear(); + return true; + } + + /** + * {@inheritDoc} + */ + @Override + public Widget asWidget() { + return widget; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return asWidget().toString(); + } + + // @formatter:off + private native void bindJavaScriptEvents(final Element e) /*-{ + var target = this; + var $tooltip = $wnd.jQuery(e); + + $tooltip.on('show.bs.tooltip', function (evt) { + targ...@org.ovirt.engine.ui.common.widget.tooltip.Tooltip::onShow(Lcom/google/gwt/user/client/Event;)(evt); + }); + + $tooltip.on('shown.bs.tooltip', function (evt) { + targ...@org.ovirt.engine.ui.common.widget.tooltip.Tooltip::onShown(Lcom/google/gwt/user/client/Event;)(evt); + }); + + $tooltip.on('hide.bs.tooltip', function (evt) { + targ...@org.ovirt.engine.ui.common.widget.tooltip.Tooltip::onHide(Lcom/google/gwt/user/client/Event;)(evt); + }); + + $tooltip.on('hidden.bs.tooltip', function (evt) { + targ...@org.ovirt.engine.ui.common.widget.tooltip.Tooltip::onHidden(Lcom/google/gwt/user/client/Event;)(evt); + }); + }-*/; + + private native void call(final Element e, final String arg) /*-{ + $wnd.jQuery(e).tooltip(arg); + }-*/; + + private native void tooltip(Element e, boolean animation, boolean html, String placement, String selector, + String title, String trigger, int showDelay, int hideDelay, String container, String template) /*-{ + $wnd.jQuery(e).tooltip({ + animation: animation, + html: html, + placement: placement, + selector: selector, + title: title, + trigger: trigger, + delay: { + show: showDelay, + hide: hideDelay + }, + container: container, + template: template + }); + }-*/; + + private native void tooltip(Element e, boolean animation, boolean html, String placement, + String title, String trigger, int showDelay, int hideDelay, String container, String template) /*-{ + $wnd.jQuery(e).tooltip({ + animation: animation, + html: html, + placement: placement, + title: title, + trigger: trigger, + delay: { + show: showDelay, + hide: hideDelay + }, + container: container, + template: template + }); + }-*/; + + private native void tooltip(Element e, boolean animation, boolean html, String placement, String selector, + String title, String trigger, int showDelay, int hideDelay, String template) /*-{ + $wnd.jQuery(e).tooltip({ + animation: animation, + html: html, + placement: placement, + selector: selector, + title: title, + trigger: trigger, + delay: { + show: showDelay, + hide: hideDelay + }, + template: template + }); + }-*/; + + private native void tooltip(Element e, boolean animation, boolean html, String placement, + String title, String trigger, int showDelay, int hideDelay, String template) /*-{ + $wnd.jQuery(e).tooltip({ + animation: animation, + html: html, + placement: placement, + title: title, + trigger: trigger, + delay: { + show: showDelay, + hide: hideDelay + }, + template: template + }); + }-*/; +} diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/TooltipConfig.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/TooltipConfig.java index f41b614..f458b7c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/TooltipConfig.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/TooltipConfig.java @@ -26,6 +26,7 @@ } } + public final static String TEMPLATE = "<div class=\"tooltip\"><div class=\"tooltip-arrow\"></div><div class=\"tooltip-inner\"></div></div>"; //$NON-NLS-1$ public final static boolean IS_ANIMATED = true; public final static boolean IS_HTML = true; public final static Placement PLACEMENT = Placement.TOP; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/WidgetTooltip.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/WidgetTooltip.java index a129f13..16334c6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/WidgetTooltip.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/WidgetTooltip.java @@ -1,6 +1,6 @@ package org.ovirt.engine.ui.common.widget.tooltip; -import org.gwtbootstrap3.client.ui.Tooltip; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipConfig.Width; import com.google.gwt.user.client.ui.Widget; @@ -30,4 +30,8 @@ this.setContainer(TooltipConfig.CONTAINER); } + public void setMaxWidth(Width width) { + addTooltipClassName(width.getWidthClass()); + } + } 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 5a7c126..de0a778 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 @@ -75,6 +75,7 @@ import org.ovirt.engine.ui.common.widget.renderer.MemorySizeRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipConfig.Width; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfigMap; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.SerialNumberPolicyWidget; @@ -936,10 +937,11 @@ isVirtioScsiEnabled = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isSingleQxlEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); cpuPinningInfo = - new InfoIcon(SafeHtmlUtils.fromTrustedString(applicationTemplates.italicFixedWidth("400px", //$NON-NLS-1$ + new InfoIcon(SafeHtmlUtils.fromTrustedString(applicationTemplates.italicText( constants.cpuPinningLabelExplanation()) .asString() .replaceAll("(\r\n|\n)", "<br />")), resources);//$NON-NLS-1$ //$NON-NLS-2$ + cpuPinningInfo.setTooltipMaxWidth(Width.W420); isVirtioScsiEnabledInfoIcon = new InfoIcon(applicationTemplates.italicText(constants.isVirtioScsiEnabledInfo()), resources); final Integer defaultMaximumMigrationDowntime = (Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMaximumMigrationDowntime); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java index fa0d481..6af4bb8c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java @@ -15,6 +15,7 @@ import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelRadioButtonEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipConfig.Width; import org.ovirt.engine.ui.uicommonweb.models.TabName; import org.ovirt.engine.ui.uicommonweb.models.hosts.ConfigureLocalStorageModel; import org.ovirt.engine.ui.uicompat.Event; @@ -260,8 +261,10 @@ countThreadsAsCoresEditor = new EntityModelCheckBoxEditor(Align.RIGHT); - memoryOptimizationInfo = new InfoIcon(templates.italicFixedWidth("465px", getConstants().clusterPopupMemoryOptimizationInfo()), resources); //$NON-NLS-1$ - cpuThreadsInfo = new InfoIcon(templates.italicFixedWidth("600px", getConstants().clusterPopupCpuThreadsInfo()), resources); //$NON-NLS-1$ + memoryOptimizationInfo = new InfoIcon(templates.italicText(getConstants().clusterPopupMemoryOptimizationInfo()), resources); //$NON-NLS-1$ + memoryOptimizationInfo.setTooltipMaxWidth(Width.W520); + cpuThreadsInfo = new InfoIcon(templates.italicText(getConstants().clusterPopupCpuThreadsInfo()), resources); //$NON-NLS-1$ + cpuThreadsInfo.setTooltipMaxWidth(Width.W620); } -- To view, visit http://gerrit.ovirt.org/37990 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6a4cce6c708eacccc2733cd653b6ae135ad3d64 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
