Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: convert remaining non-widgets to PatternFly tooltips ......................................................................
userportal, webadmin: convert remaining non-widgets to PatternFly tooltips Converted all remaining non-widgets (Elements, UIObjects) from title-based tooltips to PatternFly tooltips. Change-Id: I5b0d851688aa8ac0ce9c5b897da8cda03f3c96ed Bug-Url: https://bugzilla.redhat.com/1067318 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/DropdownActionButton.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tree/AbstractSubTabTree.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java 6 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/38556/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java index dbd7ea5..8d66b11 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java @@ -14,6 +14,7 @@ import org.ovirt.engine.ui.common.widget.MenuBar; import org.ovirt.engine.ui.common.widget.PopupPanel; import org.ovirt.engine.ui.common.widget.TitleMenuItemSeparator; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipMixin; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; @@ -37,6 +38,7 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; @@ -612,8 +614,7 @@ item.setEnabled(buttonDef.isEnabled(getSelectedItems())); if (buttonDef.getMenuItemToolTip() != null) { - // TODO tt MenuItem is not a Widget, so have to use ElementTooltip on it - item.setTitle(buttonDef.getMenuItemToolTip()); + TooltipMixin.addTooltipToElement(SafeHtmlUtils.fromString(buttonDef.getMenuItemToolTip()), item.getElement()); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/DropdownActionButton.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/DropdownActionButton.java index afab6a0..9d04a6c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/DropdownActionButton.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/DropdownActionButton.java @@ -1,5 +1,10 @@ package org.ovirt.engine.ui.common.widget.action; +import java.util.List; + +import org.ovirt.engine.ui.common.CommonApplicationResources; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipMixin; + import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -10,6 +15,7 @@ import com.google.gwt.event.logical.shared.CloseEvent; import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.resources.client.CssResource; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Command; @@ -18,9 +24,6 @@ import com.google.gwt.user.client.ui.MenuItem; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.ToggleButton; -import org.ovirt.engine.ui.common.CommonApplicationResources; - -import java.util.List; public class DropdownActionButton<T> extends AbstractActionButton { @@ -95,8 +98,9 @@ void updateMenuItem(MenuItem item, ActionButtonDefinition<T> buttonDef, List selectedItems) { item.setVisible(buttonDef.isAccessible(selectedItems) && buttonDef.isVisible(selectedItems)); item.setEnabled(buttonDef.isEnabled(selectedItems)); - // TODO tt MenuItem is not a Widget, so have to use ElementTooltip on it - item.setTitle(buttonDef.getButtonToolTip() != null ? buttonDef.getButtonToolTip() : null); + if (buttonDef.getButtonToolTip() != null) { + TooltipMixin.addTooltipToElement(SafeHtmlUtils.fromString(buttonDef.getButtonToolTip()), item.getElement()); + } } private void addMouseHandlers() { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java index 963f03c..1ef25d8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java @@ -11,6 +11,7 @@ import org.ovirt.engine.ui.common.widget.table.cell.EventHandlingCell; import org.ovirt.engine.ui.common.widget.table.cell.RadioboxCell; import org.ovirt.engine.ui.common.widget.table.header.SelectAllCheckBoxHeader; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipMixin; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicompat.external.StringUtils; @@ -336,9 +337,9 @@ String error = errors.get(i); boolean valid = StringUtils.isEmpty(error); - // TODO tt Element is not a Widget, so have to use ElementTooltip on it - element.setTitle(valid ? null : error); + if (!valid) { + TooltipMixin.addTooltipToElement(SafeHtmlUtils.fromString(error), element); element.addClassName(style.invalidRow()); } else { element.removeClassName(style.invalidRow()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java index cb648a8..82c7a11 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.widget.HasEditorDriver; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipMixin; import org.ovirt.engine.ui.uicommonweb.models.vms.key_value.KeyValueLineModel; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; @@ -14,6 +15,7 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; @@ -100,12 +102,9 @@ */ private void updateKeyTitle(KeyValueLineModel object) { String selectedKey = (String) object.getKeys().getSelectedItem(); - // Setting the title to null results in the string "null" being displayed on some browsers. - if (selectedKey == null) { - selectedKey = ""; + if (selectedKey != null) { + TooltipMixin.addTooltipToElement(SafeHtmlUtils.fromString(selectedKey), keyField.getElement()); } - // TODO tt Element is not a Widget, so have to use ElementTooltip on it - keyField.getElement().setTitle(selectedKey); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tree/AbstractSubTabTree.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tree/AbstractSubTabTree.java index 0f6cfa4..89b5a59 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tree/AbstractSubTabTree.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tree/AbstractSubTabTree.java @@ -11,6 +11,7 @@ import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipMixin; import org.ovirt.engine.ui.common.widget.tooltip.WidgetTooltip; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -33,6 +34,7 @@ import com.google.gwt.event.logical.shared.OpenHandler; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Composite; @@ -349,8 +351,7 @@ element.getStyle().setColor("#999999"); //$NON-NLS-1$ if (getNodeDisabledTooltip() != null) { - // TODO tt Element is not a Widget, so have to use ElementTooltip on it - element.setTitle(getNodeDisabledTooltip()); + TooltipMixin.addTooltipToElement(SafeHtmlUtils.fromString(getNodeDisabledTooltip()), element); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java index 9612c84..a1dd8ab 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import com.google.gwt.core.client.Scheduler; import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; +import org.ovirt.engine.ui.common.widget.tooltip.TooltipMixin; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.LunModel; @@ -18,10 +18,12 @@ import org.ovirt.engine.ui.uicompat.IEventListener; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.Scheduler; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.dom.client.Style.Visibility; import com.google.gwt.dom.client.TableRowElement; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.cellview.client.CellTable; @@ -145,8 +147,7 @@ for (String reason : grayOutReasons) { title.append(reason).append(constants.space()); } - // TODO tt Element not a Widget, need ElementTooltip here - input.setTitle(title.toString()); + TooltipMixin.addTooltipToElement(SafeHtmlUtils.fromString(title.toString()), input); } protected void updateSelectedLunWarning(LunModel lunModel) { -- To view, visit https://gerrit.ovirt.org/38556 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b0d851688aa8ac0ce9c5b897da8cda03f3c96ed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
