3:41 p.m.
Vojtech Szocs has submitted this change and it was merged.
Change subject: core: i18n welcome page with branding
......................................................................
core: i18n welcome page with branding
- Updated welcome page to take branding into account.
- Added ability to add multiple sections with links.
- Updated styles to take branding into account.
- Created new resource bundle for welcome page based on
branding manager.
- Added new application type to BrandingTheme, 'welcome'
- Added ability to put header text at top of welcome page.
Change-Id: I9987ed58c2e0ead9b25c5f46fb974a96bfd46d30
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=838456
Signed-off-by: Alexander Wels <awels(a)redhat.com>
---
M README.branding
M backend/manager/modules/root/pom.xml
D backend/manager/modules/root/src/main/java/org/ovirt/engine/core/SplashServlet.java
A backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
D
backend/manager/modules/root/src/main/resources/org/ovirt/engine/core/messages.properties
M backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
R
backend/manager/modules/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java
R
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingServlet.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingTheme.java
A
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingWelcomeResourceBundle.java
R
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/branding/BrandingServletTest.java
M frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml
M packaging/branding/ovirt.brand/branding.properties
R packaging/branding/ovirt.brand/images/triangle_down_gray.gif
R packaging/branding/ovirt.brand/images/welcome/bg_head.gif
R packaging/branding/ovirt.brand/images/welcome/bg_main.gif
R packaging/branding/ovirt.brand/images/welcome/logo.png
M packaging/branding/ovirt.brand/messages.properties
A packaging/branding/ovirt.brand/welcome_page.template
R packaging/branding/ovirt.brand/welcome_style.css
22 files changed, 411 insertions(+), 112 deletions(-)
Approvals:
Vojtech Szocs: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/16359
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9987ed58c2e0ead9b25c5f46fb974a96bfd46d30
Gerrit-PatchSet: 9
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server