Author: crossley
Date: Mon Dec 5 22:28:40 2005
New Revision: 354335
URL: http://svn.apache.org/viewcvs?rev=354335&view=rev
Log:
New skinconf parameter "disable-copyright-footer" (default=false)
to not show the copyright notice in html page footer.
Modified:
forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml
forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml
forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml
forrest/trunk/main/template-sites/v2/src/documentation/skinconf.xml
forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v07-1.dtd
forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/skinconf.xml?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/skinconf.xml Mon Dec 5
22:28:40 2005
@@ -91,6 +91,7 @@
<favicon-url></favicon-url>
<!-- The following are used to construct a copyright statement -->
+ <disable-copyright-footer>false</disable-copyright-footer>
<year>2005</year>
<vendor>The Acme Software Foundation.</vendor>
<!-- The optional copyright-link URL will be used as a link in the
Modified: forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml
(original)
+++ forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml Mon
Dec 5 22:28:40 2005
@@ -91,6 +91,7 @@
<favicon-url></favicon-url>
<!-- The following are used to construct a copyright statement -->
+ <disable-copyright-footer>false</disable-copyright-footer>
<year>2005</year>
<vendor>The Acme Software Foundation.</vendor>
<!-- The optional copyright-link URL will be used as a link in the
Modified:
forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml
(original)
+++ forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml
Mon Dec 5 22:28:40 2005
@@ -91,6 +91,7 @@
<favicon-url></favicon-url>
<!-- The following are used to construct a copyright statement -->
+ <disable-copyright-footer>false</disable-copyright-footer>
<year>2005</year>
<vendor>The Acme Software Foundation.</vendor>
<!-- The optional copyright-link URL will be used as a link in the
Modified:
forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml
(original)
+++ forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml
Mon Dec 5 22:28:40 2005
@@ -91,6 +91,7 @@
<favicon-url></favicon-url>
<!-- The following are used to construct a copyright statement -->
+ <disable-copyright-footer>false</disable-copyright-footer>
<year>2005</year>
<vendor>@copyright.owner@</vendor>
<!-- The optional copyright-link URL will be used as a link in the
Modified: forrest/trunk/main/template-sites/v2/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/src/documentation/skinconf.xml?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/skinconf.xml
(original)
+++ forrest/trunk/main/template-sites/v2/src/documentation/skinconf.xml Mon Dec
5 22:28:40 2005
@@ -91,6 +91,7 @@
<favicon-url></favicon-url>
<!-- The following are used to construct a copyright statement -->
+ <disable-copyright-footer>false</disable-copyright-footer>
<year>2005</year>
<vendor>The Acme Software Foundation.</vendor>
<!-- The optional copyright-link URL will be used as a link in the
Modified: forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v07-1.dtd
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v07-1.dtd?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v07-1.dtd
(original)
+++ forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v07-1.dtd Mon Dec
5 22:28:40 2005
@@ -51,8 +51,9 @@
disable-font-script?,
project-name?, project-description?, project-url?, project-logo,
group-name?, group-description?, group-url?, group-logo?,
- host-url?, host-logo?, favicon-url?, year?, vendor?, copyright-link?,
trail?,
- toc?, headings?, feedback?, motd?,
+ host-url?, host-logo?, favicon-url?,
+ disable-copyright-footer?, year?, vendor?, copyright-link?,
+ trail?, toc?, headings?, feedback?, motd?,
extra-css?, colors?, pdf?, credits?)>
<!ELEMENT search EMPTY>
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Mon Dec 5
22:28:40 2005
@@ -293,6 +293,7 @@
+</xsl:comment>
<div class="lastmodified"><xsl:call-template name="last-published"/> </div>
+ <xsl:if test="not($config/disable-copyright-footer = 'true')">
<div class="copyright">
Copyright ©
<xsl:text> </xsl:text>
@@ -312,6 +313,7 @@
</xsl:otherwise>
</xsl:choose>
</div>
+ </xsl:if>
<xsl:if test="$filename = 'index.html'">
<div id="logos" >
Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl Mon Dec
5 22:28:40 2005
@@ -293,6 +293,7 @@
+</xsl:comment>
<div class="lastmodified"><xsl:call-template name="last-published"/> </div>
+ <xsl:if test="not($config/disable-copyright-footer = 'true')">
<div class="copyright">
Copyright ©
<xsl:text> </xsl:text>
@@ -312,6 +313,7 @@
</xsl:otherwise>
</xsl:choose>
</div>
+ </xsl:if>
<xsl:if test="$filename = 'index.html'">
<div id="logos" >
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=354335&r1=354334&r2=354335&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Mon Dec 5 22:28:40 2005
@@ -130,6 +130,11 @@
Added document to facilitate
<link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
</action>
+
+ <action dev="DC" type="update" context="code">
+ New skinconf parameter "disable-copyright-footer" (default=false)
+ to not show the copyright notice in html page footer.
+ </action>
<action dev="FSO" type="update" context="code">
Changed handling of table elements with class-attributes in source: