Greg Sheremeta has uploaded a new change for review.
Change subject: webadmin: fixed context-sensitive help icon
......................................................................
webadmin: fixed context-sensitive help icon
commit 42e9396 broke the context-sensitive help icon. Fixed.
Also moved the header text up one pixel to align with the
fixed icon.
Change-Id: Iff8f6605a89dad1f57b15a63de2ffa8e67825418
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.ui.xml
M packaging/branding/ovirt.brand/common.css
M packaging/branding/ovirt.brand/ovirt-patternfly-compat.css
4 files changed, 16 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/31856/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.java
index f63b584..ac8245e 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.java
@@ -63,6 +63,7 @@
@Override
@UiChild(tagname = "header", limit = 1)
public void setHeader(Widget widget) {
+ widget.addStyleName("obrand_dialogHeaderTitleElement"); //$NON-NLS-1$
headerTitlePanel.insert(widget, 0); //Put the label at the front.
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.ui.xml
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.ui.xml
index 720107e..f229c81 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.ui.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.ui.xml
@@ -62,15 +62,14 @@
.helpIconButton {
background: transparent;
- border: 1px solid transparent;
- line-height: 32px;
+ border: none;
vertical-align: middle;
padding: 1px;
cursor: pointer;
z-index: 1;
float: left;
position: relative;
- top: -5px;
+ top: -2px !important;
}
.closeIconButton {
@@ -100,6 +99,10 @@
.obrand_dialogLogoImageWrapper {
}
+ @external obrand_dialogHeaderTitleContainer;
+ .obrand_dialogHeaderTitleContainer {
+ }
+
@external obrand_dialogLogoImage;
.obrand_dialogLogoImage {
}
@@ -112,9 +115,9 @@
<g:SimplePanel ui:field="logoPanel"
addStyleNames="{style.logoPanel}">
<g:Image styleName="obrand_dialogLogoImage"
url="clear.cache.gif" />
</g:SimplePanel>
- <g:FlowPanel addStyleNames="{style.obrand_dialogHeaderTitle}">
+ <g:FlowPanel
addStyleNames="{style.obrand_dialogHeaderTitleContainer}">
<g:FlowPanel ui:field="headerTitlePanel">
- <g:PushButton ui:field="helpIconButton"
addStyleNames="{style.helpIconButton} sdp_helpIconButton_pfly_fix"
visible="false">
+ <g:PushButton ui:field="helpIconButton"
addStyleNames="{style.helpIconButton}" visible="false">
<g:upFace image='{resources.dialogIconHelp}' />
<g:downFace image='{resources.dialogIconHelpDown}'
/>
<g:upHoveringFace
image='{resources.dialogIconHelpRollover}' />
diff --git a/packaging/branding/ovirt.brand/common.css
b/packaging/branding/ovirt.brand/common.css
index 99cc818..51b5dee 100644
--- a/packaging/branding/ovirt.brand/common.css
+++ b/packaging/branding/ovirt.brand/common.css
@@ -37,7 +37,7 @@
right: 30px;
}
-.obrand_dialogHeaderTitle {
+.obrand_dialogHeaderTitleContainer {
text-align: left;
font-size: 14px;
font-weight: bold;
@@ -46,10 +46,15 @@
height: 27px;
overflow: hidden;
z-index: 2;
- margin-top: 1px;
+ margin-top: 0;
left: -5px;
}
+.obrand_dialogHeaderTitleElement {
+ float: left;
+ padding-right: 5px;
+}
+
/* right */
.obrand_dialogHeaderRightPanel {
background-image: url(images/dialog/dialog_header_TR.png);
diff --git a/packaging/branding/ovirt.brand/ovirt-patternfly-compat.css
b/packaging/branding/ovirt.brand/ovirt-patternfly-compat.css
index 5cd3f8d..f49c8bb 100644
--- a/packaging/branding/ovirt.brand/ovirt-patternfly-compat.css
+++ b/packaging/branding/ovirt.brand/ovirt-patternfly-compat.css
@@ -301,9 +301,6 @@
.mtev_buttonPanel_pfly_fix label {
padding-left: 3px !important;
}
-.sdp_helpIconButton_pfly_fix {
- top: -7px !important;
-}
.tslp_sliderButton_pfly_fix {
top: -3px !important;
}
--
To view, visit http://gerrit.ovirt.org/31856
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff8f6605a89dad1f57b15a63de2ffa8e67825418
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
