Author: cdupoirieux
Date: Mon Jan 16 07:47:15 2006
New Revision: 369499
URL: http://svn.apache.org/viewcvs?rev=369499&view=rev
Log:
siteinfo-compliance-links.ft migration (FOR-787)
Added:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-compliance-links.ft
- copied, changed from r369411,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-compliance-links.ft
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-compliance-links.ft
(from r369411,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-compliance-links.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-compliance-links.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-compliance-links.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-compliance-links.ft&r1=369411&r2=369499&rev=369499&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-compliance-links.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-compliance-links.ft
Mon Jan 16 07:47:15 2006
@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2002-2005 The Apache Software Foundation or its licensors,
-as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
-Licensed 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.
+ Licensed 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-compliance-links" type="nugget">
- <description>
- Display valid XHTML and CSS compliance links
- </description>
- <usage><![CDATA[<forrest:contract
name="siteinfo-compliance-links"/>]]></usage>
- <forrest:template
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
- xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="siteinfo-compliance-links" inputFormat="xsl"
body="true" head="false">
- <xsl:stylesheet version="1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="siteinfo-compliance-links-body">
- <div id="siteinfo-compliance-links">
- <a href="http://validator.w3.org/check?uri=referer";><img
- src="http://www.w3.org/Icons/valid-xhtml10";
- alt="Valid XHTML 1.0!" height="31" width="88" />
- </a>
- <a href="http://jigsaw.w3.org/css-validator/check/referer";>
- <img style="border:0;width:88px;height:31px"
-
src="http://jigsaw.w3.org/css-validator/images/vcss";
- alt="Valid CSS!"/>
- </a>
- </div>
- </xsl:template>
- </xsl:stylesheet>
- </forrest:template>
+ name="siteinfo-compliance-links">
+
+ <description>Displays valid XHTML and CSS compliance links</description>
+
+ <usage><![CDATA[<forrest:contract
name="siteinfo-compliance-links"/>]]></usage>
+
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
+ name="siteinfo-compliance-links" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:comment>+ |start compliance links +</xsl:comment>
+ <div id="siteinfo-compliance-links">
+ <a href="http://validator.w3.org/check?uri=referer";>
+ <img src="http://www.w3.org/Icons/valid-xhtml10"; alt="Valid
XHTML 1.0!" height="31" width="88" />
+ </a>
+ <a href="http://jigsaw.w3.org/css-validator/check/referer";>
+ <img style="border:0;width:88px;height:31px"
src="http://jigsaw.w3.org/css-validator/images/vcss"; alt="Valid CSS!"/>
+ </a>
+ </div>
+ <xsl:comment>+ |end compliance links +</xsl:comment>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
+ </xsl:stylesheet>
+ </forrest:template>
</forrest:contract>
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv?rev=369499&r1=369498&r2=369499&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
Mon Jan 16 07:47:15 2006
@@ -256,7 +256,7 @@
<forrest:property
name="branding-logo-logo">images/group.png</forrest:property>
</forrest:contract>
</forrest:hook>
-<!-- FIXME - Problem chaining two hooks with the same name...
+<!-- FIXME - Problem chaining two hooks with the same name (FOR-788)...
<forrest:hook class="logo">
<forrest:contract name="branding-logo">
<forrest:property
name="branding-logo-name">MyProject</forrest:property>
@@ -366,27 +366,11 @@
<!--<forrest:hook class="trail">
<forrest:contract name="branding-fontsize"/>
</forrest:hook>-->
- <!--
- <forrest:contract name="content-title">
- <forrest:property name="content-title" nugget="get.title">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
- </forrest:property>
- </forrest:contract>
- <forrest:contract name="content-abstract">
- <forrest:property name="content-abstract" nugget="get.abstract">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.abstract.xml"/>
- </forrest:property>
- </forrest:contract>
- <forrest:contract name="content-minitoc">
- <forrest:property name="content-minitoc-toc" nugget="get.toc">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
- </forrest:property>
- <forrest:property name="content-minitoc-conf" >
- <toc max-depth="2"
- min-sections="1" location="page"/>
- </forrest:property>
+ <forrest:contract name="content-title"
dataURI="cocoon://#{$getRequest}.title.xml"/>
+ <forrest:contract name="content-abstract"
dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+ <forrest:contract name="content-minitoc"
dataURI="cocoon://#{$getRequest}.toc.xml">
+ <forrest:property name="content-minitoc-conf" max-depth="2"
min-sections="1" location="page"/>
</forrest:contract>
- -->
<forrest:contract name="content-main"
dataURI="cocoon://#{$getRequest}.body.xml">
<forrest:property name="content-main-conf">
<headings type="underlined"/>
@@ -402,11 +386,11 @@
</forrest:hook>
</forrest:hook>
- <!--
<forrest:hook name="footer">
<forrest:hook class="lastmodified">
<forrest:contract name="siteinfo-last-published"/>
</forrest:hook>
+ <!--
<forrest:hook class="copyright">
<forrest:contract name="siteinfo-copyright">
<forrest:properties contract="siteinfo-copyright">
@@ -420,25 +404,29 @@
</forrest:contract>
</forrest:hook>
-->
- <!--FIXME thorsten turned this off while developing (no internet
connection)
- <forrest:contract name="siteinfo-compliance-links"/>-->
- <!--
+
+ <forrest:contract name="siteinfo-compliance-links"/>
<forrest:contract name="siteinfo-credits">
- <forrest:properties contract="siteinfo-credits">
- <forrest:property name="box-location">credit</forrest:property>
- <forrest:property name="top-separator">true</forrest:property>
- <forrest:property name="siteinfo-credits">
- <credits>
- <credit>
- <name>Built with Apache Forrest</name>
- <url>http://forrest.apache.org/</url>
- <image>images/built-with-forrest-button.png</image>
- <width>88</width>
- <height>31</height>
- </credit>
- </credits>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="box-location">credit</forrest:property>
+ <forrest:property name="top-separator">false</forrest:property>
+ <forrest:property name="siteinfo-credits">
+ <credits>
+ <credit>
+ <name>Built with Apache Forrest</name>
+ <url>http://forrest.apache.org/</url>
+ <image>images/built-with-forrest-button.png</image>
+ <width>88</width>
+ <height>31</height>
+ </credit>
+ <!-- FIXME - Problem chaining two hooks with the same name
(FOR-788)...
+ <credit role="accueil">
+ <name>Built with Cocoon</name>
+ <url>http://cocoon.apache.org/</url>
+
<image>http://forrest.apache.org/images/built-with-cocoon.gif</image>
+ </credit>
+ -->
+ </credits>
+ </forrest:property>
</forrest:contract>
<forrest:contract name="siteinfo-feedback">
<forrest:properties contract="siteinfo-feedback">
@@ -452,7 +440,7 @@
</forrest:contract>
</forrest:hook>
--->
+
</forrest:hook>
</forrest:view>
