Author: brett
Date: Thu Dec 9 14:02:45 2010
New Revision: 1043969
URL: http://svn.apache.org/viewvc?rev=1043969&view=rev
Log:
correctly acknowledge September 19
Image is derived from
http://commons.wikimedia.org/wiki/File:Piratey,_vector_version.svg, which is in
the public domain
Merged from: r1043948
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/19Sep-logo.png
- copied unchanged from r1043948,
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/19Sep-logo.png
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/19Sep.png
- copied unchanged from r1043948,
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/19Sep.png
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1043969&r1=1043968&r2=1043969&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
Thu Dec 9 14:02:45 2010
@@ -95,7 +95,7 @@
</execution>
</executions>
<configuration>
- <version>1.2.0</version>
+ <version>1.3.0</version>
<models>
<model>src/main/mdo/configuration.mdo</model>
</models>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1043969&r1=1043968&r2=1043969&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Thu Dec 9 14:02:45 2010
@@ -1135,6 +1135,12 @@
<type>boolean</type>
<defaultValue>true</defaultValue>
</field>
+ <field>
+ <name>disableEasterEggs</name>
+ <version>1.3.0+</version>
+ <type>boolean</type>
+ <defaultValue>false</defaultValue>
+ </field>
</fields>
</class>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=1043969&r1=1043968&r2=1043969&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Thu Dec 9 14:02:45 2010
@@ -40,7 +40,12 @@
</c:when>
<c:otherwise>
<my:currentWWUrl action="index" namespace="/">
+ <c:if test="${is19Sep}">
+ <img src="<c:url value='/images/19Sep-logo.png' />"/>
+ </c:if>
+ <c:if test="${!is19Sep}">
<img src="<c:url value='/images/archiva.png' />"/>
+ </c:if>
</my:currentWWUrl>
</c:otherwise>
</c:choose>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=1043969&r1=1043968&r2=1043969&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Thu Dec 9 14:02:45 2010
@@ -44,7 +44,31 @@
<decorator:head />
</head>
-<body onload="<decorator:getProperty property="body.onload" />"
class="composite">
+<%
+ int inceptionYear = 2005;
+ Calendar cal = Calendar.getInstance();
+ int currentYear = cal.get( Calendar.YEAR );
+ String copyrightRange = String.valueOf( inceptionYear );
+ if ( inceptionYear != currentYear )
+ {
+ copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
+ }
+
+ if ( cal.get( Calendar.MONTH ) == Calendar.SEPTEMBER && cal.get(
Calendar.DAY_OF_MONTH ) == 19 )
+ {
+ request.setAttribute( "is19Sep", "true" );
+ }
+%>
+
+<s:if test="%{#application['uiOptions'].disableEasterEggs}">
+ <c:remove var="is19Sep" scope="request" />
+</s:if>
+
+<body onload="<decorator:getProperty property="body.onload" />"
class="composite"
+ <c:if test="${is19Sep}">
+ style="background: url('<c:url value="/images/19Sep.png"/>') no-repeat
bottom right"
+ </c:if>
+>
<div id="breadcrumbs">
<div class="xright">
<%@ include file="/WEB-INF/jsp/redback/include/securityLinks.jsp" %>
@@ -170,18 +194,9 @@
<hr/>
</div>
-<%
- int inceptionYear = 2005;
- int currentYear = Calendar.getInstance().get( Calendar.YEAR );
- String copyrightRange = String.valueOf( inceptionYear );
- if ( inceptionYear != currentYear )
- {
- copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
- }
-%>
<div id="footer">
<div class="xleft">
- <a target="_blank" href="http://archiva.apache.org/";>Apache Archiva <%=
ArchivaVersion.getVersion()%></a>
+ <a target="_blank" href="http://archiva.apache.org/";>Apache Ar<c:if
test="${is19Sep}">rr</c:if>chiva <%= ArchivaVersion.getVersion()%></a>
</div>
<div class="xright">
Copyright © <%= copyrightRange%> <a target="_blank"
href="http://www.apache.org/";>The Apache Software Foundation</a>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css?rev=1043969&r1=1043968&r2=1043969&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
Thu Dec 9 14:02:45 2010
@@ -93,6 +93,7 @@ div.clear hr {
#bodyColumn {
margin-right: 1.5em;
margin-left: 197px;
+ min-height: 575px
}
#legend {
