Alona Kaplan has uploaded a new change for review. Change subject: webadmin: net int subtab- vlan hides non-vlan nets on the same nic(#841513) ......................................................................
webadmin: net int subtab- vlan hides non-vlan nets on the same nic(#841513) https://bugzilla.redhat.com/841513 if a nic have vlan network/s and non-vlan network, just the vlan networks are displayed in the interface subtable. Change-Id: Ib099f69896f2041aff573cd87a51836ec2dd2a21 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksManagementPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java 3 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/7208/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java index 6360675..2f95b57 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java @@ -37,7 +37,7 @@ // resize layoutPanel.remove(infoPanel); - layoutPanel.setWidgetSize(mainPanel, 225); + layoutPanel.setWidgetSize(mainPanel, 235); asPopupPanel().setPixelSize(400, 325); bootProtocolLabel.setEnabled(object.getBootProtocolsAvailable()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksManagementPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksManagementPopupView.java index c43c39d..58e1e33 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksManagementPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksManagementPopupView.java @@ -39,7 +39,7 @@ // resize layoutPanel.remove(infoPanel); - layoutPanel.setWidgetSize(mainPanel, 260); + layoutPanel.setWidgetSize(mainPanel, 270); asPopupPanel().setPixelSize(400, 350); bootProtocolLabel.setEnabled(object.getBootProtocolsAvailable()); 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 247586e..06d1338 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 @@ -26,9 +26,7 @@ add(new VLanElementPanel(hostVLan)); } - if (lineModel.getVLans().isEmpty()) { - add(new VLanElementPanel(lineModel)); - } + add(new VLanElementPanel(lineModel)); } } @@ -70,7 +68,14 @@ row.setWidget(0, 0, chekboxPanel); // Network name - row.setWidget(0, 1, new Label(hostVLan.getNetworkName())); + Label networkName = new Label(hostVLan.getNetworkName()); + + if (hostVLan.getInterface().getIsManagement()) { + networkName.getElement().getStyle().setFontWeight(FontWeight.BOLD); + networkName.setText("* " + hostVLan.getNetworkName()); //$NON-NLS-1$ + } + + row.setWidget(0, 1, networkName); return row; } -- To view, visit http://gerrit.ovirt.org/7208 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib099f69896f2041aff573cd87a51836ec2dd2a21 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
