Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: Make resize easier ......................................................................
userportal,webadmin: Make resize easier - Made resizing columns in the grid easier by making the resize area on both sides of the line. Change-Id: I24259a9aa5c68a25a9ae8b3d0d1553190bec3441 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1037477 Signed-off-by: Alexander Wels <aw...@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/resize/ResizableHeader.java A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/ResizableHeader.css M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTable.css M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTableHeaderless.css 5 files changed, 44 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/27079/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 ed61008..ce5b076 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 @@ -25,7 +25,7 @@ "<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='height:22px; width: 22px; vertical-align: middle; text-align: center; display: table-cell;' title='{1}'>{0}</span>") + @Template("<span style='padding-top:4px;height:22px; width: 22px; vertical-align: middle; text-align: center; display: table-cell;' title='{1}'>{0}</span>") SafeHtml imageWithTitle(SafeHtml image, String title); @Template("<span style='height:22px; width: 22px; vertical-align: middle; text-align: center;' title='{1}'>{0}</span>") diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java index 9923a1f..68a469d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/resize/ResizableHeader.java @@ -4,10 +4,14 @@ import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.Cell.Context; +import com.google.gwt.core.shared.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.Style.Cursor; import com.google.gwt.dom.client.TableCellElement; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.Header; @@ -22,12 +26,37 @@ */ public class ResizableHeader<T> extends Header<SafeHtml> { + public interface HeaderTemplate extends SafeHtmlTemplates { + @Template("<div class=\"{0}\">{1}</div>") + SafeHtml templatedValue(String cssClassName, SafeHtml value); + } + + /** + * Style sheet interface. + */ + public interface ResizableHeaderCss extends CssResource { + String cellTableHeaderContent(); + } + + /** + * Resizable Header resources interface. + */ + public interface ResizableHeaderResources extends ClientBundle { + @Source("org/ovirt/engine/ui/common/css/ResizableHeader.css") + ResizableHeaderCss resizableHeaderCss(); + } + + private static final HeaderTemplate TEMPLATE = GWT.create(HeaderTemplate.class); + + private static final ResizableHeaderResources RESOURCES = GWT.create(ResizableHeaderResources.class); + // Width of the column header resize bar area, in pixels - private static final int RESIZE_BAR_WIDTH = 5; + private static final int RESIZE_BAR_WIDTH = 7; private final SafeHtml text; private final Column<T, ?> column; private final HasResizableColumns<T> table; + private final ResizableHeaderCss style; public ResizableHeader(SafeHtml text, Column<T, ?> column, HasResizableColumns<T> table) { this(text, column, table, new SafeHtmlCellWithTooltip( @@ -37,6 +66,8 @@ public ResizableHeader(SafeHtml text, Column<T, ?> column, HasResizableColumns<T> table, Cell<SafeHtml> cell) { super(cell); + style = RESOURCES.resizableHeaderCss(); + style.ensureInjected(); this.text = text; this.column = column; this.table = table; @@ -44,7 +75,7 @@ @Override public SafeHtml getValue() { - return text; + return TEMPLATE.templatedValue(style.cellTableHeaderContent(), text); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/ResizableHeader.css b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/ResizableHeader.css new file mode 100644 index 0000000..f555062 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/ResizableHeader.css @@ -0,0 +1,6 @@ +.cellTableHeaderContent { + border-right: 1px solid #D7D7E1; + height: 32px; + margin-right: 3px; + overflow: hidden; +} diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTable.css b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTable.css index 96e5589..eedc682 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTable.css +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTable.css @@ -15,20 +15,19 @@ .cellTableHeader { border-top: 1px solid #E3EDF6; border-bottom: 1px solid #E3EDF6; - border-left: 1px solid #D7D7E1; - padding: 0px 0px; - padding-left: 3px; + padding: 0 0 0 2px; text-align: left; color: #111111; font-family: Arial,sans-serif; font-size: 11px; background-color: #F0F2FF; height: 28px; + line-height: 28px; white-space: nowrap; } .cellTableCell { - padding: 0px 3px; + padding: 0px 3px 0px 0px; height: 26px !important; border-top: 0px; border-bottom: 1px solid #EDEEF0; diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTableHeaderless.css b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTableHeaderless.css index 2db5617..813ac76 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTableHeaderless.css +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/TabCellTableHeaderless.css @@ -17,7 +17,7 @@ } .cellTableCell { - padding: 0px 3px; + padding: 0px 3px 0px 0px; height: 26px !important; border-top: 0px; border-bottom: 1px solid #EDEEF0; -- To view, visit http://gerrit.ovirt.org/27079 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24259a9aa5c68a25a9ae8b3d0d1553190bec3441 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
