You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2009/08/27 14:07:47 UTC
svn commit: r808385 [12/14] - in
/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher:
./ resources/stylesheets/ resources/stylesheets/fo/
resources/stylesheets/helper/ resources/stylesheets/html/
resources/stylesh...
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-icon.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-icon.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-icon.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-icon.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,47 +15,46 @@
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-meta-icon">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="siteinfo-meta-icon">
<description>
<p>
- <strong>siteinfo-meta-icon</strong>
- <br/>
- will output the html additional shortcut icon in head element. This icon
- is generally displayed by browser at the beginning of the URL.
- </p>
-
- <p>
- This icon is directly searched in the <code>xdoc</code> directory.
- </p>
+ <strong>siteinfo-meta-icon</strong>
+ <br />will output the html additional shortcut icon in head element. This
+ icon is generally displayed by browser at the beginning of the URL.</p>
+ <p>This icon is directly searched in the
+ <code>xdoc</code>directory.</p>
</description>
<usage>
-<![CDATA[<forrest:contract name="siteinfo-meta-icon">
+ <![CDATA[<forrest:contract name="siteinfo-meta-icon">
<forrest:property name="siteinfo-meta-icon">
<favicon-url>favico.ico</favicon-url>
</forrest:property>
</forrest:contract>]]>
- </usage>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="siteinfo-meta-icon" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="siteinfo-meta-icon"/>
- <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+ name="siteinfo-meta-icon" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="defaultVariables" select="'test.html'" />
+ <xsl:param name="siteinfo-meta-icon" />
+ <xsl:variable name="root"
+ select="$defaultVariables/*[@name='root']/@value" />
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
<xsl:comment>+|start favicon +</xsl:comment>
- <xsl:if test="$siteinfo-meta-icon/favicon-url"><link rel="shortcut icon">
- <xsl:attribute name="href">
- <xsl:value-of select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
- </xsl:attribute></link>
+ <xsl:if test="$siteinfo-meta-icon/favicon-url">
+ <link rel="shortcut icon">
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat($root,$siteinfo-meta-icon/favicon-url)" />
+ </xsl:attribute>
+ </link>
</xsl:if>
<xsl:comment>+|start favicon +</xsl:comment>
</forrest:part>
</forrest:content>
</xsl:template>
</xsl:stylesheet>
- </forrest:template >
+ </forrest:template>
</forrest:contract>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-navigation.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-navigation.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-navigation.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-navigation.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,88 +16,97 @@
limitations under the License.
-->
<forrest:contract name="siteinfo-meta-navigation"
- xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
<p>
- <strong>siteinfo-meta-navigation</strong> will output the html additional
- navigation targets in head element. Implemented forrest 0.8/common.
- </p>
+ <strong>siteinfo-meta-navigation</strong>will output the html additional
+ navigation targets in head element. Implemented forrest 0.8/common.</p>
<div class="note">
<div class="label">And why ?</div>
<div class="content">
- <p>
- This contract insert <code><link></code> HTML elements defined
- by
- <a href="http://www.w3.org/TR/1999/REC-html401-19991224/types.html#type-links" class="fork">W3C</a>
- which can be interpreted by browsers to navigate between page.
- <br/>
- At the moment, the contract implements NEXT, PREVIOUS, LAST, FIRST,
- Index and CONTENT pages.
- </p>
+ <p>This contract insert
+ <code><link></code>HTML elements defined by
+ <a href="http://www.w3.org/TR/1999/REC-html401-19991224/types.html#type-links"
+ class="fork">W3C</a>which can be interpreted by browsers to navigate
+ between page.
+ <br />At the moment, the contract implements NEXT, PREVIOUS, LAST,
+ FIRST, Index and CONTENT pages.</p>
</div>
</div>
</description>
<usage>
-<![CDATA[<forrest:contract name="siteinfo-meta-navigation" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
- </usage>
+ <![CDATA[<forrest:contract name="siteinfo-meta-navigation" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="siteinfo-meta-navigation" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="nav-main" select="/"/>
- <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
-<!-- ********************************** -->
-<!-- Creates navigation links in header -->
-<!-- ********************************** -->
+ name="siteinfo-meta-navigation" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="defaultVariables" select="'test.html'" />
+ <xsl:param name="nav-main" select="/" />
+ <xsl:variable name="root"
+ select="$defaultVariables/*[@name='root']/@value" />
+ <!-- ********************************** -->
+ <!-- Creates navigation links in header -->
+ <!-- ********************************** -->
<xsl:template match="/">
<forrest:content>
- <forrest:part xpath="/html/head">
+ <forrest:part xpath="/html/head">
<xsl:comment>+ |start navigation links +</xsl:comment>
-<!-- Index and Table of Contents -->
- <xsl:call-template name="navigation-link-index-content"/>
-<!-- NEXT, PREVIOUS... -->
+ <!-- Index and Table of Contents -->
+ <xsl:call-template name="navigation-link-index-content" />
+ <!-- NEXT, PREVIOUS... -->
<xsl:for-each select="$nav-main/navigation/menu/div[@id='menu']//div[@class='current']">
-<!-- NEXT -->
- <xsl:if test="ancestor::node()/following-sibling::*[1]//a"><link rel="NEXT"
- href="{ancestor::node()/following-sibling::*[1]//a/@href}"
- title="{ancestor::node()/following-sibling::*[1]//a}"></link>
+
+ <!-- NEXT -->
+ <xsl:if test="ancestor::node()/following-sibling::*[1]//a">
+ <link rel="NEXT"
+ href="{ancestor::node()/following-sibling::*[1]//a/@href}"
+ title="{ancestor::node()/following-sibling::*[1]//a}"></link>
</xsl:if>
-<!-- PREVIOUS -->
- <xsl:for-each
- select="ancestor::node()/preceding-sibling::*[1]//a[not( starts-with( @class, 'base' ) )]">
- <xsl:if test="position()=last()"><link rel="PREVIOUS" href="{./@href}">
- <xsl:attribute name="title">
- <xsl:value-of select="."/>
- </xsl:attribute></link>
+ <!-- PREVIOUS -->
+ <xsl:for-each select="ancestor::node()/preceding-sibling::*[1]//a[not( starts-with( @class, 'base' ) )]">
+
+ <xsl:if test="position()=last()">
+ <link rel="PREVIOUS" href="{./@href}">
+ <xsl:attribute name="title">
+ <xsl:value-of select="." />
+ </xsl:attribute>
+ </link>
</xsl:if>
</xsl:for-each>
-<!-- LAST -->
- <xsl:if test="parent::node()/following-sibling::*[last()]/a"><link rel="LAST"
- href="{parent::node()/following-sibling::*[last()]/a/@href}">
- <xsl:attribute name="title">
- <xsl:value-of
- select="parent::node()/following-sibling::*[last()]/a" />
- </xsl:attribute></link>
+ <!-- LAST -->
+ <xsl:if test="parent::node()/following-sibling::*[last()]/a">
+ <link rel="LAST"
+ href="{parent::node()/following-sibling::*[last()]/a/@href}">
+ <xsl:attribute name="title">
+ <xsl:value-of select="parent::node()/following-sibling::*[last()]/a" />
+ </xsl:attribute>
+ </link>
</xsl:if>
-<!-- FIRST -->
- <xsl:if test="parent::node()/preceding-sibling::*[last()]/a"><link rel="FIRST"
- href="{parent::node()/preceding-sibling::*[last()]/a/@href}">
- <xsl:attribute name="title">
- <xsl:value-of
- select="parent::node()/preceding-sibling::*[last()]/a"/>
- </xsl:attribute></link>
+ <!-- FIRST -->
+ <xsl:if test="parent::node()/preceding-sibling::*[last()]/a">
+ <link rel="FIRST"
+ href="{parent::node()/preceding-sibling::*[last()]/a/@href}">
+ <xsl:attribute name="title">
+ <xsl:value-of select="parent::node()/preceding-sibling::*[last()]/a" />
+ </xsl:attribute>
+ </link>
</xsl:if>
</xsl:for-each>
<xsl:comment>+ |end navigation links +</xsl:comment>
</forrest:part>
</forrest:content>
</xsl:template>
-<!-- extraction of the Index and the table of content in order to, possibly, overide them in skins... -->
+ <!-- extraction of the Index and the table of content in order to, possibly, overide them in skins... -->
<xsl:template name="navigation-link-index-content">
-<!-- Index ... --><link rel="Index" href="{$root}index.html">
- <xsl:attribute name="title">Index...</xsl:attribute></link>
-<!-- Site map ... --><link rel="CONTENTS" href="{$root}linkmap.html">
- <xsl:attribute name="title">Site map...</xsl:attribute></link>
+ <!-- Index ... -->
+ <link rel="Index" href="{$root}index.html">
+ <xsl:attribute name="title">Index...</xsl:attribute>
+ </link>
+ <!-- Site map ... -->
+ <link rel="CONTENTS" href="{$root}linkmap.html">
+ <xsl:attribute name="title">Site map...</xsl:attribute>
+ </link>
</xsl:template>
</xsl:stylesheet>
</forrest:template>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,44 +16,39 @@
limitations under the License.
-->
<forrest:contract name="siteinfo-meta"
- xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
- <p>
- This functions will output html meta information. On the one hand it will
- add the default forrest specific meta (generator, version and theme) and
- on the other hand you can add custom meta data via the structurer.
- </p>
-
- <note>
- Standard output:
- <source>
-<![CDATA[<meta content="Apache Forrest" name="Generator" />
+ <p>This functions will output html meta information. On the one hand it
+ will add the default forrest specific meta (generator, version and theme)
+ and on the other hand you can add custom meta data via the structurer.</p>
+ <note>Standard output:
+ <source>
+ <![CDATA[<meta content="Apache Forrest" name="Generator" />
<meta content="${forrest.version}" name="Forrest-version" />
<meta content="${theme}" name="Forrest-theme-name" />]]>
- </source>
- </note>
+</source></note>
</description>
<usage>
-<![CDATA[<forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
+ <![CDATA[<forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
[<forrest:property name="custom">
<meta name="Description" content="This page was created to help myself, may it help you now!"/>
</forrest:property>
<forrest:property name="theme" value="common"/>]
</forrest:contract>]]>
- </usage>
- <forrest:template
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
+</usage>
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
name="siteinfo-meta" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="custom" />
<xsl:param name="theme" />
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
- <meta name="Generator" content="Apache Forrest"/>
- <xsl:apply-templates/>
+ <meta name="Generator" content="Apache Forrest" />
+ <xsl:apply-templates />
<xsl:if test="$custom">
- <xsl:copy-of select="$custom/*"/>
+ <xsl:copy-of select="$custom/*" />
</xsl:if>
</forrest:part>
</forrest:content>
@@ -61,13 +56,13 @@
<xsl:template match="info">
<meta name="Forrest-version">
<xsl:attribute name="content">
- <xsl:value-of select="forrest-version"/>
+ <xsl:value-of select="forrest-version" />
</xsl:attribute>
</meta>
<xsl:if test="$theme">
<meta name="Forrest-theme-name">
<xsl:attribute name="content">
- <xsl:value-of select="$theme/@value"/>
+ <xsl:value-of select="$theme/@value" />
</xsl:attribute>
</meta>
</xsl:if>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-abstract.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-abstract.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-abstract.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-abstract.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,27 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-abstract">
- <description>
- xhtml2-content-abstract - Template will output the abstract of the document.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="xhtml2-content-abstract">
+ <description>xhtml2-content-abstract - Template will output the abstract of
+ the document.</description>
<usage>
-<![CDATA[<forrest:contract name="xhtml2-content-abstract" dataURI="cocoon://internal.#{$getRequest}.abstract"/>
+ <![CDATA[<forrest:contract name="xhtml2-content-abstract" dataURI="cocoon://internal.#{$getRequest}.abstract"/>
]]>
- </usage>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-abstract" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="xhtml2-content-abstract" select="/"/>
+ name="xhtml2-content-abstract" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="xhtml2-content-abstract" select="/" />
<xsl:template match="/">
<forrest:content>
<forrest:part>
<xsl:comment>+ |start xhtml2-content-abstract +</xsl:comment>
<div class="abstract">
- <xsl:value-of select="$xhtml2-content-abstract"/>
+ <xsl:value-of select="$xhtml2-content-abstract" />
</div>
<xsl:comment>+ |end xhtml2-content-abstract +</xsl:comment>
</forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-body.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-body.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-body.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-body.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,25 +15,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- name="xhtml2-content-body">
- <description>
- xhtml2-content-body - Template will output the xhtml2-content-body.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:html="http://www.w3.org/2002/06/xhtml2" name="xhtml2-content-body">
+ <description>xhtml2-content-body - Template will output the
+ xhtml2-content-body.</description>
<usage>
-<![CDATA[<forrest:contract name="xhtml2-content-body"
+ <![CDATA[<forrest:contract name="xhtml2-content-body"
dataURI="cocoon://#{$getRequest}.body.xml"/>]]>
- </usage>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-body" inputFormat="xsl">
- <xsl:stylesheet version="1.1"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- exclude-result-prefixes="html xsl">
-<!--<xsl:include href="lm://transform.xhtml2.html.structurer"/>-->
+ name="xhtml2-content-body" inputFormat="xsl">
+ <xsl:stylesheet version="1.1" xmlns:html="http://www.w3.org/2002/06/xhtml2"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ exclude-result-prefixes="html xsl">
+ <!--<xsl:include href="lm://transform.xhtml2.html.structurer"/>-->
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-title.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-title.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-title.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-title.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,33 +15,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-title">
- <description>
- xhtml2-content-title - Template will output the title of the document.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="xhtml2-content-title">
+ <description>xhtml2-content-title - Template will output the title of the
+ document.</description>
<usage>
-<![CDATA[<forrest:contract name="xhtml2-content-title" dataURI="cocoon://internal.#{$getRequest}.title"/>
+ <![CDATA[<forrest:contract name="xhtml2-content-title" dataURI="cocoon://internal.#{$getRequest}.title"/>
]]>
- </usage>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-title" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="xhtml2-content-title" select="/"/>
+ name="xhtml2-content-title" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="xhtml2-content-title" select="/" />
<xsl:template match="/">
<forrest:content>
<forrest:part>
<xsl:comment>+ |start xhtml2-content-title +</xsl:comment>
<h1>
- <xsl:value-of select="$xhtml2-content-title/*"/>
+ <xsl:value-of select="$xhtml2-content-title/*" />
</h1>
<xsl:comment>+ |end xhtml2-content-title +</xsl:comment>
</forrest:part>
<forrest:part xpath="/html/head">
<xsl:comment>+ |start xhtml2-content-title +</xsl:comment>
- <xsl:copy-of select="$xhtml2-content-title/*"/>
+ <xsl:copy-of select="$xhtml2-content-title/*" />
<xsl:comment>+ |end xhtml2-content-title +</xsl:comment>
</forrest:part>
</forrest:content>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-toc.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-toc.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-toc.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-toc.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,33 +15,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-toc">
- <description>
- xhtml2-content-toc - Template will output the abstract of the document.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="xhtml2-content-toc">
+ <description>xhtml2-content-toc - Template will output the abstract of the
+ document.</description>
<usage>
-<![CDATA[<forrest:contract name="xhtml2-content-toc" dataURI="cocoon://internal.#{$getRequest}.toc">
+ <![CDATA[<forrest:contract name="xhtml2-content-toc" dataURI="cocoon://internal.#{$getRequest}.toc">
<forrest:property name="xhtml2-content-toc-conf" max-depth="2" min-sections="1" />
</forrest:contract>
]]>
- </usage>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="xhtml2-content-toc" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="xhtml2-content-toc" select="/"/>
- <xsl:param name="xhtml2-content-toc-conf"/>
+ name="xhtml2-content-toc" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="xhtml2-content-toc" select="/" />
+ <xsl:param name="xhtml2-content-toc-conf" />
<xsl:template match="/">
<forrest:content>
<forrest:part>
<xsl:comment>+ |start xhtml2-content-toc +</xsl:comment>
- <xsl:if
- test="count(*[@id='tocitems']/*) >= $xhtml2-content-toc-conf/@min-sections">
+ <xsl:if test="count(*[@id='tocitems']/*) >= $xhtml2-content-toc-conf/@min-sections">
+
<div id="xhtml2-content-toc-area">
<xsl:call-template name="xhtml2-content-toc-processing">
- <xsl:with-param name="tocroot" select="*[@id='tocitems']"/>
+ <xsl:with-param name="tocroot" select="*[@id='tocitems']" />
</xsl:call-template>
</div>
</xsl:if>
@@ -50,22 +49,24 @@
</forrest:content>
</xsl:template>
<xsl:template name="xhtml2-content-toc-processing">
- <xsl:param name="tocroot"/>
- <xsl:if
- test="count($tocroot/*) >= $xhtml2-content-toc-conf/@min-sections">
+ <xsl:param name="tocroot" />
+ <xsl:if test="count($tocroot/*) >= $xhtml2-content-toc-conf/@min-sections">
+
<ul class="minitoc">
<xsl:for-each select="$tocroot/*">
- <li><a href="{@href}">
- <xsl:if test="not(@title='')">
- <xsl:value-of select="@title"/>
- </xsl:if>
- <xsl:if test="@title=''"> No title </xsl:if></a>
- <xsl:if
- test="@class<$xhtml2-content-toc-conf/@max-depth+1">
+ <li>
+ <a href="{@href}">
+ <xsl:if test="not(@title='')">
+ <xsl:value-of select="@title" />
+ </xsl:if>
+ <xsl:if test="@title=''">No title</xsl:if>
+ </a>
+ <xsl:if test="@class<$xhtml2-content-toc-conf/@max-depth+1">
<xsl:call-template name="xhtml2-content-toc-processing">
- <xsl:with-param name="tocroot" select="."/>
+ <xsl:with-param name="tocroot" select="." />
</xsl:call-template>
- </xsl:if></li>
+ </xsl:if>
+ </li>
</xsl:for-each>
</ul>
</xsl:if>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt Thu Aug 27 12:07:38 2009
@@ -16,37 +16,42 @@
limitations under the License.
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="orientation-tb"/>
- <xsl:param name="orientation-lr"/>
- <xsl:param name="size"/>
- <xsl:param name="bg-color-name"/>
- <xsl:param name="stroke-color-name"/>
- <xsl:param name="fg-color-name"/>
-<!-- if not all colors are present, don't even try to render the corners -->
+ <xsl:param name="orientation-tb" />
+ <xsl:param name="orientation-lr" />
+ <xsl:param name="size" />
+ <xsl:param name="bg-color-name" />
+ <xsl:param name="stroke-color-name" />
+ <xsl:param name="fg-color-name" />
+ <!-- if not all colors are present, don't even try to render the corners -->
<xsl:variable name="isize">
<xsl:choose>
<xsl:when test="$bg-color-name and $stroke-color-name and $fg-color-name">
- <xsl:value-of select="$size"/>
+
+ <xsl:value-of select="$size" />
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="smallersize" select="number($isize)-1"/>
- <xsl:variable name="biggersize" select="number($isize)+1"/>
+ <xsl:variable name="smallersize" select="number($isize)-1" />
+ <xsl:variable name="biggersize" select="number($isize)+1" />
<xsl:variable name="bg">
- <xsl:if test="skinconfig/colors/color[@name=$bg-color-name]">fill:<xsl:value-of select="skinconfig/colors/color[@name=$bg-color-name]/@value"/>;</xsl:if>
+ <xsl:if test="skinconfig/colors/color[@name=$bg-color-name]">fill:
+ <xsl:value-of select="skinconfig/colors/color[@name=$bg-color-name]/@value" />;</xsl:if>
</xsl:variable>
<xsl:variable name="fill">
- <xsl:if test="skinconfig/colors/color[@name=$stroke-color-name]">fill:<xsl:value-of select="skinconfig/colors/color[@name=$stroke-color-name]/@value"/>;</xsl:if>
+ <xsl:if test="skinconfig/colors/color[@name=$stroke-color-name]">fill:
+ <xsl:value-of select="skinconfig/colors/color[@name=$stroke-color-name]/@value" />;</xsl:if>
</xsl:variable>
<xsl:variable name="stroke">
- <xsl:if test="skinconfig/colors/color[@name=$fg-color-name]">stroke:<xsl:value-of select="skinconfig/colors/color[@name=$fg-color-name]/@value"/>;</xsl:if>
+ <xsl:if test="skinconfig/colors/color[@name=$fg-color-name]">stroke:
+ <xsl:value-of select="skinconfig/colors/color[@name=$fg-color-name]/@value" />;</xsl:if>
</xsl:variable>
<xsl:template match="skinconfig">
<svg width="{$isize}" height="{$isize}">
-<!-- background-->
- <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}" style="{$bg}stroke-width:0"/>
-<!-- 0,0 0,-4 4,0 4,-4-->
+ <!-- background-->
+ <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}"
+ style="{$bg}stroke-width:0" />
+ <!-- 0,0 0,-4 4,0 4,-4-->
<xsl:variable name="flip-tb-scale">
<xsl:choose>
<xsl:when test="$orientation-tb='t'">1</xsl:when>
@@ -62,30 +67,31 @@
<xsl:variable name="flip-tb-translate">
<xsl:choose>
<xsl:when test="$orientation-tb='t'">0</xsl:when>
- <xsl:otherwise>-<xsl:value-of select="$isize" />
- </xsl:otherwise>
+ <xsl:otherwise>-
+ <xsl:value-of select="$isize" /></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="flip-lr-translate">
<xsl:choose>
<xsl:when test="$orientation-lr='l'">0</xsl:when>
- <xsl:otherwise>-<xsl:value-of select="$isize" />
- </xsl:otherwise>
+ <xsl:otherwise>-
+ <xsl:value-of select="$isize" /></xsl:otherwise>
</xsl:choose>
</xsl:variable>
-<!-- flip transform -->
+ <!-- flip transform -->
<g transform="scale({$flip-lr-scale},{$flip-tb-scale}) translate({$flip-lr-translate}, {$flip-tb-translate})">
+
<xsl:call-template name="figure" />
</g>
</svg>
</xsl:template>
<xsl:template name="figure">
-<!-- Just change shape here -->
+ <!-- Just change shape here -->
<g transform="translate(0.5 0.5)">
- <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
- style="{$fill}{$stroke}stroke-width:1"/>
+ <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}"
+ ry="{$smallersize}" style="{$fill}{$stroke}stroke-width:1" />
</g>
-<!-- end -->
+ <!-- end -->
</xsl:template>
<xsl:template match="*"></xsl:template>
<xsl:template match="text()"></xsl:template>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt Thu Aug 27 12:07:38 2009
@@ -17,12 +17,12 @@
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="corner-imports.svg.xslt" />
-<!-- Diagonal 45 degrees corner -->
+ <!-- Diagonal 45 degrees corner -->
<xsl:template name="figure">
- <xsl:variable name="biggersize" select="number($size)+number($size)"/>
+ <xsl:variable name="biggersize" select="number($size)+number($size)" />
<g transform="translate(0 0.5)">
<polygon points="0,{$size} {$size},0 {$biggersize},0 {$biggersize},{$biggersize} 0,{$biggersize}"
- style="{$fill}{$stroke}stroke-width:1"/>
+ style="{$fill}{$stroke}stroke-width:1" />
</g>
</xsl:template>
</xsl:stylesheet>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.svg.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.svg.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.svg.xslt Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,41 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<svg width="20pt" height="20pt"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs
- id="defs550">
+<svg width="20pt" height="20pt" xmlns="http://www.w3.org/2000/svg"
+xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs id="defs550">
<linearGradient id="gray2white">
- <stop style="stop-color:#7f7f7f;stop-opacity:1;" offset="0.000000"/>
- <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1.000000"/>
+ <stop style="stop-color:#7f7f7f;stop-opacity:1;" offset="0.000000" />
+ <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1.000000" />
</linearGradient>
- <linearGradient id="pageshade" xlink:href="#gray2white"
- x1="0.95" y1="0.95"
- x2="0.40" y2="0.20"
- gradientUnits="objectBoundingBox" spreadMethod="pad" />
- <path d="M 0 0 L 200 0" style="stroke:#000000;stroke-width:1pt;" id="hr"/>
+ <linearGradient id="pageshade" xlink:href="#gray2white" x1="0.95" y1="0.95"
+ x2="0.40" y2="0.20" gradientUnits="objectBoundingBox" spreadMethod="pad" />
+ <path d="M 0 0 L 200 0" style="stroke:#000000;stroke-width:1pt;" id="hr" />
</defs>
<g transform="scale(0.08)">
<g transform="translate(40, 0)">
<rect width="230" height="300" x="0" y="0"
- style="fill:url(#pageshade);fill-rule:evenodd;
- stroke:#000000;stroke-width:1.25;"/>
+ style="fill:url(#pageshade);fill-rule:evenodd; stroke:#000000;stroke-width:1.25;" />
<g transform="translate(15, 60)">
- <use xlink:href="#hr" x="0" y="0"/>
- <use xlink:href="#hr" x="0" y="60"/>
- <use xlink:href="#hr" x="0" y="120"/>
- <use xlink:href="#hr" x="0" y="180"/>
+ <use xlink:href="#hr" x="0" y="0" />
+ <use xlink:href="#hr" x="0" y="60" />
+ <use xlink:href="#hr" x="0" y="120" />
+ <use xlink:href="#hr" x="0" y="180" />
</g>
</g>
<g transform="translate(0,70),scale(1.1,1.6)">
<rect width="200" height="100" x="0" y="0"
- style="fill:#ff0000;fill-rule:evenodd;
- stroke:#000000;stroke-width:2.33903;"/>
+ style="fill:#ff0000;fill-rule:evenodd; stroke:#000000;stroke-width:2.33903;" />
<text x="20" y="75"
- style="stroke:#ffffff;stroke-width:1.0;
- font-size:72;font-weight:normal;fill:#ffffff;
- font-family:Arial;text-anchor:start;">POD</text>
+ style="stroke:#ffffff;stroke-width:1.0; font-size:72;font-weight:normal;fill:#ffffff; font-family:Arial;text-anchor:start;">
+ POD</text>
</g>
</g>
</svg>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt Thu Aug 27 12:07:38 2009
@@ -17,11 +17,11 @@
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="corner-imports.svg.xslt" />
-<!-- Rounded corner -->
+ <!-- Rounded corner -->
<xsl:template name="figure">
<g transform="translate(0.5 0.5)">
- <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
- style="{$fill}{$stroke}stroke-width:1"/>
+ <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}"
+ ry="{$smallersize}" style="{$fill}{$stroke}stroke-width:1" />
</g>
</xsl:template>
</xsl:stylesheet>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.svg.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.svg.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.svg.xslt Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,41 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<svg width="20pt" height="20pt"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs
- id="defs550">
+<svg width="20pt" height="20pt" xmlns="http://www.w3.org/2000/svg"
+xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs id="defs550">
<linearGradient id="gray2white">
- <stop style="stop-color:#7f7f7f;stop-opacity:1;" offset="0.000000"/>
- <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1.000000"/>
+ <stop style="stop-color:#7f7f7f;stop-opacity:1;" offset="0.000000" />
+ <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1.000000" />
</linearGradient>
- <linearGradient id="pageshade" xlink:href="#gray2white"
- x1="0.95" y1="0.95"
- x2="0.40" y2="0.20"
- gradientUnits="objectBoundingBox" spreadMethod="pad" />
- <path d="M 0 0 L 200 0" style="stroke:#000000;stroke-width:1pt;" id="hr"/>
+ <linearGradient id="pageshade" xlink:href="#gray2white" x1="0.95" y1="0.95"
+ x2="0.40" y2="0.20" gradientUnits="objectBoundingBox" spreadMethod="pad" />
+ <path d="M 0 0 L 200 0" style="stroke:#000000;stroke-width:1pt;" id="hr" />
</defs>
<g transform="scale(0.08)">
<g transform="translate(40, 0)">
<rect width="230" height="300" x="0" y="0"
- style="fill:url(#pageshade);fill-rule:evenodd;
- stroke:#000000;stroke-width:1.25;"/>
+ style="fill:url(#pageshade);fill-rule:evenodd; stroke:#000000;stroke-width:1.25;" />
<g transform="translate(15, 60)">
- <use xlink:href="#hr" x="0" y="0"/>
- <use xlink:href="#hr" x="0" y="60"/>
- <use xlink:href="#hr" x="0" y="120"/>
- <use xlink:href="#hr" x="0" y="180"/>
+ <use xlink:href="#hr" x="0" y="0" />
+ <use xlink:href="#hr" x="0" y="60" />
+ <use xlink:href="#hr" x="0" y="120" />
+ <use xlink:href="#hr" x="0" y="180" />
</g>
</g>
<g transform="translate(0,70),scale(1.1,1.6)">
<rect width="200" height="100" x="0" y="0"
- style="fill:#ff0000;fill-rule:evenodd;
- stroke:#000000;stroke-width:2.33903;"/>
+ style="fill:#ff0000;fill-rule:evenodd; stroke:#000000;stroke-width:2.33903;" />
<text x="20" y="75"
- style="stroke:#ffffff;stroke-width:1.0;
- font-size:72;font-weight:normal;fill:#ffffff;
- font-family:Arial;text-anchor:start;">TXT</text>
+ style="stroke:#ffffff;stroke-width:1.0; font-size:72;font-weight:normal;fill:#ffffff; font-family:Arial;text-anchor:start;">
+ TXT</text>
</g>
</g>
</svg>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-fo.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-fo.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-fo.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-fo.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,28 +16,27 @@
limitations under the License.
-->
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
- <jx:set var="end" value="${getRequest.lastIndexOf('/')}"/>
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <jx:set var="end" value="${getRequest.lastIndexOf('/')}" />
<jx:choose>
- <jx:when test="${end>0}">
- <jx:set var="path" value="${getRequest.substring(0,end)}"/>
+ <jx:when test="${end>0}">
+ <jx:set var="path" value="${getRequest.substring(0,end)}" />
</jx:when>
<jx:otherwise>
- <jx:set var="path" value="${getRequest}"/>
+ <jx:set var="path" value="${getRequest}" />
</jx:otherwise>
</jx:choose>
-
-<!-- Settings specific to PDF output. -->
+ <!-- Settings specific to PDF output. -->
<forrest:contract name="layout-master-set">
<forrest:property name="config">
-<!--
+ <!--
Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
folio, legal, ledger, letter, quarto, tabloid (default letter).
Supported page orientations are portrait, landscape (default
portrait).
-->
- <page size="a4" orientation="portrait"/>
-<!--
+ <page size="a4" orientation="portrait" />
+ <!--
Margins can be specified for top, bottom, inner, and outer
edges. If double-sided="false", the inner edge is always left
and the outer is always right. If double-sided="true", the
@@ -53,12 +52,14 @@
</margins>
</forrest:property>
</forrest:contract>
- <forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
- <forrest:contract name="page-header" dataURI="cocoon://#{$getRequest}.title.xml">
+ <forrest:contract name="content-title"
+ dataURI="cocoon://#{$getRequest}.title.xml" />
+ <forrest:contract name="page-header"
+ dataURI="cocoon://#{$getRequest}.title.xml">
<forrest:property name="doublesided">false</forrest:property>
</forrest:contract>
<forrest:contract name="page-footer-numbering">
-<!--
+ <!--
Pattern of the page numbering in the footer - Default is "Page x".
first occurrence of '1' digit represents the current page number,
second occurrence of '1' digit represents the total page number,
@@ -76,13 +77,13 @@
</forrest:contract>
<forrest:contract name="page-footer-copyright">
<forrest:property name="copyright">
-<!-- The following are used to construct a copyright statement as follows :
+ <!-- The following are used to construct a copyright statement as follows :
<property> <symbol> <year> <vendor> <msg>
<url>
ie. Copyright c 2002 ACME
- http://ACME.org
- inception year option let you create a copyright with a range of date automaticalculated :
- 2002-2007
+ http://ACME.org
+ inception year option let you create a copyright with a range of date automaticalculated :
+ 2002-2007
-->
<year inception='true'>2002</year>
<vendor>ACME</vendor>
@@ -92,18 +93,22 @@
<property></property>
</forrest:property>
</forrest:contract>
- <forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>
- <forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>
- <forrest:contract name="content-authors" dataURI="cocoon://#{$getRequest}.authors.xml"/>
- <forrest:contract name="content-toc" dataURI="cocoon://#{$getRequest}.toc.xml">
-<!-- Configure the TOC, i.e. the Table of Contents.
+ <forrest:contract name="content-abstract"
+ dataURI="cocoon://#{$getRequest}.abstract.xml" />
+ <forrest:contract name="content-notice"
+ dataURI="cocoon://#{$getRequest}.notice.xml" />
+ <forrest:contract name="content-authors"
+ dataURI="cocoon://#{$getRequest}.authors.xml" />
+ <forrest:contract name="content-toc"
+ dataURI="cocoon://#{$getRequest}.toc.xml">
+ <!-- Configure the TOC, i.e. the Table of Contents.
@max-depth
how many "section" levels need to be included in the
- generated Table of Contents (TOC).
- (default is 2)
+ generated Table of Contents (TOC).
+ (default is 2)
@page-break-after (default is true)
- jump to the next page after the TOC.
- (default is true)
+ jump to the next page after the TOC.
+ (default is true)
@min-sections
Minimum required to create a TOC.
(FIXME min-section is not managed yet)
@@ -111,30 +116,32 @@
<forrest:property name="max-depth">2</forrest:property>
<forrest:property name="page-break-after">true</forrest:property>
</forrest:contract>
- <forrest:contract name="content-main-outline" dataURI="cocoon://#{$getRequest}.toc.xml"/>
- <forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
- <forrest:property name="requestPath" value="${path}"/>
+ <forrest:contract name="content-main-outline"
+ dataURI="cocoon://#{$getRequest}.toc.xml" />
+ <forrest:contract name="content-main"
+ dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
+ <forrest:property name="requestPath" value="${path}" />
<forrest:property name="config">
-<!--
+ <!--
Supported text alignments are left, right, justify (default left).
-->
- <page text-align="left" background-color="#ffffff"/>
-<!-- Heading types can be clean|underlined|boxed -->
- <headings type="underlined" color="#4a6d8c"/>
-<!--
+ <page text-align="left" background-color="#ffffff" />
+ <!-- Heading types can be clean|underlined|boxed -->
+ <headings type="underlined" color="#4a6d8c" />
+ <!--
Print the URL text next to all links going outside the file
-->
<show-external-urls>false</show-external-urls>
<colors>
- <color name="code" value="#CFDCED"/>
- <color name="highlight" value="#ffff00"/>
- <color name="fixme" value="#cc6600"/>
- <color name="note" value="#006699"/>
- <color name="warning" value="#990000"/>
- <color name="table" value="#7099C5"/>
- <color name="table-cell" value="#f0f0ff"/>
- <color name="body" value="#ffffff" link="#0F3660"
- vlink="#009999" hlink="#000066"/>
+ <color name="code" value="#CFDCED" />
+ <color name="highlight" value="#ffff00" />
+ <color name="fixme" value="#cc6600" />
+ <color name="note" value="#006699" />
+ <color name="warning" value="#990000" />
+ <color name="table" value="#7099C5" />
+ <color name="table-cell" value="#f0f0ff" />
+ <color name="body" value="#ffffff" link="#0F3660" vlink="#009999"
+ hlink="#000066" />
</colors>
</forrest:property>
</forrest:contract>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-html.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-html.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-html.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-html.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,62 +16,62 @@
limitations under the License.
-->
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-<!--
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <!--
@type defines this structurer to html.
@hooksXpath defines where all hooks will be injected (as prefix).
-->
<forrest:contract name="branding-css-links">
-<!-- More information around this contract
+ <!-- More information around this contract
http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
-->
-<!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
+ <!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
<forrest:property name="branding-css-links-input">
- <css url="common.css"/>
+ <css url="common.css" />
</forrest:property>
</forrest:contract>
<forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
<forrest:property name="custom">
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
</forrest:property>
- <forrest:property name="theme" value="common"/>
+ <forrest:property name="theme" value="common" />
</forrest:contract>
-<!--
+ <!--
nuggets (extra data requested by the contract) are now defined in the contract element.
As well the former @nugget is now called @dataURI to reflect better the function of the attribute.
-->
<forrest:hook name="container">
<forrest:hook name="header">
<forrest:contract name="branding-tagline">
- <forrest:property name="branding-tagline-name">new
- seed</forrest:property>
- <forrest:property name="branding-tagline-tagline">powered by the
- dispatcher</forrest:property>
+ <forrest:property name="branding-tagline-name">new
+ seed</forrest:property>
+ <forrest:property name="branding-tagline-tagline">powered by the
+ dispatcher</forrest:property>
</forrest:contract>
<forrest:hook name="nav-main-hook">
- <forrest:contract name="nav-main"
- dataURI="cocoon://#{$getRequest}.navigation.xml"/>
- <forrest:contract name="nav-main-sub"
- dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+ <forrest:contract name="nav-main"
+ dataURI="cocoon://#{$getRequest}.navigation.xml" />
+ <forrest:contract name="nav-main-sub"
+ dataURI="cocoon://#{$getRequest}.navigation.xml" />
</forrest:hook>
</forrest:hook>
<forrest:hook name="page">
<forrest:hook name="leftbar">
- <forrest:contract name="nav-section"
- dataURI="cocoon://#{$getRequest}.navigation.xml">
+ <forrest:contract name="nav-section"
+ dataURI="cocoon://#{$getRequest}.navigation.xml">
<forrest:property name="nav-section-toc" nugget="get.toc">
- <jx:import uri="cocoon://#{$getRequest}.toc.xml"/>
+ <jx:import uri="cocoon://#{$getRequest}.toc.xml" />
</forrest:property>
- <forrest:property name="toc" max-depth="2"/>
+ <forrest:property name="toc" max-depth="2" />
</forrest:contract>
</forrest:hook>
<forrest:contract name="search-input">
<forrest:property name="search-input">
- <search name="MyProject" domain="example.org" provider="google"/>
+ <search name="MyProject" domain="example.org" provider="google" />
</forrest:property>
</forrest:contract>
</forrest:hook>
-<!--
+ <!--
You can group elements (hooks and contracts) to a template
and import it from any structurer.
@@ -91,32 +91,31 @@
FIXME: The above does not work as a result of http://svn.apache.org/viewvc?view=rev&rev=520650
-->
<forrest:hook name="export-link">
- <forrest:contract name="content-source-xml-link"/>
- <forrest:contract name="content-pdf-link"/>
+ <forrest:contract name="content-source-xml-link" />
+ <forrest:contract name="content-pdf-link" />
</forrest:hook>
<forrest:hook name="content">
- <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 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:contract name="content-main"
+ dataURI="cocoon://#{$getRequest}.body.xml" />
</forrest:hook>
</forrest:hook>
<forrest:hook name="footer">
<forrest:contract name="siteinfo-feedback">
<forrest:property name="siteinfo-feedback">
<feedback to="webmaster@foo.com"
- href="mailto:webmaster@foo.com?subject=Feedback " >
- Send feedback about the website to:
- </feedback>
+ href="mailto:webmaster@foo.com?subject=Feedback ">Send feedback
+ about the website to:</feedback>
</forrest:property>
</forrest:contract>
- <forrest:contract name="siteinfo-last-published"/>
+ <forrest:contract name="siteinfo-last-published" />
</forrest:hook>
</forrest:template>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/export-link.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/export-link.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/export-link.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/export-link.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,16 +15,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:template
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<forrest:hook name="export-link">
- <forrest:contract name="content-source-xml-link"/>
- <forrest:contract name="content-pdf-link"/>
-<!-- You can include other templates from panels as well -->
-<!--<jx:import uri="cocoon://prepare.structurer-panels.export-link-test"/>-->
-<!-- FIXME: jxpath -->
-<!-- Use this when jxpath bug is solved -->
-<!--<jx:import uri="lm:panels.export-link-test"/>-->
+ <forrest:contract name="content-source-xml-link" />
+ <forrest:contract name="content-pdf-link" />
+ <!-- You can include other templates from panels as well -->
+ <!--<jx:import uri="cocoon://prepare.structurer-panels.export-link-test"/>-->
+ <!-- FIXME: jxpath -->
+ <!-- Use this when jxpath bug is solved -->
+ <!--<jx:import uri="lm:panels.export-link-test"/>-->
</forrest:hook>
</forrest:template>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/abstract.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/abstract.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/abstract.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/abstract.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,37 +15,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- name="abstract">
- <description>
- abstract will output the documtent abstract.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:html="http://www.w3.org/2002/06/xhtml2" name="abstract">
+ <description>abstract will output the documtent abstract.</description>
<usage>
-<![CDATA[<forrest:contract name="abstract"/>]]>
- </usage>
+ <![CDATA[<forrest:contract name="abstract"/>]]>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="abstract" inputFormat="xsl">
- <xsl:stylesheet version="1.1"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
-<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
+ name="abstract" inputFormat="xsl">
+ <xsl:stylesheet version="1.1" xmlns:html="http://www.w3.org/2002/06/xhtml2"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
+ <!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
<xsl:template match="/">
<forrest:content>
<forrest:part>
- <xsl:apply-templates select="html:html/html:head"/>
+ <xsl:apply-templates select="html:html/html:head" />
</forrest:part>
</forrest:content>
</xsl:template>
<xsl:template match="html:head">
<xsl:if test="html:meta [@property='abstract']">
- <xsl:copy-of select="html:meta[@property='abstract']"/>
+ <xsl:copy-of select="html:meta[@property='abstract']" />
</xsl:if>
<xsl:if test="not(html:meta[@property='abstract'])">
- <meta property="abstract"/>
+ <meta property="abstract" />
</xsl:if>
</xsl:template>
</xsl:stylesheet>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/body.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/body.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/body.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/body.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,26 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- name="body">
-<!--NOTE:
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:html="http://www.w3.org/2002/06/xhtml2" name="body">
+ <!--NOTE:
When using the body template as c'n p master just search and replace 'body' by the {contract-name}!-->
- <description>
- body will output {contract-funtion}. This is just a body contract, it will
- output *nothing*.
- </description>
+ <description>body will output {contract-funtion}. This is just a body
+ contract, it will output *nothing*.</description>
<usage>
-<![CDATA[<forrest:contract name="body"/>]]>
- </usage>
- <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="body" inputFormat="xsl">
- <xsl:stylesheet version="1.1" xmlns:html="http://www.w3.org/2002/06/xhtml2"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- exclude-result-prefixes="html xsl">
- <xsl:include href="lm://transform.xhtml2.html.structurer"/>
+ <![CDATA[<forrest:contract name="body"/>]]>
+</usage>
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+ name="body" inputFormat="xsl">
+ <xsl:stylesheet version="1.1" xmlns:html="http://www.w3.org/2002/06/xhtml2"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ exclude-result-prefixes="html xsl">
+ <xsl:include href="lm://transform.xhtml2.html.structurer" />
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/title.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/title.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/title.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/title.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,36 +15,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- name="title">
- <description>
- title - Templates for "title" mode. This will generate the title of the
- document.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:html="http://www.w3.org/2002/06/xhtml2" name="title">
+ <description>title - Templates for "title" mode. This will generate the title
+ of the document.</description>
<usage>
-<![CDATA[<forrest:contract name="siteinfo-meta" dataURI="cocoon://#{$getRequest}.title.xml"/>
+ <![CDATA[<forrest:contract name="siteinfo-meta" dataURI="cocoon://#{$getRequest}.title.xml"/>
]]>
- </usage>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="title" inputFormat="xsl">
- <xsl:stylesheet version="1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:html="http://www.w3.org/2002/06/xhtml2">
- <xsl:param name="title" select="/"/>
+ name="title" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:html="http://www.w3.org/2002/06/xhtml2">
+ <xsl:param name="title" select="/" />
<xsl:template match="/">
<forrest:content>
<forrest:part>
- <xsl:apply-templates select="html:html/html:head"/>
+ <xsl:apply-templates select="html:html/html:head" />
</forrest:part>
</forrest:content>
</xsl:template>
<xsl:template match="html:head">
<xsl:choose>
<xsl:when test="html:title">
- <xsl:copy-of select="html:title"/>
+ <xsl:copy-of select="html:title" />
</xsl:when>
<xsl:otherwise>
<title>*No* title found</title>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/toc.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/toc.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/toc.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/toc.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,52 +15,46 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- name="toc">
- <description>
- toc will output the documtent toc.
- </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:html="http://www.w3.org/2002/06/xhtml2" name="toc">
+ <description>toc will output the documtent toc.</description>
<usage>
-<![CDATA[<forrest:contract name="toc" dataURI="cocoon://#{$getRequest}.xml"/>]]>
- </usage>
+ <![CDATA[<forrest:contract name="toc" dataURI="cocoon://#{$getRequest}.xml"/>]]>
+</usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
- name="toc" inputFormat="xsl">
- <xsl:stylesheet version="1.1"
- xmlns:html="http://www.w3.org/2002/06/xhtml2"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="lm://transform.xml.generateId"/>
+ name="toc" inputFormat="xsl">
+ <xsl:stylesheet version="1.1" xmlns:html="http://www.w3.org/2002/06/xhtml2"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:include href="lm://transform.xml.generateId" />
<xsl:template match="/">
<forrest:content>
<forrest:part>
- <xsl:apply-templates select="html:html/html:body" mode="toc"/>
+ <xsl:apply-templates select="html:html/html:body" mode="toc" />
</forrest:part>
</forrest:content>
</xsl:template>
<xsl:template match="html:body" mode="toc">
<div id="tocitems">
<xsl:apply-templates select="html:section" mode="toc">
- <xsl:with-param name="level" select="1"/>
+ <xsl:with-param name="level" select="1" />
</xsl:apply-templates>
</div>
</xsl:template>
<xsl:template match="html:section" mode="toc">
- <xsl:param name="level"/>
+ <xsl:param name="level" />
<div class="{$level}">
- <xsl:attribute name="href">#<xsl:call-template
- name="generate-id"/>
- </xsl:attribute>
+ <xsl:attribute name="href">#
+ <xsl:call-template name="generate-id" /></xsl:attribute>
<xsl:attribute name="title">
- <xsl:value-of select="@title"/>
+ <xsl:value-of select="@title" />
</xsl:attribute>
<xsl:apply-templates mode="toc">
- <xsl:with-param name="level" select="$level+1"/>
+ <xsl:with-param name="level" select="$level+1" />
</xsl:apply-templates>
</div>
</xsl:template>
- <xsl:template match="node()|@*" mode="toc"/>
+ <xsl:template match="node()|@*" mode="toc" />
</xsl:stylesheet>
</forrest:template>
</forrest:contract>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,32 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
- jx:cache-key="#{$cocoon/parameters/getRequest}"
- jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
-<!-- The following variables are used to contact data models and/or contracts. -->
- <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
- <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
- <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
-<!-- FO View of the request (e.g. index.fo, usually further processed to pdf)-->
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+jx:cache-key="#{$cocoon/parameters/getRequest}"
+jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
+
+ <!-- The following variables are used to contact data models and/or contracts. -->
+ <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}" />
+ <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}" />
+ <jx:set var="getRequestExtension"
+ value="#{$cocoon/parameters/getRequestExtension}" />
+ <!-- FO View of the request (e.g. index.fo, usually further processed to pdf)-->
<forrest:structure type="fo" hooksXpath="/">
- <jx:import uri="cocoon://prepare.panels.common-fo"/>
+ <jx:import uri="cocoon://prepare.panels.common-fo" />
</forrest:structure>
-<!-- CSS View of the request e.g. index.dispatcher.css -->
+ <!-- CSS View of the request e.g. index.dispatcher.css -->
<forrest:structure type="css" hooksXpath="/">
- <jx:import uri="cocoon://prepare.panels.maven-css"/>
+ <jx:import uri="cocoon://prepare.panels.maven-css" />
</forrest:structure>
-<!-- HTML View of the request (e.g. index.html)-->
+ <!-- HTML View of the request (e.g. index.html)-->
<forrest:structure type="html" hooksXpath="/html/body">
- <jx:import uri="cocoon://prepare.panels.maven-html.head"/>
+ <jx:import uri="cocoon://prepare.panels.maven-html.head" />
<forrest:hook name="container">
- <jx:import uri="cocoon://prepare.panels.maven-html.header"/>
+ <jx:import uri="cocoon://prepare.panels.maven-html.header" />
<forrest:hook name="page">
- <jx:import uri="cocoon://prepare.panels.maven-html.leftbar"/>
- <jx:import uri="cocoon://prepare.panels.maven-html.content"/>
+ <jx:import uri="cocoon://prepare.panels.maven-html.leftbar" />
+ <jx:import uri="cocoon://prepare.panels.maven-html.content" />
</forrest:hook>
- <jx:import uri="cocoon://prepare.panels.maven-html.footer"/>
+ <jx:import uri="cocoon://prepare.panels.maven-html.footer" />
</forrest:hook>
</forrest:structure>
</forrest:structurer>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/branding-logo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/branding-logo.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/branding-logo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/branding-logo.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,22 +16,29 @@
limitations under the License.
-->
<forrest:contract name="branding-logo"
- xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
<p>This contract will output images. You can configure it like follow:</p>
<ul>
- <li>branding-logo-name - will be used for @alt value of the <img> </li>
- <li>branding-logo-description - will be used for @title value of the <img> </li>
- <li>branding-logo-url - will be used for the @href location of a surrounding <a> </li>
- <li>branding-logo-logo - will be used for @src value of the <img> </li>
- <li>branding-logo-over - if used then a javascript will be rendered which switches the images.
- Will be used for @onmouseover image @src value of the <img> </li>
- <li>branding-logo-width - will be used for @width value of the <img> </li>
- <li>branding-logo-height - will be used for @height value of the <img> </li>
- </ul>
+ <li>branding-logo-name - will be used for @alt value of the
+ <img></li>
+ <li>branding-logo-description - will be used for @title value of the
+ <img></li>
+ <li>branding-logo-url - will be used for the @href location of a
+ surrounding <a></li>
+ <li>branding-logo-logo - will be used for @src value of the
+ <img></li>
+ <li>branding-logo-over - if used then a javascript will be rendered which
+ switches the images. Will be used for @onmouseover image @src value of
+ the <img></li>
+ <li>branding-logo-width - will be used for @width value of the
+ <img></li>
+ <li>branding-logo-height - will be used for @height value of the
+ <img></li>
+ </ul>
</description>
-
- <usage><![CDATA[<forrest:contract name="branding-logo">
+ <usage>
+ <![CDATA[<forrest:contract name="branding-logo">
<forrest:property name="branding-logo-name">Apache Forrest</forrest:property>
<forrest:property name="branding-logo-description">Apache Forrest</forrest:property>
<forrest:property name="branding-logo-url">http://forrest.apache.org/</forrest:property>
@@ -39,51 +46,51 @@
[<forrest:property name="branding-logo-over">images/project-logo_over.gif</forrest:property>]
[<forrest:property name="branding-logo-width">500</forrest:property>]
[<forrest:property name="branding-logo-height">490</forrest:property>]
-</forrest:contract>]]></usage>
-
- <forrest:template
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
+</forrest:contract>]]>
+</usage>
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
name="branding-logo" inputFormat="xsl">
-
- <xsl:stylesheet version="1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>
- <xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="branding-logo-name"/>
- <xsl:param name="branding-logo-description"/>
- <xsl:param name="branding-logo-url"/>
- <xsl:param name="branding-logo-logo"/>
- <xsl:param name="branding-logo-class"/>
- <xsl:param name="branding-logo-over"/>
- <xsl:param name="branding-logo-width"/>
- <xsl:param name="branding-logo-height"/>
- <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:include href="cocoon://prepare.contract.html.helper-render-image" />
+ <xsl:param name="defaultVariables" select="'test.html'" />
+ <xsl:param name="branding-logo-name" />
+ <xsl:param name="branding-logo-description" />
+ <xsl:param name="branding-logo-url" />
+ <xsl:param name="branding-logo-logo" />
+ <xsl:param name="branding-logo-class" />
+ <xsl:param name="branding-logo-over" />
+ <xsl:param name="branding-logo-width" />
+ <xsl:param name="branding-logo-height" />
+ <xsl:variable name="root"
+ select="$defaultVariables/*[@name='root']/@value" />
<xsl:template match="/">
<forrest:content>
<forrest:part>
-<xsl:comment>+
- |start Logo
- +</xsl:comment>
+ <xsl:comment>+ |start Logo +</xsl:comment>
<xsl:call-template name="renderlogo">
- <xsl:with-param name="name" select="normalize-space($branding-logo-name)"/>
- <xsl:with-param name="url" select="normalize-space($branding-logo-url)"/>
- <xsl:with-param name="logo" select="normalize-space($branding-logo-logo)"/>
- <xsl:with-param name="class" select="normalize-space($branding-logo-class)"/>
- <xsl:with-param name="rollover" select="normalize-space($branding-logo-over)"/>
- <xsl:with-param name="width" select="normalize-space($branding-logo-width)"/>
- <xsl:with-param name="height" select="normalize-space($branding-logo-height)"/>
- <xsl:with-param name="root" select="$root"/>
- <xsl:with-param name="description"
- select="normalize-space($branding-logo-description)"/>
+ <xsl:with-param name="name"
+ select="normalize-space($branding-logo-name)" />
+ <xsl:with-param name="url"
+ select="normalize-space($branding-logo-url)" />
+ <xsl:with-param name="logo"
+ select="normalize-space($branding-logo-logo)" />
+ <xsl:with-param name="class"
+ select="normalize-space($branding-logo-class)" />
+ <xsl:with-param name="rollover"
+ select="normalize-space($branding-logo-over)" />
+ <xsl:with-param name="width"
+ select="normalize-space($branding-logo-width)" />
+ <xsl:with-param name="height"
+ select="normalize-space($branding-logo-height)" />
+ <xsl:with-param name="root" select="$root" />
+ <xsl:with-param name="description"
+ select="normalize-space($branding-logo-description)" />
</xsl:call-template>
-<xsl:comment>+
- |end group Logo
- +</xsl:comment>
+ <xsl:comment>+ |end group Logo +</xsl:comment>
</forrest:part>
</forrest:content>
</xsl:template>
-
</xsl:stylesheet>
-
</forrest:template>
</forrest:contract>