Author: gmcdonald
Date: Sat May 23 12:05:00 2009
New Revision: 777898
URL: http://svn.apache.org/viewvc?rev=777898&view=rev
Log:
Enable use of <msg> for trademark statement and tidy. FOR-1170
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft?rev=777898&r1=777897&r2=777898&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft
Sat May 23 12:05:00 2009
@@ -43,6 +43,7 @@
xmlns:java="http://xml.apache.org/xslt/java";
exclude-result-prefixes="java">
<xsl:param name="siteinfo-copyright"/>
+ <xsl:param name="use-br">false</xsl:param>
<xsl:template match="/">
<forrest:content>
<forrest:part>
@@ -65,6 +66,9 @@
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text>
+ <xsl:if test="$use-br='true'">
+ <br />
+ </xsl:if>
<xsl:value-of select="$siteinfo-copyright/copyright/msg"/>
</forrest:part>
</forrest:content>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css?rev=777898&r1=777897&r2=777898&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
Sat May 23 12:05:00 2009
@@ -540,7 +540,7 @@
position: relative; /* IE bugfix cont'd */
padding: 5px;
margin: 0;
- width: 75%;
+ width: 55%;
}
#footer .lastmodified {
position: relative; /* IE bugfix cont'd */
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml?rev=777898&r1=777897&r2=777898&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
Sat May 23 12:05:00 2009
@@ -23,11 +23,14 @@
</forrest:hook>
<forrest:hook class="copyright">
<forrest:contract name="siteinfo-copyright">
+ <forrest:property name="use-br">true</forrest:property>
<forrest:property name="siteinfo-copyright">
<copyright>
<year inception="true">2002</year>
- <vendor>The Example Organisation.</vendor>
- <copyright-link>http://example.org</copyright-link>
+ <vendor>The Example Organisation. Licensed under Apache Licence
2.0</vendor>
+ <copyright-link>http://example.org</copyright-link>
+ <msg>The names "Apache" and "Apache Forrest" and the Apache feather
logo are
+ trademarks of The Apache Software Foundation.</msg>
</copyright>
</forrest:property>
</forrest:contract>
