Lior Vernia has uploaded a new change for review. Change subject: webadmin: Integrate VM icon into Add/Edit Network dialog ......................................................................
webadmin: Integrate VM icon into Add/Edit Network dialog Reuse the VM icon next to the VM network checkbox, to strengthen the visual affinity between the checkbox and its consequences in other views. Change-Id: I40f7c7e3088af2b1da174b6896bdfce27435b423 Bug-Url: https://bugzilla.redhat.com/1028523 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml 2 files changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/23509/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index 9164c6d..0fc35d0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -256,8 +256,8 @@ mtuEditor.addContentWidgetStyleName(style.valueBox()); networkLabel.addContentWidgetStyleName(style.valueBox()); qosEditor.addContentWidgetStyleName(style.valueBox()); - isVmNetworkEditor.addContentWidgetStyleName(style.checkBox()); - isVmNetworkEditor.asCheckBox().addStyleName(style.checkBox()); + isVmNetworkEditor.addContentWidgetStyleName(style.vmNetworkStyle()); + isVmNetworkEditor.asCheckBox().addStyleName(style.vmNetworkStyle()); vlanTagging.addContentWidgetStyleName(style.checkBox()); vlanTagging.asCheckBox().addStyleName(style.checkBox()); hasMtuEditor.addContentWidgetStyleName(style.checkBox()); @@ -445,6 +445,8 @@ String checkBox(); + String vmNetworkStyle(); + String inlineLabel(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml index 756ff4f..53c67e3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml @@ -10,7 +10,7 @@ xmlns:t="urn:import:org.ovirt.engine.ui.common.widget.dialog.tab" xmlns:w="urn:import:org.ovirt.engine.ui.common.widget"> - <ui:with field='constants' type='org.ovirt.engine.ui.webadmin.ApplicationConstants' /> + <ui:with field='resources' type='org.ovirt.engine.ui.webadmin.ApplicationResources' /> <ui:style type="org.ovirt.engine.ui.webadmin.section.main.view.popup.AbstractNetworkPopupView.WidgetStyle"> @@ -43,6 +43,16 @@ .checkBox { padding: 0px !important; width: 230px !important; + } + + .vmNetworkStyle { + padding: 0px !important; + width: auto !important; + } + + .vmNetworkImage { + margin-left: 3px; + margin-top: 4px; } .tree { @@ -95,7 +105,10 @@ <e:EntityModelCheckBoxEditor ui:field="vlanTagging"/> <e:EntityModelTextBoxOnlyEditor ui:field="vlanTag" /> </g:HorizontalPanel> - <e:EntityModelCheckBoxEditor ui:field="isVmNetworkEditor" addStyleNames="{style.dependentField}" /> + <g:HorizontalPanel addStyleNames="{style.dependentField}"> + <e:EntityModelCheckBoxEditor ui:field="isVmNetworkEditor" /> + <g:Image resource="{resources.networkVm}" addStyleNames="{style.vmNetworkImage}" /> + </g:HorizontalPanel> <g:HorizontalPanel addStyleNames="{style.dependentField}"> <e:EntityModelCheckBoxEditor ui:field="hasMtuEditor"/> <e:EntityModelTextBoxOnlyEditor ui:field="mtuEditor" /> -- To view, visit http://gerrit.ovirt.org/23509 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40f7c7e3088af2b1da174b6896bdfce27435b423 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
