Author: gmcdonald
Date: Sat Jun 5 01:26:33 2010
New Revision: 951631
URL: http://svn.apache.org/viewvc?rev=951631&view=rev
Log:
Add separate trademark statement contract.
Add that contract as an example to the pelt theme footer panel.
Add CSS for trademark class.
Edit CSS for copyright contract to look similar to pelt skin.
Fix for FOR-1170
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-trademark.contract.xml
(with props)
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-trademark.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-trademark.contract.xml?rev=951631&view=auto
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-trademark.contract.xml
(added)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-trademark.contract.xml
Sat Jun 5 01:26:33 2010
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0";
+name="siteinfo-trademark">
+ <description>
+ <p>
+ <strong>siteinfo-trademark</strong>
+ <br />The following properties are used to construct a trademark
+ statement.</p>
+ </description>
+ <usage>
+ <![CDATA[<forrest:contract name="siteinfo-trademark">
+ <forrest:property name="siteinfo-trademark">
+ <trademark>
+ <msg>Your trademark statement goes here</msg>
+ </trademark>
+ </forrest:property>
+</forrest:contract>]]>
+</usage>
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
+ name="siteinfo-copyright" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:java="http://xml.apache.org/xslt/java";
+ exclude-result-prefixes="java">
+ <xsl:param name="siteinfo-trademark" />
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:value-of select="$siteinfo-trademark/trademark/msg" />
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
+ </xsl:stylesheet>
+ </forrest:template>
+</forrest:contract>
Propchange:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-trademark.contract.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css?rev=951631&r1=951630&r2=951631&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
Sat Jun 5 01:26:33 2010
@@ -536,10 +536,15 @@ img.cornersmall {
}
#footer .copyright {
position: relative; /* IE bugfix cont'd */
- padding: 5px;
+ padding: 5px 0px 2px 5px;
margin: 0;
width: 75%;
}
+#footer .trademark {
+ position: relative;
+ padding: 0px 0px 5px 5px;
+ margin:0;
+}
#footer .lastmodified {
position: relative; /* IE bugfix cont'd */
float: right;
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml?rev=951631&r1=951630&r2=951631&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
Sat Jun 5 01:26:33 2010
@@ -32,6 +32,15 @@ xmlns:jx="http://apache.org/cocoon/templ
</forrest:property>
</forrest:contract>
</forrest:hook>
+ <forrest:hook class="trademark">
+ <forrest:contract name="siteinfo-trademark">
+ <forrest:property name="siteinfo-trademark">
+ <trademark>
+ <msg>Apache, Apache Forrest, the Apache feather logo, and the
Apache Forrest logos are trademarks of The Apache Software Foundation.</msg>
+ </trademark>
+ </forrest:property>
+ </forrest:contract>
+ </forrest:hook>
<forrest:contract name="siteinfo-compliance-links" />
<forrest:contract name="siteinfo-credits">
<forrest:property name="box-location">credit</forrest:property>
