java/code/webapp/WEB-INF/includes/footer.jsp | 6 ++--
java/code/webapp/WEB-INF/includes/header.jsp | 5 +++
java/code/webapp/WEB-INF/pages/common/login.jsp | 20 +++++++++-----
java/code/webapp/WEB-INF/pages/common/relogin.jsp | 31 ++++++++++++++--------
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
rel-eng/packages/spacewalk-web | 2 -
web/conf/rhn_web.conf | 10 +++++++
web/spacewalk-web.spec | 6 +++-
9 files changed, 64 insertions(+), 24 deletions(-)
New commits:
commit 674ff02e991ec2f1ba2511bbb23ea0b38cf812dc
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 18:29:24 2011 -0400
Automatic commit of package [spacewalk-web] release [1.6.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 2e343f6..366d1f2 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.7-1 web/
+1.6.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index cbe6425..1f82ed5 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.7
+Version: 1.6.8
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.8-1
+- add support for custom messages in the header, footer and login pages
+ (aparsons(a)redhat.com)
+
* Fri Jul 29 2011 Miroslav Suchý 1.6.7-1
- Revert "adding tomcat require to spacewalk-base-minimal"
commit 28a804be07f49707378a1edeb81bd63f65b6e2ce
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 18:29:12 2011 -0400
Automatic commit of package [spacewalk-java] release [1.6.14-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f51f716..95f9566 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.13
+Version: 1.6.14
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.14-1
+- add support for custom messages in the header, footer and login pages
+ (aparsons(a)redhat.com)
+
* Thu Aug 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.13-1
- remove unused ChannelEditor method (tlestach(a)redhat.com)
- remove unused OvalServlet method (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f478fe0..673583f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.13-1 java/
+1.6.14-1 java/
commit b9a0b5d94bf9b5c14cd84822f3c502c2204f515d
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 18:28:16 2011 -0400
add support for custom messages in the header, footer and login pages
the following variables can be configured in /etc/rhn/rhn.conf:
web.custom_header
web.custom_footer
web.login_banner
Long lines can be wrapped using \ to break the lines and HTML is OK
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp
b/java/code/webapp/WEB-INF/includes/footer.jsp
index cb2cac7..a94a925 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -9,8 +9,10 @@
: <a
href="http://www.redhat.com/">redhat.com</a>
<div style="color: black"><bean:message
key="footer.jsp.release" arg0="/rhn/help/dispatcher/release_notes"
arg1="${rhn:getConfig('web.version')}" /></div>
<p><%@ include
file="/WEB-INF/pages/common/fragments/bugzilla.jspf" %></p>
-
-
+ <c:set var="custom_footer" scope="page"
value="${rhn:getConfig('web.custom_footer')}" />
+ <c:if test="${! empty custom_footer}">
+ <p><c:out value="${custom_footer}"
escapeXml="false"/></p>
+ </c:if>
</div>
<%--
Render Javascript here so we can be sure that all of
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index 8cac47c..24a4e25 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -4,6 +4,11 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<!-- header.jsp -->
+<c:set var="custom_header" scope="page"
value="${rhn:getConfig('web.custom_header')}" />
+<c:if test="${! empty custom_header}">
+ <center><p><c:out value="${custom_header}"
escapeXml="false"/></p></center>
+</c:if>
+
<rhn:require acl="user_authenticated()">
<div id="utility">
<div id="utilityLinks">
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp
b/java/code/webapp/WEB-INF/pages/common/login.jsp
index cd7ea40..21e36aa 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -26,14 +26,20 @@
</c:if>
<div id="contentRight">
- <h1 id="rhn_welcome3"><span><bean:message
key="login.jsp.welcomemessage"/></span></h1>
-
- <p><bean:message key="login.jsp.satbody1"/></p>
- <p><bean:message key="login.jsp.satbody2"/></p>
- <p><bean:message key="login.jsp.satbody3"/></p>
- <p><bean:message key="login.jsp.satbody4"/></p>
-
+ <c:set var="login_banner" scope="page"
value="${rhn:getConfig('web.login_banner')}" />
+ <c:choose>
+ <c:when test="${! empty login_banner}">
+ <p><c:out value="${login_banner}"
escapeXml="false"/></p>
+ </c:when>
+ <c:otherwise>
+ <h1 id="rhn_welcome3"><span><bean:message
key="login.jsp.welcomemessage"/></span></h1>
+ <p><bean:message key="login.jsp.satbody1"/></p>
+ <p><bean:message key="login.jsp.satbody2"/></p>
+ <p><bean:message key="login.jsp.satbody3"/></p>
+ <p><bean:message key="login.jsp.satbody4"/></p>
+ </c:otherwise>
+ </c:choose>
</div> <!-- end contentRight -->
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index a0aa272..bd69089 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -13,17 +13,26 @@
<c:if test="${requestScope.hasExpired != 'true'}">
<h1><bean:message key="relogin.jsp.pleasesignin"/></h1>
- <div class="clearBox">
- <div class="clearBoxInner">
- <div class="clearBoxBody">
- <html:form action="/ReLoginSubmit">
- <rhn:csrf />
- <%@ include file="/WEB-INF/pages/common/fragments/login_form.jspf"
%>
- <html:hidden property="url_bounce" />
- </html:form>
- </div><!-- end clearBoxBody -->
- </div><!-- end clearBoxInner -->
- </div><!-- end clearBox -->
+ <div id="contentLeft">
+ <div class="clearBox">
+ <div class="clearBoxInner">
+ <div class="clearBoxBody">
+ <html:form action="/ReLoginSubmit">
+ <rhn:csrf />
+ <%@ include file="/WEB-INF/pages/common/fragments/login_form.jspf"
%>
+ <html:hidden property="url_bounce" />
+ </html:form>
+ </div><!-- end clearBoxBody -->
+ </div><!-- end clearBoxInner -->
+ </div><!-- end clearBox -->
+ </div> <!-- end contentLeft -->
+
+ <div id="contentRight">
+ <c:set var="login_banner" scope="page"
value="${rhn:getConfig('web.login_banner')}" />
+ <c:if test="${! empty login_banner}">
+ <p><c:out value="${login_banner}"
escapeXml="false"/></p>
+ </c:if>
+ </div> <!-- end contentRight -->
</c:if>
</rhn:require>
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 6d4af4e..c62bc68 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -322,3 +322,13 @@ web.non_expirable_package_urls =
# allow users to chat with spacewalk members on IRC via the web
web.chat_enabled = 0
+
+# text to be displayed in the header of every page
+web.custom_header =
+
+# text to be displayed in the footer of every page
+web.custom_footer =
+
+# text to be displayed on the login page
+# (join long lines with \, HTML is okay to use)
+web.login_banner =