Lior Vernia has uploaded a new change for review. Change subject: webadmin: Always display edit icon in Setup Networks ......................................................................
webadmin: Always display edit icon in Setup Networks The edit icon was hard to find due to it being only shown upon hover, now it will be displayed all the time. Moreover, it will always be displayed on the right edge of the panel to keep alignment uniform. Change-Id: I7c4b23893239443644216d31c28df147bbda7ef0 Bug-Url: https://bugzilla.redhat.com/984737 Bug-Url: https://bugzilla.redhat.com/1100810 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.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/NetworkPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java 4 files changed, 12 insertions(+), 41 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/29764/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java index 19ef7e7..c999e38 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java @@ -54,6 +54,7 @@ for (NetworkInterfaceModel networkInterfaceModel : bonded) { NicPanel nicPanel = new NicPanel(networkInterfaceModel, style); nicPanel.parentPanel = this; + nicPanel.actionButton.setVisible(false); vPanel.add(nicPanel); } @@ -63,18 +64,6 @@ @Override protected void onAction() { item.edit(); - } - - @Override - protected void onMouseOut() { - super.onMouseOut(); - actionButton.setVisible(false); - } - - @Override - protected void onMouseOver() { - super.onMouseOver(); - actionButton.setVisible(true); } } 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 9fa2675..6aa634d 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 @@ -68,14 +68,12 @@ @Override public void onClick(ClickEvent event) { - actionButton.setVisible(false); dragImage.setVisible(false); NetworkItemPanel.this.onAction(); } }); actionButton.getDownFace().setImage(new Image(resources.editMouseDown())); actionButton.setPixelSize(editImage.getWidth(), editImage.getHeight()); - actionButton.setVisible(false); actionButton.addStyleName("buttonStyle_pfly_fix"); //$NON-NLS-1$ actionButton.addStyleName("nip_actionButton_pfly_fix"); //$NON-NLS-1$ @@ -109,7 +107,6 @@ if (parentPanel != null) { parentPanel.onMouseOver(); } - actionButton.setVisible(false); } protected void onMouseOver() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java index 0b5f5dd..28cce1a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java @@ -18,8 +18,6 @@ public NetworkPanel(LogicalNetworkModel item, NetworkPanelsStyle style, boolean draggable) { super(item, style, draggable); - actionButton.setStyleName(style.actionButtonNetwork()); - actionButton.addStyleName("np_actionButton_pfly_fix"); //$NON-NLS-1$ if (item.isManagement()) { getElement().addClassName(style.mgmtNetwork()); } @@ -29,6 +27,8 @@ actionButton.getUpFace().setImage(new Image(resources.butEraseNetHover())); actionButton.getDownFace().setImage(new Image(resources.butEraseNetMousedown())); } + actionButton.setStyleName(style.actionButtonNetwork()); + actionButton.addStyleName("np_actionButton_pfly_fix"); //$NON-NLS-1$ } @Override @@ -80,6 +80,9 @@ } } + actionButton.setVisible(network != null && network.getAttachedToNic() != null + && (network.isManaged() || !network.isAttachedViaLabel())); + Grid rowPanel = new Grid(1, 9); rowPanel.setCellSpacing(0); rowPanel.setWidth("100%"); //$NON-NLS-1$ @@ -104,12 +107,12 @@ } Label titleLabel = new Label(getItemTitle()); rowPanel.setWidget(0, 2, titleLabel); - rowPanel.setWidget(0, 3, actionButton); - rowPanel.setWidget(0, 4, mgmtNetworkImage); - rowPanel.setWidget(0, 5, monitorImage); - rowPanel.setWidget(0, 6, vmImage); - rowPanel.setWidget(0, 7, migrationImage); - rowPanel.setWidget(0, 8, notSyncImage); + rowPanel.setWidget(0, 3, mgmtNetworkImage); + rowPanel.setWidget(0, 4, monitorImage); + rowPanel.setWidget(0, 5, vmImage); + rowPanel.setWidget(0, 6, migrationImage); + rowPanel.setWidget(0, 7, notSyncImage); + rowPanel.setWidget(0, 8, actionButton); return rowPanel; } @@ -132,16 +135,6 @@ OperationMap operationMap = item.getSetupModel().commandsFor(item); final NetworkCommand detach = operationMap.get(NetworkOperation.REMOVE_UNMANAGED_NETWORK).get(0); item.getSetupModel().onOperation(NetworkOperation.REMOVE_UNMANAGED_NETWORK, detach); - } - } - - @Override - protected void onMouseOver() { - super.onMouseOver(); - LogicalNetworkModel network = (LogicalNetworkModel) item; - if (network != null && network.getAttachedToNic() != null - && (network.isManaged() || !network.isAttachedViaLabel())) { - actionButton.setVisible(true); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java index f6460bc..e6d8509 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java @@ -67,12 +67,4 @@ protected void onAction() { item.edit(); } - - @Override - protected void onMouseOver() { - super.onMouseOver(); - if (parentPanel == null) { - actionButton.setVisible(true); - } - } } -- To view, visit http://gerrit.ovirt.org/29764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c4b23893239443644216d31c28df147bbda7ef0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
