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 <[email protected]> --- 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, 44 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/25386/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..46dfe60 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,7 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.cluster; import java.util.ArrayList; +import java.util.Collections; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; @@ -8,6 +9,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 +21,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 +46,8 @@ private final ApplicationConstants constants; private final ApplicationTemplates templates; + private final SafeHtml vmImage; + private final SafeHtml emptyImage; @Inject public ClusterManageNetworkPopupView(EventBus eventBus, @@ -48,6 +56,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,29 +207,34 @@ } }, requiredAllHeader, "110px"); //$NON-NLS-1$ - networks.addColumn(new CheckboxColumn<EntityModel>() { - @Override - public Boolean getValue(EntityModel model) { - return ((ClusterNetworkModel) model).isVmNetwork(); - } + SafeHtmlWithSafeHtmlTooltipColumn<ClusterNetworkModel> vmColumn = + new SafeHtmlWithSafeHtmlTooltipColumn<ClusterNetworkModel>() { + @Override + public SafeHtml getValue(ClusterNetworkModel model) { + return NetworkRoleColumnHelper.getValue(Collections.singletonList(model.isVmNetwork() ? vmImage + : emptyImage)); + } - @Override - protected boolean canEdit(EntityModel model) { - return false; - } + @Override + public SafeHtml getTooltip(ClusterNetworkModel model) { + return NetworkRoleColumnHelper.getTooltip(model.isVmNetwork() ? Collections.singletonMap(vmImage, + constants.vmItemInfo()) + : Collections.<SafeHtml, String> emptyMap()); + } + }; - }, constants.vmNetwork(), "80px"); //$NON-NLS-1$ + networks.addColumn(vmColumn, constants.vmNetwork(), "80px"); //$NON-NLS-1$ networks.addColumn(new CheckboxColumn<EntityModel>(multipleSelectionAllowed, new FieldUpdater<EntityModel, Boolean>() { - @Override - public void update(int index, EntityModel model, Boolean value) { - ClusterNetworkModel clusterNetworkManageModel = (ClusterNetworkModel) model; + @Override + public void update(int index, EntityModel model, Boolean value) { + ClusterNetworkModel clusterNetworkManageModel = (ClusterNetworkModel) model; - networks.asEditor().flush().setDisplayNetwork(clusterNetworkManageModel, value); - refreshNetworksTable(); - } - }) { + networks.asEditor().flush().setDisplayNetwork(clusterNetworkManageModel, value); + refreshNetworksTable(); + } + }) { @Override public Boolean getValue(EntityModel model) { return ((ClusterNetworkModel) model).isDisplayNetwork(); @@ -234,14 +249,14 @@ networks.addColumn(new CheckboxColumn<EntityModel>(multipleSelectionAllowed, new FieldUpdater<EntityModel, Boolean>() { - @Override - public void update(int index, EntityModel model, Boolean value) { - ClusterNetworkModel clusterNetworkManageModel = (ClusterNetworkModel) model; + @Override + public void update(int index, EntityModel model, Boolean value) { + ClusterNetworkModel clusterNetworkManageModel = (ClusterNetworkModel) model; - networks.asEditor().flush().setMigrationNetwork(clusterNetworkManageModel, value); - refreshNetworksTable(); - } - }) { + networks.asEditor().flush().setMigrationNetwork(clusterNetworkManageModel, value); + refreshNetworksTable(); + } + }) { @Override public Boolean getValue(EntityModel model) { return ((ClusterNetworkModel) model).isMigrationNetwork(); @@ -252,10 +267,12 @@ ClusterNetworkModel clusterNetworkModel = ((ClusterNetworkModel) model); Boolean migrationNetworkEnabled = (Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MigrationNetworkEnabled, - clusterNetworkModel.getCluster().getcompatibility_version().toString()); + clusterNetworkModel.getCluster().getcompatibility_version().toString()); return migrationNetworkEnabled && clusterNetworkModel.isAttached() && !clusterNetworkModel.isExternal(); } - }, constants.migrationNetwork(), "105px"); //$NON-NLS-1$ + }, + constants.migrationNetwork(), + "105px"); //$NON-NLS-1$ } @Override -- To view, visit http://gerrit.ovirt.org/25386 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie96e3f173b0b510f1b8f20c9e9649eb937054d1a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
