Greg Sheremeta has uploaded a new change for review.

Change subject: webadmin: fixed 'new network' dialog spacing issues
......................................................................

webadmin: fixed 'new network' dialog spacing issues

PatternFly patch caused the 'network label' label and field
in the 'new network' dialog to be badly positioned. Fixed.

Change-Id: I3acbba3cbd4b087714831347a986ea71cde7cc85
Bug-Url: https://bugzilla.redhat.com/1096845
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.ui.xml
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml
M packaging/branding/ovirt.brand/patternfly-custom-hacks.css
3 files changed, 28 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/28231/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.ui.xml
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.ui.xml
index cfff6be..7ab595b 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.ui.xml
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.ui.xml
@@ -10,14 +10,14 @@
         }
     </ui:style>
 
-    <g:HorizontalPanel width="100%">
-        <g:cell verticalAlignment="ALIGN_MIDDLE">
-            <g:HorizontalPanel width="100%">
-                <ge:EntityModelLabel ui:field="label" 
addStyleNames="{style.labelStyle}" />
-                <d:InfoIcon ui:field="infoIcon" />
+    <g:HorizontalPanel width="100%" addStyleNames="emwwi_outerPanel_pfly_fix">
+        <g:cell verticalAlignment="ALIGN_MIDDLE" 
addStyleNames="emwwi_leftCell_pfly_fix">
+            <g:HorizontalPanel width="100%" 
addStyleNames="emwwi_outerPanel_pfly_fix">
+                <ge:EntityModelLabel ui:field="label" 
addStyleNames="{style.labelStyle} emwwi_label_pfly_fix" />
+                <d:InfoIcon ui:field="infoIcon" 
addStyleNames="emwwi_infoIcon_pfly_fix" />
             </g:HorizontalPanel>
         </g:cell>
-        <g:cell width="230px">
+        <g:cell width="230px" addStyleNames="emwwi_rightCell_pfly_fix">
             <g:Composite ui:field="contentWidget" />
         </g:cell>
     </g:HorizontalPanel>
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 1e0424a..f283e59 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
@@ -34,7 +34,7 @@
         }
 
         .dependentField {
-            padding-left: 10px;
+            margin-left: 10px;
         }
 
         .valueBox {
@@ -112,7 +112,7 @@
                                         <ge:EntityModelCheckBoxEditor 
ui:field="hasMtuEditor"/>
                                         
<ge:IntegerEntityModelTextBoxOnlyEditor ui:field="mtuEditor" />
                                     </g:HorizontalPanel>
-                                    <w:EntityModelWidgetWithInfo 
ui:field="networkLabelWithInfo" addStyleNames="{style.dependentField} 
{style.propertyWidth}" width="470px" />
+                                    <w:EntityModelWidgetWithInfo 
ui:field="networkLabelWithInfo" addStyleNames="{style.dependentField} 
{style.propertyWidth} anpv_networkLabelPanel_pfly_fix" />
                                     <g:HorizontalPanel 
verticalAlignment="ALIGN_MIDDLE" visible="false">
                                         <e:ListModelListBoxEditor 
ui:field="qosEditor" addStyleNames="{style.dependentField} 
{style.propertyWidth}" />
                                         <w:UiCommandButton 
ui:field="addQosButton" addStyleNames="{style.qosStyle}" />
diff --git a/packaging/branding/ovirt.brand/patternfly-custom-hacks.css 
b/packaging/branding/ovirt.brand/patternfly-custom-hacks.css
index 24b2b3c..b69cf6b 100644
--- a/packaging/branding/ovirt.brand/patternfly-custom-hacks.css
+++ b/packaging/branding/ovirt.brand/patternfly-custom-hacks.css
@@ -493,3 +493,23 @@
     position: relative !important;
     top: 3px !important;
 }
+.anpv_networkLabelPanel_pfly_fix {
+    margin-top: 6px;
+}
+.anpv_networkLabelPanel_pfly_fix .avw_contentWidget_pfly_fix {
+    position: relative !important;
+    left: -141px !important;
+}
+.anpv_networkLabelPanel_pfly_fix .emwwi_label_pfly_fix {
+    padding-bottom: 5px !important;
+}
+.anpv_networkLabelPanel_pfly_fix .emwwi_infoIcon_pfly_fix {
+    position: relative !important;
+    left: 40px !important;
+}
+.anpv_networkLabelPanel_pfly_fix .emwwi_outerPanel_pfly_fix {
+    width: inherit !important;
+}
+.anpv_networkLabelPanel_pfly_fix .emwwi_outerPanel_pfly_fix {
+    width: inherit !important;
+}


-- 
To view, visit http://gerrit.ovirt.org/28231
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3acbba3cbd4b087714831347a986ea71cde7cc85
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to