Alexander Wels has uploaded a new change for review. Change subject: webadmin: replace column header with icon ......................................................................
webadmin: replace column header with icon - Replaced the comment header text with the comment icon. - Added the comment text as a tooltip to the icon. - Moved the comment column in the following grids: - Clusters - Data centers - Hosts - Networks - Pools - Storage - Templates - VMs Change-Id: If4d7165565e46f351c8880753c1e3aaa829c6cd5 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1035566 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java 10 files changed, 36 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/22591/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceColumn.java index a70f971..f204f9f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceColumn.java @@ -20,7 +20,7 @@ public abstract class ImageResourceColumn<T> extends Column<T, ImageResource> { private static final CommonApplicationResources RESOURCES = GWT.create(CommonApplicationResources.class); - private static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); + protected static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); private static final CommonApplicationTemplates TEMPLATES = GWT.create(CommonApplicationTemplates.class); public ImageResourceColumn() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java index 886274c..68ec911 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java @@ -51,6 +51,9 @@ }; getTable().addColumn(nameColumn, constants.nameCluster(), "150px"); //$NON-NLS-1$ + CommentColumn<VDSGroup> commentColumn = new CommentColumn<VDSGroup>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { TextColumnWithTooltip<VDSGroup> dataCenterColumn = new TextColumnWithTooltip<VDSGroup>() { @Override @@ -86,8 +89,6 @@ }; getTable().addColumn(cpuNameColumn, constants.cpuNameCluster(), "150px"); //$NON-NLS-1$ } - - getTable().addColumn(new CommentColumn<VDSGroup>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VDSGroup>(constants.newCluster()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java index fe713b4..715d79d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java @@ -56,6 +56,9 @@ }; getTable().addColumn(nameColumn, constants.nameDc(), "150px"); //$NON-NLS-1$ + CommentColumn<StoragePool> commentColumn = new CommentColumn<StoragePool>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + TextColumnWithTooltip<StoragePool> storageTypeColumn = new EnumColumn<StoragePool, StorageType>() { @Override public StorageType getRawValue(StoragePool object) { @@ -87,8 +90,6 @@ } }; getTable().addColumn(descColumn, constants.descriptionDc(), "300px"); //$NON-NLS-1$ - - getTable().addColumn(new CommentColumn<StoragePool>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<StoragePool>(constants.newDC()) { @Override 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 e2b518c..2daa922 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 @@ -100,6 +100,9 @@ }; getTable().addColumn(nameColumn, constants.nameHost(), "150px"); //$NON-NLS-1$ + CommentColumn<VDS> commentColumn = new CommentColumn<VDS>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + TextColumnWithTooltip<VDS> hostColumn = new TextColumnWithTooltip<VDS>() { @Override public String getValue(VDS object) { @@ -189,8 +192,6 @@ }; getTable().addColumn(spmColumn, constants.spmPriorityHost(), "100px"); //$NON-NLS-1$ } - - getTable().addColumn(new CommentColumn<VDS>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VDS>(constants.newHost()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index 772b453..52a62ff 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -73,6 +73,9 @@ getTable().addColumn(nameColumn, constants.nameNetwork(), "200px"); //$NON-NLS-1$ + CommentColumn<NetworkView> commentColumn = new CommentColumn<NetworkView>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + TextColumnWithTooltip<NetworkView> dcColumn = new TextColumnWithTooltip<NetworkView>() { @Override public String getValue(NetworkView object) { @@ -89,8 +92,6 @@ } }; getTable().addColumn(descriptionColumn, constants.descriptionNetwork(), "300px"); //$NON-NLS-1$ - - getTable().addColumn(new CommentColumn<NetworkView>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ SafeHtmlWithSafeHtmlTooltipColumn<NetworkView> roleColumn = new SafeHtmlWithSafeHtmlTooltipColumn<NetworkView>() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java index 0aa78e8..fa9bab0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java @@ -42,6 +42,9 @@ }; getTable().addColumn(nameColumn, constants.namePool(), "150px"); //$NON-NLS-1$ + CommentColumn<VmPool> commentColumn = new CommentColumn<VmPool>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + TextColumnWithTooltip<VmPool> assignedColumn = new TextColumnWithTooltip<VmPool>() { @Override public String getValue(VmPool object) { @@ -73,8 +76,6 @@ } }; getTable().addColumn(descColumn, constants.descriptionPool(), "300px"); //$NON-NLS-1$ - - getTable().addColumn(new CommentColumn<VmPool>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VmPool>(constants.newPool()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java index c664c2a..2a06fd1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java @@ -57,6 +57,9 @@ }; getTable().addColumn(nameColumn, constants.domainNameStorage(), "150px"); //$NON-NLS-1$ + CommentColumn<StorageDomain> commentColumn = new CommentColumn<StorageDomain>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + TextColumnWithTooltip<StorageDomain> domainTypeColumn = new EnumColumn<StorageDomain, StorageDomainType>() { @Override protected StorageDomainType getRawValue(StorageDomain object) { @@ -119,8 +122,6 @@ } }; getTable().addColumn(descriptionColumn, constants.domainDescriptionStorage(), "200px"); //$NON-NLS-1$ - - getTable().addColumn(new CommentColumn<StorageDomain>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<StorageDomain>(constants.newDomainStorage()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java index d17f988..574b482 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java @@ -45,6 +45,9 @@ }; getTable().addColumn(nameColumn, constants.namePool(), "150px"); //$NON-NLS-1$ + CommentColumn<VmTemplate> commentColumn = new CommentColumn<VmTemplate>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + TextColumnWithTooltip<VmTemplate> creationDateColumn = new GeneralDateTimeColumn<VmTemplate>() { @Override protected Date getRawValue(VmTemplate object) { @@ -84,8 +87,6 @@ } }; getTable().addColumn(descriptionColumn, constants.descriptionTemplate(), "150px"); //$NON-NLS-1$ - - getTable().addColumn(new CommentColumn<VmTemplate>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VmTemplate>(constants.editTemplate()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java index 547b040..e0da652 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java @@ -68,6 +68,10 @@ }; getTable().addColumn(nameColumn, constants.nameVm(), "120px"); //$NON-NLS-1$ + CommentColumn<VM> commentColumn = new CommentColumn<VM>(); + getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + + TextColumnWithTooltip<VM> hostColumn = new TextColumnWithTooltip<VM>() { @Override public String getValue(VM object) { @@ -167,8 +171,6 @@ } }; getTable().addColumn(uptimeColumn, constants.uptimeVm(), "120px"); //$NON-NLS-1$ - - getTable().addColumn(new CommentColumn<VM>(), constants.commentLabel(), "100px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.newVm()) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java index 366d91e..9d40d87 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java @@ -14,4 +14,14 @@ } return null; } + + @Override + public ImageResource getDefaultImage() { + return getApplicationResources().commentImage(); + } + + @Override + public String getDefaultTitle() { + return CONSTANTS.commentLabel(); + } } -- To view, visit http://gerrit.ovirt.org/22591 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4d7165565e46f351c8880753c1e3aaa829c6cd5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
