You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cd...@apache.org on 2005/10/12 14:27:24 UTC
svn commit: r314858 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources:
skin/css/pelt/pelt.basic.css skin/css/pelt/pelt.screen.css
templates/siteinfo-copyright.ft
Author: cdupoirieux
Date: Wed Oct 12 05:27:10 2005
New Revision: 314858
URL: http://svn.apache.org/viewcvs?rev=314858&view=rev
Log:
Add some flexibility to the siteinfo-copyright (+ some css corrections for pelt).
The copyright has the following form :
<copyright>
<year [inception="[true|false]"]>2002</year>
<vendor>The Acme Software Foundation.</vendor>
[<copyright-link>http://...</copyright-link>]
[<msg>All rights reserved.</msg>]
</copyright>
Inception attribute of year tag allows to generate copyright date such as 2002-2005 (if year=2002).
The tag msg is added at the end of the copyright :
Copyright 2002-2005 The Acme Software Foundation. All rights reserved.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.basic.css
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.screen.css
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/siteinfo-copyright.ft
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.basic.css?rev=314858&r1=314857&r2=314858&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.basic.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.basic.css Wed Oct 12 05:27:10 2005
@@ -67,7 +67,7 @@
.fixme .label {
background: #C6C600;
}
-note, .warning, .fixme {
+.note, .warning, .fixme {
border: solid black 1px;
margin: 1em 3em;
}
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.screen.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.screen.css?rev=314858&r1=314857&r2=314858&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.screen.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/skin/css/pelt/pelt.screen.css Wed Oct 12 05:27:10 2005
@@ -97,23 +97,13 @@
background: url("images/header_white_line.gif") repeat-x bottom;
}
-/* branding-grouplogo Template */
-#header #grouplogo {
+/* branding-logo Template */
+#header #logo {
padding: 7px 0px 10px 10px;
float: left;
text-align: left;
}
-/* branding-projectlogo Template */
-#header #projectlogo {
- padding: 7px 20px 10px 0px;
- float: right;
- text-align: right;
-}
-#container .projectlogoA1 {
- padding: 7px 0 10px 10px;
- float: right;
-}
#header .searchbox {
position: absolute;
margin: 0;
@@ -437,7 +427,7 @@
margin: 0;
width: 45%;
}
-#footer a { color: white; }
+#footer a { color: brown; }
#footer #logos {
text-align: left;
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/siteinfo-copyright.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/siteinfo-copyright.ft?rev=314858&r1=314857&r2=314858&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/siteinfo-copyright.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/siteinfo-copyright.ft Wed Oct 12 05:27:10 2005
@@ -25,8 +25,10 @@
<forrest:properties contract="siteinfo-copyright">
<forrest:property name="siteinfo-copyright">
<copyright>
- <year>2005</year>
+ <year [inception="[true|false]"]>2005</year>
<vendor>The Acme Software Foundation.</vendor>
+ [<copyright-link>http://...</copyright-link>]
+ [<msg>All rights reserved.</msg>]
</copyright>
</forrest:property>
</forrest:properties>
@@ -36,12 +38,17 @@
name="siteinfo-copyright" inputFormat="xsl" body="true" head="false">
<xsl:stylesheet version="1.1"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:java="http://xml.apache.org/xslt/java"
+ exclude-result-prefixes="java">
<xsl:template name="siteinfo-copyright-body">
<xsl:param name="siteinfo-copyright"/>
Copyright ©
<xsl:text> </xsl:text>
- <xsl:value-of select="$siteinfo-copyright/copyright/year"/>
+ <xsl:value-of select="$siteinfo-copyright/copyright/year"/>
+ <xsl:call-template name="current-year">
+ <xsl:with-param name="copyrightyear" select="$siteinfo-copyright/copyright/year"/>
+ </xsl:call-template>
<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="$siteinfo-copyright/copyright/copyright-link">
@@ -56,7 +63,40 @@
<xsl:value-of select="$siteinfo-copyright/copyright/vendor"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$siteinfo-copyright/copyright/msg"/>
+ </xsl:template>
+
+ <xsl:template name="current-year">
+ <!-- Displays the current year after the inception year (in the copyright i.e: 2002-2005)
+ - the copyright year (2005 by default) can be indicated in the copyrightyear parameter,
+ - the year format (yyyy by default) can be indicated in the dateformat parameter,
+ - the dates separator (- by default) can be indicated in the dateseparator parameter.
+ For instance the following call will format the year on 2 digits and separates the dates
+ with /
+ (copyright 02/05)
+ <xsl:call-template name="current-year">
+ <xsl:with-param name="copyrightyear" select="'02'"/>
+ <xsl:with-param name="dateformat" select="'yy'"/>
+ <xsl:with-param name="dateseparator" select="'/'"/>
+ </xsl:call-template>
+ Warning, to enable inception year, inception attribute must be set to "true" in copyright/year/@inception
+ -->
+ <xsl:param name="copyrightyear">2005</xsl:param>
+ <xsl:param name="dateformat">yyyy</xsl:param>
+ <xsl:param name="dateseparator">-</xsl:param>
+ <xsl:if test="$copyrightyear[@inception = 'true']">
+ <xsl:variable name="tz" select='java:java.util.SimpleTimeZone.new(0,"GMT+00:00")' />
+ <xsl:variable name="formatter" select="java:java.text.SimpleDateFormat.new($dateformat)"/>
+ <xsl:variable name="settz" select="java:setTimeZone($formatter, $tz)" />
+ <xsl:variable name="date" select="java:java.util.Date.new()"/>
+ <xsl:variable name="year" select="java:format($formatter, $date)"/>
+
+ <xsl:if test="$copyrightyear != $year">
+ <xsl:value-of select="$dateseparator"/><xsl:value-of select="$year"/>
+ </xsl:if>
+ </xsl:if>
</xsl:template>
</xsl:stylesheet>
- </forrest:template >
+ </forrest:template>
</forrest:contract>