Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: migrating vm count in host's vm column ......................................................................
webadmin: migrating vm count in host's vm column In vm count column under host main tab, show migrating vm count as well. Bug-Url: https://bugzilla.redhat.com/970195 Change-Id: I1ad6796dec7986ea9394c54e46a08946adaf48ed Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.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/tab/MainTabHostView.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/double_arrow.png 6 files changed, 53 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/17406/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java index 52b4758..f1d6866 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java @@ -81,4 +81,7 @@ @DefaultMessage("Some new hosts are detected in the cluster. You can <a>Import</a> them to engine or <a>Detach</a> them from the cluster.") String clusterHasNewGlusterHosts(); + + @DefaultMessage("{0} VMs running, out of which {1} migrating") + String migratingVmsOutOfTotal(String vmCount, String vmMigrating); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java index fd6b3da..40be55ef 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java @@ -362,4 +362,7 @@ @Source("images/vmStatus/vm_freeze.png") ImageResource frozenImage(); + + @Source("images/double_arrow.png") + ImageResource doubleArrowImage(); } 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 009132d..77120e8 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 @@ -132,4 +132,14 @@ @Template("{0}<br><span style=\"padding-left: 25px;\">{1}</span>") SafeHtml twoLinesRadioButtonLabel(String firstLine, String secondLine); + + @Template("<div title=\"{2}\"><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>)</td>" + + "</tr>" + + "</table>" + + "</div>") + SafeHtml vmCountWithMigrating(String vmCountStr, String vmMigratingStr, String title, SafeHtml image); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java index dcd43ec..e2b518c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java @@ -30,6 +30,7 @@ import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.HostStatusColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.PercentColumn; +import org.ovirt.engine.ui.webadmin.widget.table.column.VmCountColumn; import com.google.gwt.core.client.GWT; import com.google.inject.Inject; @@ -134,13 +135,7 @@ getTable().addColumn(statusColumn, constants.statusHost(), "100px"); //$NON-NLS-1$ if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { - TextColumnWithTooltip<VDS> vmCountColumn = new TextColumnWithTooltip<VDS>() { - @Override - public String getValue(VDS object) { - return String.valueOf(object.getVmCount()); - } - }; - getTable().addColumn(vmCountColumn, constants.vmsCount(), "110px"); //$NON-NLS-1$ + getTable().addColumn(new VmCountColumn(), constants.vmsCount(), "110px"); //$NON-NLS-1$ } PercentColumn<VDS> memColumn = new PercentColumn<VDS>() { 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 new file mode 100644 index 0000000..3b418fa --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmCountColumn.java @@ -0,0 +1,35 @@ +package org.ovirt.engine.ui.webadmin.widget.table.column; + +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.ui.common.widget.table.column.SafeHtmlColumn; +import org.ovirt.engine.ui.webadmin.ApplicationMessages; +import org.ovirt.engine.ui.webadmin.ApplicationResources; +import org.ovirt.engine.ui.webadmin.ApplicationTemplates; + +import com.google.gwt.core.shared.GWT; +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.user.client.ui.AbstractImagePrototype; + +public class VmCountColumn extends SafeHtmlColumn<VDS> { + private static ApplicationTemplates templates = GWT.create(ApplicationTemplates.class); + private static final ApplicationMessages messages = GWT.create(ApplicationMessages.class); + private static final ApplicationResources resources = GWT.create(ApplicationResources.class); + private static SafeHtml imageHtml = + SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.doubleArrowImage()) + .getHTML()); + + @Override + public SafeHtml getValue(VDS object) { + String vmCountStr = String.valueOf(object.getVmCount()); + Integer vmMigrating = object.getVmMigrating(); + 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); + } +} diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/double_arrow.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/double_arrow.png new file mode 100644 index 0000000..e0bd602 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/double_arrow.png Binary files differ -- To view, visit http://gerrit.ovirt.org/17406 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ad6796dec7986ea9394c54e46a08946adaf48ed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
