Alexander Wels has uploaded a new change for review.
Change subject: branding: Do not require style sheet files
......................................................................
branding: Do not require style sheet files
- Removed requirement that style sheet files must be defined in
branding.properties.
Change-Id: I6e2b60060557ce15b255d5f30b216d5715b3d095
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M README.branding
M
backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag
M packaging/branding/ovirt.brand/branding.properties
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/21239/1
diff --git a/README.branding b/README.branding
index 80fa3eb..56cf8f5 100644
--- a/README.branding
+++ b/README.branding
@@ -16,9 +16,9 @@
This is the main properties file that defines where the branding
resources can be found. Resources are relative to branding.properties.
- user_portal_css - Css to inject into user portal (required, can be empty).
- web_admin_css - Css to inject into web admin (required, can be empty).
- welcome_css - Css for the welcome page (required, can be empty).
+ user_portal_css - Css to inject into user portal (optional).
+ web_admin_css - Css to inject into web admin (optional).
+ welcome_css - Css for the welcome page (optional).
messages - Standard java message bundle (required). Comma-delimited list.
resources - The file that defines cascading resources. These are static
resources (favicon, images, PDFs, etc.) that exist outside of CSS,
diff --git
a/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag
b/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag
index 6e03ba4..1d81037 100644
---
a/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag
+++
b/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag
@@ -3,7 +3,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<c:if test="${requestScope['brandingStyle'] != null}">
<c:forEach items="${requestScope['brandingStyle']}" var="theme">
- <c:if test="${initParam['obrandApplicationName'] != null }">
+ <c:if test="${initParam['obrandApplicationName'] != null &&
theme.getThemeStyleSheet(initParam['obrandApplicationName']) != null}">
<!-- for actual servlets that have to set the request attribe -->
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}${initParam['obrandThemePath']}${theme.path}/${theme.getThemeStyleSheet(initParam['obrandApplicationName'])}">
</c:if>
diff --git a/packaging/branding/ovirt.brand/branding.properties
b/packaging/branding/ovirt.brand/branding.properties
index 1fc7561..1174161 100644
--- a/packaging/branding/ovirt.brand/branding.properties
+++ b/packaging/branding/ovirt.brand/branding.properties
@@ -9,7 +9,7 @@
# The version allows you to have multiple version of a theme in your
# branding path while only loading the one that the engine can use.
-# style sheets. (required, but the files can be empty)
+# style sheets. Optional in case you don't want to override styles.
# Make sure everything before _css matches the application type.
userportal_css=user_portal.css
webadmin_css=web_admin.css
--
To view, visit http://gerrit.ovirt.org/21239
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e2b60060557ce15b255d5f30b216d5715b3d095
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
