anmolbabu has uploaded a new change for review.
Change subject: webadmin : Fix activity column id issue This patch does the
following, 1. Adding column's to MainTabVolumeView require columns to override
AbstractColumn or handle id on own. But overriding AbstractColumn provides base
implementation for ColumnWithElement
......................................................................
webadmin : Fix activity column id issue
This patch does the following,
1. Adding column's to MainTabVolumeView require columns to override
AbstractColumn or handle id on own. But overriding AbstractColumn
provides base implementation for ColumnWithElementId#configureElementId
which actually assigns ids for columns.
Accordingly changes are performed in,
[i] Changed VolumeActivityColumn
2. Now, ApplicationTemplates#statusTemplate takes a SafeHtml and a
string id. Some of the cells corrected as part of this patch used to
treat tooltips as ids and now this patch corrects it by adding new
templates to ApplicationTemplate for handling tooltip requiring images
and also handles ids for such columns.
Accordingly changes are performed in,
[i] GlusterCapacityCell and hence VolumeCapacityCell and
BrickCapacityCell
[ii] VolumeInfoCell
Change-Id: Ifded690b427ba8eb17bba272360f916850f76891
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
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/widget/table/cell/VolumeCapacityCell.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityColumn.java
6 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/41387/1
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 9941d55..6016525 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
@@ -33,10 +33,10 @@
"</div>")
SafeHtml lineChartWithoutImage(int textWidth, String textColor, String
fontWeight, int percentage);
- @Template("<div title='{3}' class='engine-progress-box'>" +
+ @Template("<div id=\"{4}\" title='{3}' class='engine-progress-box'>" +
"<div style='background: {2}; width: {0}%; height: 100%'></div>" +
"<div class='engine-progress-text'>{1}</div></div>")
- SafeHtml glusterCapcityProgressBar(int progress, String sizeString, String
color, String toolTip);
+ SafeHtml glusterCapcityProgressBar(int progress, String sizeString, String
color, String toolTip, String id);
/**
* Creates a tree-item HTML
@@ -106,6 +106,9 @@
@Template("<div id=\"{1}\" style=\"text-align: center;\">{0}</div>")
SafeHtml statusTemplate(SafeHtml statusImage, String id);
+ @Template("<div title='{1}' id=\"{2}\" style=\"text-align:
center;\">{0}</div>")
+ SafeHtml imageWithHoverTextAndContainerId(SafeHtml statusImage, String
hoverText, String id);
+
@Template("<span><span style='position: fixed; display: inline-block;
vertical-align: top; height: 14px; line-height: 14px;'>{1}</span>"
+ "<span style='position: relative; white-space: normal; height:
14px; line-height: 14px;'>{0}</span></span>")
SafeHtml lockedStatusTemplate(SafeHtml lockImage, SafeHtml statusImage);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java
index 2e73dd5..812165d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java
@@ -11,7 +11,7 @@
public class VolumeCapacityCell<P extends GlusterVolumeEntity> extends
GlusterCapacityCell<P> {
@Override
- public void render(Context context, GlusterVolumeEntity object,
SafeHtmlBuilder sb) {
+ public void render(Context context, GlusterVolumeEntity object,
SafeHtmlBuilder sb, String id) {
GlusterVolumeAdvancedDetails advancedDetails =
object.getAdvancedDetails();
GlusterVolumeSizeInfo sizeInfo = null;
if (advancedDetails != null) {
@@ -23,6 +23,6 @@
setInUnit(SizeUnit.BYTES);
}
}
- super.render(context, advancedDetails == null ? null : sizeInfo ==
null ? null : sizeInfo, sb);
+ super.render(context, advancedDetails == null ? null : sizeInfo ==
null ? null : sizeInfo, sb, id);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
index 7c7b163..9a9b995 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
@@ -34,7 +34,7 @@
if (volume.getIsGeoRepMaster()) {
SafeHtml geoRepMasterHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(geoRepMasterImage).getHTML());
- sb.append(applicationTemplates.statusTemplate(geoRepMasterHtml,
constants.geoRepMasterVolumeToolTip()));
+
sb.append(applicationTemplates.imageWithHoverTextAndContainerId(geoRepMasterHtml,
constants.geoRepMasterVolumeToolTip(), id));
}
if (volume.getIsGeoRepSlave()) {
SafeHtml geoRepSlaveHtml =
@@ -42,14 +42,14 @@
String[] volClusterNames =
formatVolClusterName(volume.getGeoRepMasterVolAndClusterName());
String volName = volClusterNames[0];
String clusterName = volClusterNames.length == 2 ?
volClusterNames[1] : "UNKNOWN"; //$NON-NLS-1$
- sb.append(applicationTemplates.statusTemplate(geoRepSlaveHtml,
- messages.geoRepSlaveVolumeToolTip(volName, clusterName)));
+
sb.append(applicationTemplates.imageWithHoverTextAndContainerId(geoRepSlaveHtml,
+ messages.geoRepSlaveVolumeToolTip(volName, clusterName),
id));
}
if (volume.getSnapshotScheduled()) {
SafeHtml snapshotScheduledHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(snapshotScheduledImage).getHTML());
-
sb.append(applicationTemplates.statusTemplate(snapshotScheduledHtml,
- constants.glusterVolumeSnapshotsScheduledToolTip()));
+
sb.append(applicationTemplates.imageWithHoverTextAndContainerId(snapshotScheduledHtml,
+ constants.glusterVolumeSnapshotsScheduledToolTip(), id));
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
index 7876719..005858e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
@@ -8,13 +8,13 @@
public class BrickCapacityCell<P extends BrickProperties> extends
GlusterCapacityCell<P> {
@Override
- public void render(Context context, BrickProperties value, SafeHtmlBuilder
sb) {
+ public void render(Context context, BrickProperties value, SafeHtmlBuilder
sb, String id) {
if(value != null) {
setFreeSize(value.getFreeSize());
setTotalSize(value.getTotalSize());
setUsedSize(value.getTotalSize() - value.getFreeSize());
setInUnit(SizeUnit.MB);
}
- super.render(context, value == null ? null : value, sb);
+ super.render(context, value == null ? null : value, sb, id);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
index de4b1b3..ff57e06 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
@@ -9,8 +9,8 @@
import org.ovirt.engine.ui.webadmin.ApplicationMessages;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
import org.ovirt.engine.ui.webadmin.gin.AssetProvider;
+import org.ovirt.engine.ui.common.widget.table.cell.AbstractCell;
-import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -82,7 +82,7 @@
}
@Override
- public void render(Context context, Serializable value, SafeHtmlBuilder
sb) {
+ public void render(Context context, Serializable value, SafeHtmlBuilder
sb, String id) {
if(value == null) {
clearAll();
}
@@ -90,7 +90,7 @@
String sizeString = getProgressText(freeSize, totalSize);
String color = progress < 70 ? "#669966" : progress < 95 ? "#FF9900" :
"#FF0000"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
String toolTip = messages.glusterCapacityInfo(getSizeString(freeSize,
inUnit), getSizeString(usedSize, inUnit), getSizeString(totalSize, inUnit));
- SafeHtml safeHtml = templates.glusterCapcityProgressBar(progress,
sizeString, color, toolTip);
+ SafeHtml safeHtml = templates.glusterCapcityProgressBar(progress,
sizeString, color, toolTip, id);
sb.append(safeHtml);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityColumn.java
index 2ec1dab..db8f1f6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityColumn.java
@@ -3,12 +3,12 @@
import java.util.List;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterTaskSupport;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import
org.ovirt.engine.ui.webadmin.widget.table.cell.VolumeActivityCompositeCell;
import com.google.gwt.cell.client.HasCell;
-import com.google.gwt.user.cellview.client.Column;
-public class VolumeActivityColumn<T extends GlusterTaskSupport> extends
Column<T, GlusterTaskSupport> {
+public class VolumeActivityColumn<T extends GlusterTaskSupport> extends
AbstractColumn<T, GlusterTaskSupport> {
public VolumeActivityColumn(List<HasCell<GlusterTaskSupport, ?>> list) {
this(new VolumeActivityCompositeCell<GlusterTaskSupport>(list));
--
To view, visit https://gerrit.ovirt.org/41387
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifded690b427ba8eb17bba272360f916850f76891
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
