Daniel Erez has uploaded a new change for review.
Change subject: webadmin: Storage tabs - move description column
......................................................................
webadmin: Storage tabs - move description column
For keeping the convention on other tabs:
* move description column to the right.
* rename 'Domain Description' to 'Description'.
Change-Id: Idbdac003253f15f8806c465980b29f059e5d09b4
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.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/datacenter/SubTabDataCenterStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
4 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/12377/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 6eb4c1e..2be4c22 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -1168,7 +1168,7 @@
@DefaultStringValue("Domain Name")
String domainNameStorage();
- @DefaultStringValue("Domain Description")
+ @DefaultStringValue("Description")
String domainDescriptionStorage();
@DefaultStringValue("Domain Type")
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 ff5900d..9146127 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,21 +57,13 @@
};
getTable().addColumn(nameColumn, constants.domainNameStorage(),
"150px"); //$NON-NLS-1$
- TextColumnWithTooltip<StorageDomain> descriptionColumn = new
TextColumnWithTooltip<StorageDomain>() {
- @Override
- public String getValue(StorageDomain object) {
- return object.getDescription();
- }
- };
- getTable().addColumn(descriptionColumn,
constants.domainDescriptionStorage(), "200px"); //$NON-NLS-1$
-
TextColumnWithTooltip<StorageDomain> domainTypeColumn = new
EnumColumn<StorageDomain, StorageDomainType>() {
@Override
protected StorageDomainType getRawValue(StorageDomain object) {
return object.getStorageDomainType();
}
};
- getTable().addColumn(domainTypeColumn, constants.domainTypeStorage(),
"130px"); //$NON-NLS-1$
+ getTable().addColumn(domainTypeColumn, constants.domainTypeStorage(),
"140px"); //$NON-NLS-1$
TextColumnWithTooltip<StorageDomain> storageTypeColumn = new
EnumColumn<StorageDomain, StorageType>() {
@Override
@@ -79,7 +71,7 @@
return object.getStorageType();
}
};
- getTable().addColumn(storageTypeColumn,
constants.storageTypeStorage(), "150px"); //$NON-NLS-1$
+ getTable().addColumn(storageTypeColumn,
constants.storageTypeStorage(), "140px"); //$NON-NLS-1$
TextColumnWithTooltip<StorageDomain> formatColumn = new
EnumColumn<StorageDomain, StorageFormatType>() {
@Override
@@ -87,7 +79,7 @@
return object.getStorageFormat();
}
};
- getTable().addColumn(formatColumn, constants.formatStorage(),
"100px"); //$NON-NLS-1$
+ getTable().addColumn(formatColumn, constants.formatStorage(),
"140px"); //$NON-NLS-1$
TextColumnWithTooltip<StorageDomain> crossDataCenterStatusColumn =
new TextColumnWithTooltip<StorageDomain>() {
@@ -100,7 +92,7 @@
}
}
};
- getTable().addColumn(crossDataCenterStatusColumn,
constants.crossDcStatusStorage(), "180px"); //$NON-NLS-1$
+ getTable().addColumn(crossDataCenterStatusColumn,
constants.crossDcStatusStorage(), "160px"); //$NON-NLS-1$
DiskSizeColumn<StorageDomain> freeSpaceColumn = new
DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) {
@Override
@@ -109,7 +101,15 @@
return (long) availableDiskSize;
}
};
- getTable().addColumn(freeSpaceColumn, constants.freeSpaceStorage(),
"150px"); //$NON-NLS-1$
+ getTable().addColumn(freeSpaceColumn, constants.freeSpaceStorage(),
"140px"); //$NON-NLS-1$
+
+ TextColumnWithTooltip<StorageDomain> descriptionColumn = new
TextColumnWithTooltip<StorageDomain>() {
+ @Override
+ public String getValue(StorageDomain object) {
+ return object.getDescription();
+ }
+ };
+ getTable().addColumn(descriptionColumn,
constants.domainDescriptionStorage(), "200px"); //$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/datacenter/SubTabDataCenterStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
index cbd4834..3b7e5c7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
@@ -49,14 +49,6 @@
};
getTable().addColumn(nameColumn, constants.domainNameStorage());
- TextColumnWithTooltip<StorageDomain> descriptionColumn = new
TextColumnWithTooltip<StorageDomain>() {
- @Override
- public String getValue(StorageDomain object) {
- return object.getDescription();
- }
- };
- getTable().addColumn(descriptionColumn,
constants.domainDescriptionStorage());
-
TextColumnWithTooltip<StorageDomain> typeColumn = new
EnumColumn<StorageDomain, StorageDomainType>() {
@Override
public StorageDomainType getRawValue(StorageDomain object) {
@@ -100,6 +92,14 @@
};
getTable().addColumn(totalColumn, constants.totalSpaceStorage());
+ TextColumnWithTooltip<StorageDomain> descriptionColumn = new
TextColumnWithTooltip<StorageDomain>() {
+ @Override
+ public String getValue(StorageDomain object) {
+ return object.getDescription();
+ }
+ };
+ getTable().addColumn(descriptionColumn,
constants.domainDescriptionStorage());
+
getTable().addActionButton(new
WebAdminButtonDefinition<StorageDomain>(constants.attachDataStorage()) {
@Override
protected UICommand resolveCommand() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
index 319ec74..c364014 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
@@ -48,14 +48,6 @@
};
getTable().addColumn(nameColumn, constants.domainNameStorage());
- TextColumnWithTooltip<StorageDomain> descriptionColumn = new
TextColumnWithTooltip<StorageDomain>() {
- @Override
- public String getValue(StorageDomain object) {
- return object.getDescription();
- }
- };
- getTable().addColumn(descriptionColumn,
constants.domainDescriptionStorage());
-
TextColumnWithTooltip<StorageDomain> typeColumn = new
EnumColumn<StorageDomain, StorageDomainType>() {
@Override
public StorageDomainType getRawValue(StorageDomain object) {
@@ -98,6 +90,14 @@
}
};
getTable().addColumn(totalColumn, constants.totalSpaceStorage());
+
+ TextColumnWithTooltip<StorageDomain> descriptionColumn = new
TextColumnWithTooltip<StorageDomain>() {
+ @Override
+ public String getValue(StorageDomain object) {
+ return object.getDescription();
+ }
+ };
+ getTable().addColumn(descriptionColumn,
constants.domainDescriptionStorage());
}
}
--
To view, visit http://gerrit.ovirt.org/12377
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbdac003253f15f8806c465980b29f059e5d09b4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
