Alona Kaplan has uploaded a new change for review. Change subject: webadmin: redundant rectangle on Network Interfaces tab (#851570) ......................................................................
webadmin: redundant rectangle on Network Interfaces tab (#851570) https://bugzilla.redhat.com/851570 In host->interfaces subtab, if there is nic/bond with just vlan/s (no non vlan network). There is redundant rectangle under the vlans. Change-Id: I6f963adaee4a765c38bc2bf54f4dafe6ab442961 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostInterfaceView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostInterfaceForm.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java 4 files changed, 26 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/7866/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java index a18a29c..ae253dd 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java @@ -277,8 +277,7 @@ }); // Use fixed table layout - table.setWidth("100%", true); //$NON-NLS-1$ - tableHeader.setWidth("100%", true); //$NON-NLS-1$ + setWidth("100%", true); //$NON-NLS-1$ // Attach table widget to the corresponding panel tableContainer.setWidget(table); @@ -286,6 +285,11 @@ tableHeaderContainer.setVisible(!showDefaultHeader); } + public void setWidth(String width, boolean isFixedLayout) { + table.setWidth("100%", true); //$NON-NLS-1$ + tableHeader.setWidth("100%", true); //$NON-NLS-1$ + } + @UiHandler("prevPageButton") public void handlePrevPageButtonClick(ClickEvent event) { getDataProvider().goBack(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostInterfaceView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostInterfaceView.java index 25844f8..ece69b1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostInterfaceView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostInterfaceView.java @@ -59,6 +59,7 @@ clientStorage); ViewIdHandler.idHandler.generateAndSetIds(this); initTable(constants, templates); + table.setWidth("100%", false); //$NON-NLS-1$ contentPanel = new VerticalPanel(); contentPanel.setWidth("100%"); //$NON-NLS-1$ @@ -72,17 +73,17 @@ } void initTable(ApplicationConstants constants, ApplicationTemplates templates) { - table.addColumn(new EmptyColumn(), constants.empty(), "10%"); //$NON-NLS-1$ - table.addColumn(new EmptyColumn(), constants.nameInterface(), "20%"); //$NON-NLS-1$ - table.addColumn(new EmptyColumn(), constants.addressInterface(), "20%"); //$NON-NLS-1$ - table.addColumn(new EmptyColumn(), constants.macInterface(), "20%"); //$NON-NLS-1$ - table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.speedInterface(), constants.mbps()).asString(), "10%"); //$NON-NLS-1$ - table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.rxInterface(), constants.mbps()).asString(), "10%"); //$NON-NLS-1$ - table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.txInterface(), constants.mbps()).asString(), "10%"); //$NON-NLS-1$ - table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.dropsInterface(), constants.pkts()).asString(), "10%"); //$NON-NLS-1$ - table.addColumn(new EmptyColumn(), constants.bondInterface(), "20%"); //$NON-NLS-1$ - table.addColumn(new EmptyColumn(), constants.vlanInterface(), "20%"); //$NON-NLS-1$ - table.addColumn(new EmptyColumn(), constants.networkNameInterface(), "20%"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.empty(), "30px"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.nameInterface(), "210px"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.addressInterface(), "210px"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.macInterface(), "210px"); //$NON-NLS-1$ + table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.speedInterface(), constants.mbps()).asString(), "105px"); //$NON-NLS-1$ + table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.rxInterface(), constants.mbps()).asString(), "105px"); //$NON-NLS-1$ + table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.txInterface(), constants.mbps()).asString(), "105px"); //$NON-NLS-1$ + table.addColumnWithHtmlHeader(new EmptyColumn(), templates.sub(constants.dropsInterface(), constants.pkts()).asString(), "105px"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.bondInterface(), "210px"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.vlanInterface(), "210px"); //$NON-NLS-1$ + table.addColumn(new EmptyColumn(), constants.networkNameInterface(), "210px"); //$NON-NLS-1$ table.addActionButton(new WebAdminButtonDefinition<HostInterfaceLineModel>(constants.addEditInterface()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostInterfaceForm.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostInterfaceForm.java index 66814b1..e5984f4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostInterfaceForm.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostInterfaceForm.java @@ -22,9 +22,9 @@ public HostInterfaceForm(final HostInterfaceListModel listModel) { isSelectionAvailable = listModel.getIsSelectionAvailable(); grid = new Grid(1, 3); - grid.getColumnFormatter().setWidth(0, "65%"); //$NON-NLS-1$ - grid.getColumnFormatter().setWidth(1, "11%"); //$NON-NLS-1$ - grid.getColumnFormatter().setWidth(2, "24%"); //$NON-NLS-1$ + grid.getColumnFormatter().setWidth(0, "1080px"); //$NON-NLS-1$ + grid.getColumnFormatter().setWidth(1, "210px"); //$NON-NLS-1$ + grid.getColumnFormatter().setWidth(2, "420px"); //$NON-NLS-1$ grid.setWidth("100%"); //$NON-NLS-1$ grid.setHeight("100%"); //$NON-NLS-1$ initWidget(grid); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java index 43be853..7b4a480 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.webadmin.widget.host; +import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.common.widget.TogglePanel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceLineModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostVLan; @@ -28,11 +29,14 @@ this.isSelectionAvailable = isSelectionEnabled; } public void addVLans(HostInterfaceLineModel lineModel) { + boolean hasVlan = lineModel.getVlanSize() != 0; for (HostVLan hostVLan : lineModel.getVLans()) { add(new VLanElementPanel(hostVLan, isSelectionAvailable)); } - add(new VLanElementPanel(lineModel)); + if (!hasVlan || !StringHelper.isNullOrEmpty(lineModel.getNetworkName())){ + add(new VLanElementPanel(lineModel)); + } } } -- To view, visit http://gerrit.ovirt.org/7866 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f963adaee4a765c38bc2bf54f4dafe6ab442961 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
