Alona Kaplan has uploaded a new change for review. Change subject: webadmin: [SetupNetworks] discontinuous arrows (#851496) ......................................................................
webadmin: [SetupNetworks] discontinuous arrows (#851496) https://bugzilla.redhat.com/851496 Discontinuous arrows when multiple VLANs is attached to interface via Setup Networks. Change-Id: I25a77289d622a9f0b6cb29accb4bc5720fa23c48 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java 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/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java D frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_left_middle.png M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_bottom.png M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_middle.png M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_top.png 12 files changed, 18 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/7748/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index e329a04..285cd2c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -479,7 +479,6 @@ unmanagedNetwork.setMtu(nic.getMtu()); unmanagedNetwork.setVmNetwork(nic.isBridged()); LogicalNetworkModel networkModel = new LogicalNetworkModel(unmanagedNetwork, this); - networkModel.setError(ConstantsManager.getInstance().getConstants().thisNetworkDoesNotExistInTheClusterErr()); networkMap.put(networkName, networkModel); return networkModel; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java index f006e87..37e1c02 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java @@ -266,9 +266,6 @@ @Source("images/network/arrow_right_middle.png") ImageResource arrowRightMiddle(); - @Source("images/network/arrow_left_middle.png") - ImageResource arrowLeftMiddle(); - @Source("images/network/arrow_right_one.png") ImageResource arrowRightOne(); 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 664dd4c..54972c4 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 @@ -121,4 +121,7 @@ @Template("<I>{0}<BR>{1}</I>") SafeHtml italicTwoLines(String firstLine, String secondLine); + @Template("<div style='background: url({0}) no-repeat; height: {1}px; width: {2}px;'></div>") + SafeHtml image(String url, int height, int width); + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml index bf74b4e..ad2f739 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml @@ -45,11 +45,6 @@ color: black; } - .itemPanelError { - border-color: red; - border-width: 2px; - } - .networkGroupDragOver { border-color: black !important; box-shadow: 1px 1px 1px 1px rgba(33, 33, 33, 0.3); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java index b39b1f8..f37bc04 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java @@ -2,14 +2,16 @@ import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel; import org.ovirt.engine.ui.webadmin.ApplicationResources; +import org.ovirt.engine.ui.webadmin.ApplicationTemplates; import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.FlexTable; -import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.HTML; public class ConnectorPanel extends FlexTable { + private final ApplicationTemplates templates = ClientGinjectorProvider.instance().getApplicationTemplates(); public ConnectorPanel(NetworkInterfaceModel nicModel, NetworkPanelsStyle style) { super(); int networkSize = nicModel.getItems().size(); @@ -23,7 +25,8 @@ FlexCellFormatter flexCellFormatter = getFlexCellFormatter(); flexCellFormatter.setRowSpan(0, 0, networkSize); - setWidget(0, 0, new Image(networkSize > 1 ? resources.arrowLeftMiddle() : resources.arrowLeft())); + HTML leftImageHtml = new HTML(templates.image(resources.arrowLeft().getURL(), resources.arrowLeft().getHeight(), resources.arrowLeft().getWidth())); + setWidget(0, 0, leftImageHtml); for (int i = 0; i < networkSize; i++) { int row = i; @@ -40,8 +43,9 @@ rightImage = resources.arrowRightMiddle(); } } - setWidget(row, column, new Image(rightImage)); + + HTML rightImageHtml = new HTML(templates.image(rightImage.getURL(), rightImage.getHeight(), rightImage.getWidth())); + setWidget(row, column, rightImageHtml); } - setHeight((50 * networkSize) + "px"); //$NON-NLS-1$ } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java index 328d4d0..23bf594 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java @@ -32,7 +32,7 @@ private final NetworkPanelsStyle style; private final NetworkInterfaceModel nicModel; private final FlexTable table; - private ApplicationConstants constants = ClientGinjectorProvider.instance().getApplicationConstants(); + private final ApplicationConstants constants = ClientGinjectorProvider.instance().getApplicationConstants(); public NetworkGroup(NetworkInterfaceModel nicModel, final NetworkPanelsStyle style) { super(false); @@ -71,12 +71,12 @@ Collections.sort(networks); if (networkSize > 0) { flexCellFormatter.setRowSpan(0, 0, networkSize); + FlexTable networkTable = new FlexTable(); for (int i = 0; i < networkSize; i++) { - table.setWidget(i, i > 0 ? 1 : 2, new NetworkPanel(networks.get(i), style)); - if (i > 0) { - table.removeCell(i, 0); - } + networkTable.setWidget(i, 0 ,new NetworkPanel(networks.get(i), style)); + networkTable.setWidth("100%"); //$NON-NLS-1$ } + table.setWidget(0, 2, networkTable); } else { SimplePanel emptyPanel = new SimplePanel(); Label label = new Label(constants.noNetworkAssigned()); @@ -86,6 +86,8 @@ table.setWidget(0, 2, emptyPanel); } + // connector.setHeight(table.getOffsetHeight() + "px"); //$NON-NLS-1$ + // drag enter addBitlessDomHandler(new DragEnterHandler() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java index c39966f..1d71dbc 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java @@ -112,9 +112,6 @@ private void init() { menu = menuFor(item); getElement().addClassName(style.itemPanel()); - if (item.hasError()) { - getElement().addClassName(style.itemPanelError()); - } setWidget(getContents()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java index 7077d2e..4f9e864 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java @@ -15,8 +15,6 @@ String itemPanel(); - String itemPanelError(); - String mgmtNetwork(); String networkGroupDragOver(); diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_left_middle.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_left_middle.png deleted file mode 100644 index 9e75238..0000000 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_left_middle.png +++ /dev/null Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_bottom.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_bottom.png index b0e71a3..8ea32a5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_bottom.png +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_bottom.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_middle.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_middle.png index 93b80e8..a0632be 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_middle.png +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_middle.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_top.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_top.png index fe6be34..c4ab4e4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_top.png +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/network/arrow_right_top.png Binary files differ -- To view, visit http://gerrit.ovirt.org/7748 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25a77289d622a9f0b6cb29accb4bc5720fa23c48 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
