Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: removed title tooltips from templates ......................................................................
userportal, webadmin: removed title tooltips from templates Removed all title-based tooltips from all HTML templates. Replaced with PatternFly-based tooltips where necessary. Change-Id: I88b410f794c5bd2b5d933985f7d58f86595c9b54 Bug-Url: https://bugzilla.redhat.com/1067318 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ImageResourceHeader.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java 10 files changed, 76 insertions(+), 75 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/38237/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java index 3bcd88a..10a40e8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java @@ -27,14 +27,11 @@ "<span style='position: relative; padding-left: 3px; vertical-align: middle; display: table-cell;'>{2}</span></span>") SafeHtml tripleImage(SafeHtml image1, SafeHtml image2, SafeHtml image3); - @Template("<span style='width: 18px; vertical-align: middle; text-align: center; display: table-cell;' title='{1}'>{0}</span>") - SafeHtml imageWithTitle(SafeHtml image, String title); - @Template("<span style='width: 18px; vertical-align: middle; text-align: center; display: table-cell;'>{0}</span>") - SafeHtml headerImage(SafeHtml image); + SafeHtml tableHeaderImage(SafeHtml image); - @Template("<span style='height:22px; width: 22px; vertical-align: middle; text-align: center;' title='{1}'>{0}</span>") - SafeHtml inlineImageWithTitle(SafeHtml image, String title); + @Template("<span style='height:22px; width: 22px; vertical-align: middle; text-align: center;'>{0}</span>") + SafeHtml tableHeaderInlineImage(SafeHtml image); @Template("<table cellspacing='0' cellpadding='0'><tr>" + "<td style='background: url({2});width:2px;'></td>" + @@ -94,12 +91,6 @@ @Template("<span>{0} {1}</span>") SafeHtml iconWithText(SafeHtml icon, String text); - - @Template("<span title='{2}'>{0} {1}</span>") - SafeHtml iconWithTextAndTitle(SafeHtml icon, String text, String title); - - @Template("<span title='{1}'>{0}</span>") - SafeHtml textAndTitle(String text, String title); @Template("<span>{0}</span>") SafeHtml text(String text); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java index 721f726..3efbfd7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java @@ -44,7 +44,7 @@ return SafeHtmlUtils.fromSafeConstant(CONSTANTS.empty()); } - return TEMPLATES.headerImage(SafeHtmlUtils.fromTrustedString( + return TEMPLATES.tableHeaderImage(SafeHtmlUtils.fromTrustedString( AbstractImagePrototype.create(getDefaultImage()).getHTML())); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ImageResourceHeader.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ImageResourceHeader.java index 4a4ec0d..450ec34 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ImageResourceHeader.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/header/ImageResourceHeader.java @@ -19,6 +19,7 @@ private static final CommonApplicationTemplates TEMPLATES = GWT.create(CommonApplicationTemplates.class); private ImageResource headerImage; + private boolean inline = false; public ImageResourceHeader(ImageResource image, SafeHtml tooltipText) { super(SafeHtmlUtils.fromSafeConstant(""), tooltipText); //$NON-NLS-1$ @@ -26,6 +27,11 @@ this.headerImage = image; setValue(getHeaderHtml()); } + } + + public ImageResourceHeader(ImageResource image, SafeHtml tooltipText, boolean inline) { + this(image, tooltipText); + setInline(inline); } public ImageResourceHeader(ImageResource image) { @@ -42,8 +48,15 @@ return SafeHtmlUtils.fromSafeConstant(CONSTANTS.empty()); } - return TEMPLATES.headerImage(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(headerImage).getHTML())); + if (isInline()) { + return TEMPLATES.tableHeaderInlineImage(SafeHtmlUtils.fromTrustedString( + AbstractImagePrototype.create(headerImage).getHTML())); + } + else { + return TEMPLATES.tableHeaderImage(SafeHtmlUtils.fromTrustedString( + AbstractImagePrototype.create(headerImage).getHTML())); + } + } protected ImageResource getHeaderImage() { @@ -54,4 +67,12 @@ this.headerImage = headerImage; } + public boolean isInline() { + return inline; + } + + public void setInline(boolean inline) { + this.inline = inline; + } + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java index 4d8852c..740637d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java @@ -20,6 +20,7 @@ import org.ovirt.engine.ui.common.widget.table.column.AbstractEnumColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn; +import org.ovirt.engine.ui.common.widget.table.header.ImageResourceHeader; import org.ovirt.engine.ui.common.widget.uicommon.disks.DisksViewColumns; import org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractModelBoundPopupWidget; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; @@ -39,7 +40,6 @@ 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.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; @@ -228,14 +228,10 @@ }; imageDiskTable.addColumn(interfaceColumn, constants.interfaceVmDiskPopup(), "95px"); //$NON-NLS-1$ - SafeHtml readOnlyColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.readOnlyDiskIcon()).getHTML()), constants.readOnly() - ); - imageDiskTable.addColumn(DisksViewColumns.readOnlyCheckboxColumn, readOnlyColumnHeader, "30px"); //$NON-NLS-1$ + imageDiskTable.addColumn(DisksViewColumns.readOnlyCheckboxColumn, + new ImageResourceHeader(resources.readOnlyDiskIcon(), SafeHtmlUtils.fromTrustedString(constants.readOnly())), + "30px"); //$NON-NLS-1$ - SafeHtml bootableColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.bootableDiskIcon()).getHTML()), constants.bootable() - ); imageDiskTable.addColumn(new AbstractImageResourceColumn<EntityModel>() { @Override public ImageResource getValue(EntityModel object) { @@ -251,11 +247,8 @@ } return null; } - }, bootableColumnHeader, "30px"); //$NON-NLS-1$ - - SafeHtml shareableColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.shareableDiskIcon()).getHTML()), constants.shareable() - ); + }, new ImageResourceHeader(resources.bootableDiskIcon(), SafeHtmlUtils.fromTrustedString(constants.bootable())), + "30px"); //$NON-NLS-1$ imageDiskTable.addColumn(new AbstractImageResourceColumn<EntityModel>() { @Override @@ -272,7 +265,8 @@ } return null; } - }, shareableColumnHeader, "30px"); //$NON-NLS-1$ + }, new ImageResourceHeader(resources.shareableDiskIcon(), SafeHtmlUtils.fromTrustedString(constants.shareable())), + "30px"); //$NON-NLS-1$ imageDiskTable.setWidth("100%", true); //$NON-NLS-1$ imageDiskTable.setHeight("100%"); //$NON-NLS-1$ @@ -423,14 +417,10 @@ }; lunDiskTable.addColumn(interfaceColumn, constants.interfaceVmDiskPopup(), "90px"); //$NON-NLS-1$ - SafeHtml readOnlyColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.readOnlyDiskIcon()).getHTML()), constants.readOnly() - ); - lunDiskTable.addColumn(DisksViewColumns.readOnlyCheckboxColumn, readOnlyColumnHeader, "30px"); //$NON-NLS-1$ + lunDiskTable.addColumn(DisksViewColumns.readOnlyCheckboxColumn, + new ImageResourceHeader(resources.readOnlyDiskIcon(), SafeHtmlUtils.fromTrustedString(constants.readOnly())), + "30px"); //$NON-NLS-1$ - SafeHtml bootableColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.bootableDiskIcon()).getHTML()), constants.bootable() - ); lunDiskTable.addColumn(new AbstractImageResourceColumn<EntityModel>() { @Override public ImageResource getValue(EntityModel object) { @@ -446,11 +436,9 @@ } return null; } - }, bootableColumnHeader, "30px"); //$NON-NLS-1$ + }, new ImageResourceHeader(resources.bootableDiskIcon(), SafeHtmlUtils.fromTrustedString(constants.bootable())), + "30px"); //$NON-NLS-1$ - SafeHtml shareableColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.shareableDiskIcon()).getHTML()), constants.shareable() - ); lunDiskTable.addColumn(new AbstractImageResourceColumn<EntityModel>() { @Override public ImageResource getValue(EntityModel object) { @@ -466,7 +454,8 @@ } return null; } - }, shareableColumnHeader, "30px"); //$NON-NLS-1$ + }, new ImageResourceHeader(resources.shareableDiskIcon(), SafeHtmlUtils.fromTrustedString(constants.shareable())), + "30px"); //$NON-NLS-1$ lunDiskTable.setWidth("100%", true); //$NON-NLS-1$ lunDiskTable.setHeight("100%"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java index af15f70..2c666c6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java @@ -18,6 +18,8 @@ import org.ovirt.engine.ui.common.widget.table.column.AbstractCheckboxColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractFullDateTimeColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn; +import org.ovirt.engine.ui.common.widget.table.header.ImageResourceHeader; +import org.ovirt.engine.ui.common.widget.table.header.SafeHtmlHeader; import org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractModelBoundPopupWidget; import org.ovirt.engine.ui.common.widget.uicommon.vm.VmSnapshotInfoPanel; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -182,10 +184,11 @@ } }); - previewTable.addColumn(vmConfColumn, templates.imageWithTitle(imageResourceToSafeHtml(resources.vmConfIcon()), - constants.vmConfiguration()), "30px"); //$NON-NLS-1$ + previewTable.addColumn(vmConfColumn, + new ImageResourceHeader(resources.vmConfIcon(), SafeHtmlUtils.fromTrustedString(constants.vmConfiguration())), + "30px"); //$NON-NLS-1$ - previewTable.addColumn(new AbstractCheckboxColumn<SnapshotModel>( + AbstractCheckboxColumn<SnapshotModel> memoryColumn = new AbstractCheckboxColumn<SnapshotModel>( new FieldUpdater<SnapshotModel, Boolean>() { @Override public void update(int index, SnapshotModel snapshotModel, Boolean value) { @@ -194,10 +197,10 @@ updateWarnings(); } }) { + @Override public Boolean getValue(SnapshotModel snapshotModel) { return snapshotModel.getMemory().getEntity(); - } @Override @@ -221,8 +224,12 @@ public SafeHtml getTooltip(SnapshotModel object) { return null; } + }; - }, templates.iconWithText(imageResourceToSafeHtml(resources.memorySmallIcon()), constants.memorySnapshot()), "100px"); //$NON-NLS-1$ + previewTable.addColumn( + memoryColumn, + templates.iconWithText(imageResourceToSafeHtml(resources.memorySmallIcon()), constants.memorySnapshot()), + "100px"); //$NON-NLS-1$ List<DiskImage> disks = previewSnapshotModel.getAllDisks(); Collections.sort(disks, new Linq.DiskByAliasComparer()); @@ -277,8 +284,9 @@ } }, - templates.iconWithTextAndTitle(imageResourceToSafeHtml(resources.diskIcon()), - disk.getDiskAlias(), disk.getId().toString()), "120px"); //$NON-NLS-1$ //$NON-NLS-2$ + new SafeHtmlHeader(templates.iconWithText(imageResourceToSafeHtml(resources.diskIcon()), disk.getDiskAlias()), + SafeHtmlUtils.fromString(disk.getId().toString())), + "120px"); //$NON-NLS-1$ // Edit preview table previewTable.asEditor().edit(previewSnapshotModel.getSnapshots()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java index 7243b08..5edd9c8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java @@ -44,7 +44,7 @@ * @param imageHtml * the image HTML * @param text - * the node title + * the node text * @return */ @Template("<span style='position: relative; bottom: 1px;'>{0}</span>" + @@ -55,7 +55,7 @@ * Creates a bookmark-item HTML * * @param text - * the bookmark title + * the bookmark text */ @Template("<span id='{0}' style='display: inline-block; padding: 2px;'>{1}</span>") SafeHtml bookmarkItem(String id, String text); @@ -66,7 +66,7 @@ * @param imageHtml * the image HTML * @param text - * the node title + * the node text * @return */ @Template("<span style='position: relative; border: 1px solid {3}; " + @@ -112,7 +112,7 @@ @Template("<button type='button' tabindex='-1' style='float: right; height: 20px;'>" + "<span style='position: relative; left: 0px; top: -5px; width: 100%; font-family: arial; font-size: 10px;'>{0}</span></button>") - SafeHtml actionButtonText(String title); + SafeHtml actionButtonText(String text); @Template("<button type='button' tabindex='-1' style='background: url({0}) no-repeat; white-space: nowrap; height: 20px; width: 20px; line-height: 20px; float: right;'></button>") SafeHtml actionButtonImage(String image); @@ -170,27 +170,21 @@ @Template("<div id=\"{1}\" style='line-height: 100%; text-align: center; vertical-align: middle; border: solid 1px transparent; '>{0}</div>") SafeHtml volumeActivityMenu(SafeHtml statusImage, String id); - @Template("<div title=\'{1}'style='line-height: 100%; text-align: center; vertical-align: middle;'>{0}</div>") - SafeHtml image(SafeHtml statusImage, String title); - - @Template("<div title=\"{2}\"><table cellspacing='0' cellpadding='0' style='line-height: 5px;'>" + + @Template("<div><table cellspacing='0' cellpadding='0' style='line-height: 5px;'>" + "<tr>" + "<td>{0} (</td>" + - "<td><div style='font-size: 10px; text-align: center;'>{1}</div><div>{3}</div></td>" + + "<td><div style='font-size: 10px; text-align: center;'>{1}</div><div>{2}</div></td>" + "<td>)</td>" + "</tr>" + "</table>" + "</div>") - SafeHtml vmCountWithMigrating(String vmCountStr, String vmMigratingStr, String title, SafeHtml image); + SafeHtml vmCountWithMigrating(String vmCountStr, String vmMigratingStr, SafeHtml image); @Template("<div style='max-width: 500px; word-wrap:break-word; font-style: italic;'>{0}</div>") SafeHtml italicWordWrapMaxWidth(String text); @Template("<div style='max-width: 250px; display:inline-block;'>{0}</div>") SafeHtml maxWidthNteworkItemPopup(String text); - - @Template("<abbr title='{1}'>{0}</abbr>") - SafeHtml textWithTooltip(String text, String tooltip); @Template("<span style='position: relative; margin-right: 3px; white-space: nowrap; height: 14px; line-height: 14px;'>{0}</span>" + "<span style='position: relative; display: inline-block; vertical-align: top; height: 14px; line-height: 14px;'>{1}</span>") 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 70c9efa..5acb5f3 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 @@ -12,6 +12,7 @@ import org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn; import org.ovirt.engine.ui.common.widget.table.header.AbstractCheckboxHeader; +import org.ovirt.engine.ui.common.widget.table.header.SafeHtmlHeader; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterNetworkManageModel; import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterNetworkModel; @@ -95,13 +96,12 @@ new ManagementNetworkIndicatorCheckboxColumn(multiCluster, new ManagementNetworkIndicatorFieldUpdater()), constants.managementItemInfo(), "80px"); //$NON-NLS-1$ - final SafeHtml displayNetworkColumnHeader = templates.textWithTooltip( - constants.displayNetwork(), - constants.changeDisplayNetworkWarning()); networks.addColumn( new DisplayNetworkIndicatorCheckboxColumn(multiCluster, new DisplayNetworkIndicatorFieldUpdater()), - displayNetworkColumnHeader, "100px"); //$NON-NLS-1$ + new SafeHtmlHeader(SafeHtmlUtils.fromSafeConstant(constants.displayNetwork()), + SafeHtmlUtils.fromSafeConstant(constants.changeDisplayNetworkWarning())), + "100px"); //$NON-NLS-1$ networks.addColumn( new MigrationNetworkIndicatorCheckboxColumn(multiCluster, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java index 0dc640b..e269f0b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java @@ -198,9 +198,9 @@ @Override public void render(Context context, SafeHtmlBuilder sb) { super.render(context, sb); - sb.append(templates.inlineImageWithTitle(SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.dialogIconHelp()) - .getHTML()), - constants.networkPublicUseLabel())); + sb.append(templates.tableHeaderInlineImage( + SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.dialogIconHelp()) + .getHTML()))); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java index be82a2f..94ec74a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java @@ -5,6 +5,7 @@ import org.ovirt.engine.ui.common.widget.action.SubTabTreeActionPanel; import org.ovirt.engine.ui.common.widget.action.UiCommandButtonDefinition; import org.ovirt.engine.ui.common.widget.table.column.EmptyColumn; +import org.ovirt.engine.ui.common.widget.table.header.ImageResourceHeader; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateListModel; @@ -18,9 +19,7 @@ import org.ovirt.engine.ui.webadmin.widget.template.DisksTree; import com.google.gwt.event.shared.EventBus; -import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlUtils; -import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.inject.Inject; public class SubTabTemplateDiskView extends AbstractSubTabTreeView<DisksTree, VmTemplate, DiskModel, TemplateListModel, TemplateDiskListModel> implements SubTabTemplateDiskPresenter.ViewDef { @@ -53,8 +52,8 @@ @Override protected void initHeader(ApplicationConstants constants) { table.addColumn(new EmptyColumn(), constants.aliasDisk(), ""); //$NON-NLS-1$ - SafeHtml readOnlyColumnHeader = templates.imageWithTitle(SafeHtmlUtils.fromTrustedString( - AbstractImagePrototype.create(resources.readOnlyDiskIcon()).getHTML()), constants.readOnly()); + ImageResourceHeader readOnlyColumnHeader = new ImageResourceHeader( + resources.readOnlyDiskIcon(), SafeHtmlUtils.fromSafeConstant(constants.readOnly())); table.addColumn(new EmptyColumn(), readOnlyColumnHeader, "60px"); //$NON-NLS-1$); table.addColumn(new EmptyColumn(), constants.provisionedSizeDisk(), "120px"); //$NON-NLS-1$ table.addColumn(new EmptyColumn(), constants.sizeDisk(), "120px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java index f60259f..e67c852 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java @@ -24,13 +24,12 @@ public SafeHtml getValue(VDS object) { String vmCountStr = String.valueOf(object.getVmCount()); Integer vmMigrating = object.getVmMigrating(); + String vmMigratingStr = String.valueOf(vmMigrating); if (vmMigrating == null || vmMigrating == 0) { return new SafeHtmlBuilder().appendEscaped(vmCountStr).toSafeHtml(); } - String vmMigratingStr = String.valueOf(vmMigrating); - String title = messages.migratingVmsOutOfTotal(vmCountStr, vmMigratingStr); - return templates.vmCountWithMigrating(vmCountStr, vmMigratingStr, title, imageHtml); + return templates.vmCountWithMigrating(vmCountStr, vmMigratingStr, imageHtml); } @Override -- To view, visit https://gerrit.ovirt.org/38237 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88b410f794c5bd2b5d933985f7d58f86595c9b54 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
