Author: crossley
Date: Thu May 21 06:56:30 2009
New Revision: 776976
URL: http://svn.apache.org/viewvc?rev=776976&view=rev
Log:
Added the ability for a "trademark statement" at bottom of all pages.
Issue: FOR-1170
Modified:
forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd
forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
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/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
forrest/trunk/site-author/skinconf.xml
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/skinconf.xml?rev=776976&r1=776975&r2=776976&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/skinconf.xml Thu May 21
06:56:30 2009
@@ -86,6 +86,11 @@
<!-- The optional copyright-link URL will be used as a link in the
copyright statement -->
<copyright-link>http://www.example.org/</copyright-link>
+<!-- Optional text trademark statement below the copyright statement -->
+ <trademark-statement>
+ The names "Apache" and "Apache Forrest" and the Apache feather are
+ trademarks of The Apache Software Foundation.
+ </trademark-statement>
<!-- Some skins use this to form a 'breadcrumb trail' of links.
Use location="alt" to move the trail to an alternate location
(if the skin supports it).
Modified: forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd?rev=776976&r1=776975&r2=776976&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd
(original)
+++ forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd Thu May
21 06:56:30 2009
@@ -54,7 +54,7 @@
project-name?, project-description?, project-url?, project-logo,
group-name?, group-description?, group-url?, group-logo?,
host-url?, host-logo?, favicon-url?,
- disable-copyright-footer?, year?, vendor?, copyright-link?,
+ disable-copyright-footer?, year?, vendor?, copyright-link?,
trademark-statement?,
trail?, toc?, headings?, feedback?, motd?,
extra-css?, colors?, pdf?, credits?)>
@@ -89,6 +89,7 @@
<!ATTLIST year inception CDATA #IMPLIED>
<!ELEMENT vendor (#PCDATA)>
<!ELEMENT copyright-link (#PCDATA)>
+ <!ELEMENT trademark-statement (#PCDATA)>
<!ELEMENT trail (link1, link2, link3)>
<!ATTLIST trail location CDATA #IMPLIED>
<!ELEMENT link1 EMPTY>
Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl?rev=776976&r1=776975&r2=776976&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl Thu May 21
06:56:30 2009
@@ -276,6 +276,10 @@
<xsl:value-of select="$config/vendor"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:if test="$config/trademark-statement">
+ <br />
+ <xsl:value-of select="$config/trademark-statement"/>
+ </xsl:if>
</div>
</xsl:if>
<xsl:if test="$filename = 'index.html'">
Modified: forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl?rev=776976&r1=776975&r2=776976&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl Thu May
21 06:56:30 2009
@@ -148,6 +148,10 @@
</xsl:otherwise>
</xsl:choose>
All rights reserved.
+ <xsl:if test="$config/trademark-statement">
+ <br />
+ <xsl:value-of select="$config/trademark-statement"/>
+ </xsl:if>
<script language="JavaScript" type="text/javascript"><![CDATA[<!--
document.write(" - "+"Last Published: " + document.lastModified);
// -->]]></script>
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?rev=776976&r1=776975&r2=776976&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 Thu May 21
06:56:30 2009
@@ -322,6 +322,10 @@
<xsl:value-of select="$config/vendor"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:if test="$config/trademark-statement">
+ <br />
+ <xsl:value-of select="$config/trademark-statement"/>
+ </xsl:if>
</div>
</xsl:if>
<xsl:if test="$filename = 'index.html'">
Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl?rev=776976&r1=776975&r2=776976&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 Thu May
21 06:56:30 2009
@@ -319,6 +319,10 @@
<xsl:value-of select="$config/vendor"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:if test="$config/trademark-statement">
+ <br />
+ <xsl:value-of select="$config/trademark-statement"/>
+ </xsl:if>
</div>
</xsl:if>
<xsl:if test="$filename = 'index.html'">
Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl?rev=776976&r1=776975&r2=776976&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl Thu May
21 06:56:30 2009
@@ -437,6 +437,10 @@
</xsl:otherwise>
</xsl:choose>
All rights reserved.
+ <xsl:if test="$config/trademark-statement">
+ <br />
+ <xsl:value-of select="$config/trademark-statement"/>
+ </xsl:if>
<br/>
<script language="JavaScript" type="text/javascript"><