10:32 a.m.
Vojtech Szocs has submitted this change and it was merged.
Change subject: userportal, webadmin: branding support.
......................................................................
userportal, webadmin: branding support.
- Added branding support to user portal.
- Added branding support to web admin.
- Exposed style classes for the following common objects.
- LoginPopupView
- SimpleDialogPanel
- ErrorPopupView
- DialogTab
- GWT DialogBox
- VmDiskPopupWidget
- Exposed style classes for the following webadmin objects.
- HeaderView
- StoragePopupView
- Exposed style classes for the following user porta objects.
- UserPortalMainTab
- HeaderView
- MainTabBasicView
- VerticalTab
- VerticalTabPanel
- Externalized some message to be overriden using the host
page as the source of the messages.
- Moved LocaleFilter to utils module so we can share among
the different wars.
- Added code to not include default styles if external
default styles are detected.
- Added default branding as an external package.
Bug-Url: https://bugzilla.redhat.com/890568
Change-Id: I4a8a426ce7d688d33c5ae2b70632c836843106b2
Signed-off-by: Alexander Wels <awels(a)redhat.com>
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
Signed-off-by: Vojtech Szocs <vszocs(a)redhat.com>
---
M Makefile
A README.branding
M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java
M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FileServlet.java
M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/SplashServlet.java
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
M backend/manager/modules/root/src/test/java/org/ovirt/engine/core/DocsServletTest.java
M backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java
R
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java
R
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java
R
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/LocaleFilterTest.java
R
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/ServletUtilsTest.java
R
backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/servlet/zerosize
A
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServlet.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java
A
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/branding/BrandingManager.java
A
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/branding/BrandingTheme.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/plugin/PluginResourceServlet.java
M
frontend/webadmin/modules/frontend/src/main/resources/META-INF/resources/GwtHostPage.jsp
M frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml
M
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
A
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServletTest.java
M
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServletTest.java
A
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/branding/BrandingManagerTest.java
A
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/branding/BrandingThemeTest.java
A
frontend/webadmin/modules/frontend/src/test/resources/org/ovirt/engine/ui/frontend/server/gwt/branding/01-test.brand/branding.properties
A
frontend/webadmin/modules/frontend/src/test/resources/org/ovirt/engine/ui/frontend/server/gwt/branding/01-test.brand/messages.properties
A
frontend/webadmin/modules/frontend/src/test/resources/org/ovirt/engine/ui/frontend/server/gwt/branding/01-test.brand/messages_fr.properties
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/gin/BaseSystemModule.java
A
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicConstants.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ErrorPopupView.ui.xml
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/SimpleDialogPanel.ui.xml
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.ui.xml
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/AbstractTab.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/SimpleTab.ui.xml
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/css/DialogBox.css
R
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/public/images/dialog/warning.png
A
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationDynamicConstants.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResources.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/SideTabWithDetailsViewStyle.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/SystemModule.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java
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/main/view/AboutPopupView.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/AboutPopupView.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/HeaderView.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/MainTabBasicView.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/system/ApplicationInit.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/tab/UserPortalMainTab.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/tab/VerticalTab.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/tab/VerticalTabPanel.ui.xml
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/UserPortalSimpleActionTable.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/css/SideTabWithDetailsViewStyle.css
D
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/login/login_page_header_image.png
D
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/login/login_page_header_logo.png
R
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/public/images/login/login_page_header_title.png
M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
A
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java
D
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/defines.css
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/SystemModule.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java
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/main/presenter/HeaderPresenterWidget.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AboutPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AboutPopupView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java
R
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/public/images/login/login_page_header_title.png
M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
M ovirt-engine.spec.in
A packaging/branding/ovirt.brand/branding.properties
A packaging/branding/ovirt.brand/gwt_common.css
R packaging/branding/ovirt.brand/images/bg_head.gif
R packaging/branding/ovirt.brand/images/dialog/blank.png
R packaging/branding/ovirt.brand/images/dialog/dialog_header_image.png
R packaging/branding/ovirt.brand/images/dialog/error.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_B.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_BL.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_BR.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_L.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_R.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_T.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_TL.png
R packaging/branding/ovirt.brand/images/dialog/panel_edge_TR.png
R packaging/branding/ovirt.brand/images/dialog_header_background_repetitive.png
R packaging/branding/ovirt.brand/images/header_background.png
R packaging/branding/ovirt.brand/images/header_background_repetitive.png
R packaging/branding/ovirt.brand/images/login/login_page_header_image.png
R packaging/branding/ovirt.brand/images/login/login_page_header_logo.png
R packaging/branding/ovirt.brand/images/login_header_background_repetitive.png
R packaging/branding/ovirt.brand/images/logo.png
R packaging/branding/ovirt.brand/images/user_portal_logo.gif
A packaging/branding/ovirt.brand/ovirt_common.css
A packaging/branding/ovirt.brand/ovirt_messages.properties
A packaging/branding/ovirt.brand/ovirt_messages_de_DE.properties
A packaging/branding/ovirt.brand/ovirt_messages_es_ES.properties
A packaging/branding/ovirt.brand/ovirt_messages_fr_FR.properties
A packaging/branding/ovirt.brand/ovirt_messages_ja_JP.properties
A packaging/branding/ovirt.brand/ovirt_messages_pt_BR.properties
A packaging/branding/ovirt.brand/ovirt_messages_zh_CN.properties
A packaging/branding/ovirt.brand/ovirt_user_portal.css
A packaging/branding/ovirt.brand/ovirt_web_admin.css
112 files changed, 2,297 insertions(+), 761 deletions(-)
Approvals:
Vojtech Szocs: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/13181
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a8a426ce7d688d33c5ae2b70632c836843106b2
Gerrit-PatchSet: 24
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Moran Goldboim <mgoldboi(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server