Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Manage network dialog- replace VM network checkbox with icon ......................................................................
webadmin: Manage network dialog- replace VM network checkbox with icon VM network = True => green VM icon is shown VM network = False => no icon is show Change-Id: Ie96e3f173b0b510f1b8f20c9e9649eb937054d1a Bug-Url: https://bugzilla.redhat.com/1016636 Signed-off-by: Alona Kaplan <alkap...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java 2 files changed, 37 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/24830/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java index 2343268..0fd6f0e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java @@ -37,6 +37,7 @@ }); tooltipPanel.setWidget(tooltip); + tooltipPanel.getElement().getStyle().setZIndex(1); } private final HTML tooltip = new HTML(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java index 85465ca..aa3d34f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java @@ -1,6 +1,10 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.cluster; import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; @@ -8,6 +12,7 @@ import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable.SelectionMode; import org.ovirt.engine.ui.common.widget.table.column.CheckboxColumn; +import org.ovirt.engine.ui.common.widget.table.column.SafeHtmlWithSafeHtmlTooltipColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.common.widget.table.header.CheckboxHeader; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -19,14 +24,18 @@ import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.cluster.ClusterManageNetworkPopupPresenterWidget; +import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper; import com.google.gwt.cell.client.Cell.Context; import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +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.AbstractImagePrototype; import com.google.inject.Inject; public class ClusterManageNetworkPopupView extends AbstractModelBoundPopupView<ClusterNetworkManageModel> implements ClusterManageNetworkPopupPresenterWidget.ViewDef { @@ -40,6 +49,8 @@ private final ApplicationConstants constants; private final ApplicationTemplates templates; + private final SafeHtml vmImage; + private final SafeHtml emptyImage; @Inject public ClusterManageNetworkPopupView(EventBus eventBus, @@ -48,6 +59,8 @@ this.constants = constants; this.templates = templates; this.networks = new EntityModelCellTable<ClusterNetworkManageModel>(SelectionMode.NONE, true); + vmImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkVm()).getHTML()); + emptyImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkEmpty()).getHTML()); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); } @@ -197,18 +210,31 @@ } }, requiredAllHeader, "110px"); //$NON-NLS-1$ - networks.addColumn(new CheckboxColumn<EntityModel>() { - @Override - public Boolean getValue(EntityModel model) { - return ((ClusterNetworkModel) model).isVmNetwork(); - } + SafeHtmlWithSafeHtmlTooltipColumn<EntityModel> vmColumn = + new SafeHtmlWithSafeHtmlTooltipColumn<EntityModel>() { + @Override + public SafeHtml getValue(EntityModel model) { + List<SafeHtml> images = new LinkedList<SafeHtml>(); + if (((ClusterNetworkModel) model).isVmNetwork()) { + images.add(vmImage); + } else { + images.add(emptyImage); + } + return NetworkRoleColumnHelper.getValue(images); + } - @Override - protected boolean canEdit(EntityModel model) { - return false; - } + @Override + public SafeHtml getTooltip(EntityModel model) { + Map<SafeHtml, String> imagesToText = new LinkedHashMap<SafeHtml, String>(); + if (((ClusterNetworkModel) model).isVmNetwork()) { + imagesToText.put(vmImage, constants.vmItemInfo()); + } - }, constants.vmNetwork(), "80px"); //$NON-NLS-1$ + return NetworkRoleColumnHelper.getTooltip(imagesToText); + } + }; + + networks.addColumn(vmColumn, constants.vmNetwork(), "80px"); //$NON-NLS-1$ networks.addColumn(new CheckboxColumn<EntityModel>(multipleSelectionAllowed, new FieldUpdater<EntityModel, Boolean>() { -- To view, visit http://gerrit.ovirt.org/24830 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie96e3f173b0b510f1b8f20c9e9649eb937054d1a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
