From 458e11fd3315b1a5c1c62be2ef02e7b187a7357f Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 9 Dec 2010 14:02:45 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1043969 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-configuration/pom.xml | 2 +- .../src/main/mdo/configuration.mdo | 6 +++ .../WEB-INF/jsp/components/companyLogo.jsp | 5 +++ .../webapp/WEB-INF/jsp/decorators/default.jsp | 37 ++++++++++++------ .../src/main/webapp/css/maven-base.css | 1 + .../src/main/webapp/images/19Sep-logo.png | Bin 0 -> 13065 bytes .../src/main/webapp/images/19Sep.png | Bin 0 -> 109893 bytes 7 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/19Sep-logo.png create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/19Sep.png diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index ee8903172..d59a883e1 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -95,7 +95,7 @@ - 1.2.0 + 1.3.0 src/main/mdo/configuration.mdo diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo index 717721c91..bf7c0f7dc 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo @@ -1135,6 +1135,12 @@ boolean true + + disableEasterEggs + 1.3.0+ + boolean + false + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp index 9eb2864ce..23fae758a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp @@ -40,7 +40,12 @@ + + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp index 60fce63e0..92c7b8841 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -44,7 +44,31 @@ -" 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" ); + } +%> + + + + + +" class="composite" + + style="background: url('') no-repeat bottom right" + +>