plysan has uploaded a new change for review.
Change subject: branding: Add more css styles from login UI to branding
......................................................................
branding: Add more css styles from login UI to branding
This patch add capability to:
1. customize background image in login section view by adding
background-image: url(path) in obrand_loginPanelContainer style.
2. customize login popup panel by obrand_loginPopupBackground
style.
3. customize text of form in login popup view by obrand_formWidget
style.
4. customize connect automatically text by
obrand_connectAutomatically style.
5. customize local selection text by obrand_localeSelect style.
Change-Id: I2ef2d76ae42834dae090479e499b898a566efa66
Signed-off-by: walteryang <walteryan...@gmail.com>
---
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginSectionView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginSectionView.ui.xml
M packaging/branding/ovirt.brand/user_portal.css
M packaging/branding/ovirt.brand/web_admin.css
6 files changed, 99 insertions(+), 43 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/26737/1
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml
index 40beaeb..49aee92 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml
@@ -17,13 +17,8 @@
margin: auto;
}
- .formWidget {
- color: #333333;
- font-size: 13px;
- padding: 0 5px;
- font-family: Verdana,sans-serif;
- line-height: 30px;
- text-align: left;
+ @external obrand_formWidget;
+ .obrand_formWidget {
}
.localizationLabel {
@@ -75,12 +70,12 @@
margin-top:10px;
}
- .localeSelect {
- padding-right: 15px;
- text-align: right;
- color:gray;
- font-size: 11px;
- width: 130px;
+ @external obrand_connectAutomatically;
+ .obrand_connectAutomatically {
+ }
+
+ @external obrand_localeSelect;
+ .obrand_localeSelect {
}
.motd {
@@ -106,6 +101,10 @@
</ui:style>
<ui:style field='loginPopupStyle'>
+ @external obrand_loginPopupBackground;
+ .obrand_loginPopupBackground {
+ }
+
.loginPopupHeader {
position: absolute;
top: 5px;
@@ -133,7 +132,7 @@
</ui:style>
- <d:SimplePopupPanel ui:field="popup" width="480px">
+ <d:SimplePopupPanel ui:field="popup" width="480px"
addStyleNames="{loginPopupStyle.obrand_loginPopupBackground}">
<d:header>
<g:HorizontalPanel
styleName="{loginPopupStyle.loginPopupHeader}">
<g:Image
styleName="obrand_loginPopupHeaderLogoImage" url="clear.cache.gif" />
@@ -149,19 +148,19 @@
<table class="{style.loginFormTable}">
<tr>
<td>
- <g:Label
ui:field="userNameLabel" addStyleNames="{style.formWidget}" />
- <g:Label
ui:field="passwordLabel" addStyleNames="{style.formWidget}" />
- <g:Label
ui:field="domainLabel" addStyleNames="{style.formWidget}" />
+ <g:Label
ui:field="userNameLabel" addStyleNames="{style.obrand_formWidget}" />
+ <g:Label
ui:field="passwordLabel" addStyleNames="{style.obrand_formWidget}" />
+ <g:Label
ui:field="domainLabel" addStyleNames="{style.obrand_formWidget}" />
</td>
<td>
-
<e:EntityModelTextBoxEditor ui:field="userNameEditor"
addStyleNames="{style.formWidget}" />
-
<e:EntityModelPasswordBoxEditor ui:field="passwordEditor"
addStyleNames="{style.formWidget}" />
-
<e:ListModelListBoxEditor ui:field="domainEditor"
addStyleNames="{style.formWidget}" />
+
<e:EntityModelTextBoxEditor ui:field="userNameEditor"
addStyleNames="{style.obrand_formWidget}" />
+
<e:EntityModelPasswordBoxEditor ui:field="passwordEditor"
addStyleNames="{style.obrand_formWidget}" />
+
<e:ListModelListBoxEditor ui:field="domainEditor"
addStyleNames="{style.obrand_formWidget}" />
</td>
</tr>
<tr>
<td colspan="2">
-
<e:EntityModelCheckBoxEditor ui:field="connectAutomatically" />
+
<e:EntityModelCheckBoxEditor ui:field="connectAutomatically"
addStyleNames="{style.obrand_connectAutomatically}" />
</td>
</tr>
<tr>
@@ -179,7 +178,7 @@
</g:VerticalPanel>
<g:HTMLPanel
addStyleNames="{style.localePanel}">
<g:ListBox ui:field="localeBox"
addStyleNames="{style.localeBox}"/>
- <g:Label
ui:field="selectedLocale" addStyleNames="{style.localeSelect}"></g:Label>
+ <g:Label
ui:field="selectedLocale" addStyleNames="{style.obrand_localeSelect}"></g:Label>
</g:HTMLPanel>
</g:VerticalPanel>
</g:HTMLPanel>
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginSectionView.ui.xml
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginSectionView.ui.xml
index 32f1ae5..9723ba1 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginSectionView.ui.xml
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginSectionView.ui.xml
@@ -2,13 +2,19 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";>
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:with field='resources'
type='org.ovirt.engine.ui.userportal.ApplicationResources' />
+
<ui:style>
.loginPanelContainer {
background-color: #7F7F7F;
}
+ @external obrand_loginPanelContainer;
+ .obrand_loginPanelContainer {
+ }
</ui:style>
<g:FlowPanel addStyleNames="{style.loginPanelContainer}">
+ <g:Image styleName="obrand_loginPanelContainer" />
</g:FlowPanel>
</ui:UiBinder>
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml
index cf50897..33a54c9 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml
@@ -17,13 +17,8 @@
margin: auto;
}
- .formWidget {
- color: #333333;
- font-size: 13px;
- padding: 0 5px;
- font-family: Verdana,sans-serif;
- line-height: 30px;
- text-align: left;
+ @external obrand_formWidget;
+ .obrand_formWidget {
}
.errorMessagePanel {
@@ -72,12 +67,8 @@
margin-top:10px;
}
- .localeSelect {
- padding-right: 15px;
- text-align: right;
- color:gray;
- font-size: 11px;
- width: 130px;
+ @external obrand_localeSelect;
+ .obrand_localeSelect {
}
.headerLabelStyle {
@@ -89,6 +80,10 @@
</ui:style>
<ui:style field='loginPopupStyle'>
+ @external obrand_loginPopupBackground;
+ .obrand_loginPopupBackground {
+ }
+
.loginPopupHeader {
position: absolute;
top: 5px;
@@ -109,7 +104,7 @@
}
</ui:style>
- <d:SimplePopupPanel ui:field="popup" width="480px">
+ <d:SimplePopupPanel ui:field="popup" width="480px"
addStyleNames="{loginPopupStyle.obrand_loginPopupBackground}">
<d:header>
<g:HorizontalPanel
styleName="{loginPopupStyle.loginPopupHeader}">
<g:Image
styleName="obrand_loginPopupHeaderLogoImage" url="clear.cache.gif" />
@@ -125,14 +120,14 @@
<table class="{style.loginFormTable}">
<tr>
<td>
- <g:Label
ui:field="userNameLabel" addStyleNames="{style.formWidget}" />
- <g:Label
ui:field="passwordLabel" addStyleNames="{style.formWidget}" />
- <g:Label
ui:field="domainLabel" addStyleNames="{style.formWidget}" />
+ <g:Label
ui:field="userNameLabel" addStyleNames="{style.obrand_formWidget}" />
+ <g:Label
ui:field="passwordLabel" addStyleNames="{style.obrand_formWidget}" />
+ <g:Label
ui:field="domainLabel" addStyleNames="{style.obrand_formWidget}" />
</td>
<td>
-
<e:EntityModelTextBoxEditor ui:field="userNameEditor"
addStyleNames="{style.formWidget}" />
-
<e:EntityModelPasswordBoxEditor ui:field="passwordEditor"
addStyleNames="{style.formWidget}" />
-
<e:ListModelListBoxEditor ui:field="domainEditor"
addStyleNames="{style.formWidget}" />
+
<e:EntityModelTextBoxEditor ui:field="userNameEditor"
addStyleNames="{style.obrand_formWidget}" />
+
<e:EntityModelPasswordBoxEditor ui:field="passwordEditor"
addStyleNames="{style.obrand_formWidget}" />
+
<e:ListModelListBoxEditor ui:field="domainEditor"
addStyleNames="{style.obrand_formWidget}" />
</td>
</tr>
<tr>
@@ -153,7 +148,7 @@
<g:HTMLPanel
addStyleNames="{style.localePanel}">
<g:ListBox ui:field="localeBox"
addStyleNames="{style.localeBox}"/>
- <g:Label
ui:field="selectedLocale" addStyleNames="{style.localeSelect}"></g:Label>
+ <g:Label
ui:field="selectedLocale" addStyleNames="{style.obrand_localeSelect}"></g:Label>
</g:HTMLPanel>
</g:VerticalPanel>
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginSectionView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginSectionView.ui.xml
index 32f1ae5..2b37217 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginSectionView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginSectionView.ui.xml
@@ -2,13 +2,19 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";>
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:with field='resources'
type='org.ovirt.engine.ui.webadmin.ApplicationResources' />
+
<ui:style>
.loginPanelContainer {
background-color: #7F7F7F;
}
+ @external obrand_loginPanelContainer;
+ .obrand_loginPanelContainer {
+ }
</ui:style>
<g:FlowPanel addStyleNames="{style.loginPanelContainer}">
+ <g:Image styleName="obrand_loginPanelContainer" />
</g:FlowPanel>
</ui:UiBinder>
diff --git a/packaging/branding/ovirt.brand/user_portal.css
b/packaging/branding/ovirt.brand/user_portal.css
index 23b7a65..17dfd09 100644
--- a/packaging/branding/ovirt.brand/user_portal.css
+++ b/packaging/branding/ovirt.brand/user_portal.css
@@ -77,3 +77,29 @@
margin-right: 2px;
}
+.obrand_loginPanelContainer {
+}
+
+.obrand_loginPopupBackground {
+}
+
+.obrand_formWidget {
+ color: #333333;
+ font-size: 13px;
+ padding: 0 5px;
+ font-family: Verdana,sans-serif;
+ line-height: 30px;
+ text-align: left;
+}
+
+.obrand_localeSelect {
+ padding-right: 15px;
+ text-align: right;
+ color:gray;
+ font-size: 11px;
+ width: 130px;
+}
+
+.obrand_connectAutomatically {
+ color: #00b4ed;
+}
diff --git a/packaging/branding/ovirt.brand/web_admin.css
b/packaging/branding/ovirt.brand/web_admin.css
index a3976d8..f604a31 100644
--- a/packaging/branding/ovirt.brand/web_admin.css
+++ b/packaging/branding/ovirt.brand/web_admin.css
@@ -57,3 +57,27 @@
line-height: 2em;
padding-right: 10px;
}
+
+.obrand_loginPanelContainer {
+}
+
+.obrand_loginPopupBackground {
+}
+
+.obrand_formWidget {
+ color: #333333;
+ font-size: 13px;
+ padding: 0 5px;
+ font-family: Verdana,sans-serif;
+ line-height: 30px;
+ text-align: left;
+}
+
+.obrand_localeSelect {
+ padding-right: 15px;
+ text-align: right;
+ color:gray;
+ font-size: 11px;
+ width: 130px;
+}
+
--
To view, visit http://gerrit.ovirt.org/26737
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ef2d76ae42834dae090479e499b898a566efa66
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: plysan <ply...@gmail.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
