Author: thorsten
Date: Fri Dec 16 21:02:05 2005
New Revision: 357294
URL: http://svn.apache.org/viewcvs?rev=357294&view=rev
Log:
Add more refactored contracts and updated the common.fv. Also added some test
content for debuging the contracts. Changed the serializer to xhtml.
Added:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-abstract.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-abstract.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-minitoc.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-minitoc.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-pdf-link.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-pdf-link.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-source-xml-link.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-source-xml-link.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-title.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-title.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-xml-link.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-xml-link.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/nav-section.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/nav-section.ft
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/search-input.ft
- copied, changed from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/search-input.ft
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/site.xml
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common.fv
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/master.ft
forrest/trunk/main/template-sites/v3/src/documentation/sitemap.xmap
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml?rev=357294&r1=357293&r2=357294&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
Fri Dec 16 21:02:05 2005
@@ -17,13 +17,20 @@
-->
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
- <header>
- <title>Welcome to dispatcher testing area</title>
- </header>
+ <header>
+ <title>Welcome to dispatcher testing area</title>
+ <notice>The content of this document doesn't make any sense at
all.</notice>
+ <abstract>This is a demonstration document using all possible elements in
+ the current Apache Forrest xdocs <code>document-v20.dtd</code>
</abstract>
+ </header>
<body>
<section id="overview">
<title>Dispatcher testing area</title>
<p>Welcome brave soul.</p>
+ <section id="sample">
+ <title>Sample Content</title>
+ <p>sample</p>
+ </section>
</section>
</body>
</document>
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/site.xml?rev=357294&r1=357293&r2=357294&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/site.xml
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/site.xml
Fri Dec 16 21:02:05 2005
@@ -42,6 +42,7 @@
<site label="MyProj" href="" xmlns="http://apache.org/forrest/linkmap/1.0";
tab="">
<about label="About" tab="home">
<index label="Index" href="index.html" description="Welcome to MyProj"/>
+ <target label="target" href="http://www.target-x.de/"; description="test
link"/>
</about>
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common.fv
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common.fv?rev=357294&r1=357293&r2=357294&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common.fv
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common.fv
Fri Dec 16 21:02:05 2005
@@ -28,6 +28,10 @@
@hooksXpath defines where all hooks will be injected (as prefix).
-->
<forrest:contract name="branding-css-links">
+ <!-- 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) -->
<forrest:property name="branding-css-links-input">
<css url="common.css"/>
</forrest:property>
@@ -52,32 +56,23 @@
dataURI="cocoon://#{$getRequest}.navigation.xml"/>
</forrest:hook>
</forrest:hook>
- </forrest:hook>
- <!--
- <forrest:hook name="container">
- <forrest:hook name="header">
- <forrest:hook name="nav-main-hook">
- </forrest:hook>
- </forrest:hook>
<forrest:hook name="page">
<forrest:hook name="leftbar">
- <forrest:contract name="nav-section">
- <forrest:properties contract="nav-section">
- <forrest:property name="nav-section" nugget="get.navigation">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
- </forrest:property>
- </forrest:properties>
- </forrest:contract>
- <forrest:contract name="search-input">
- <forrest:properties contract="search-input">
- <forrest:property name="search-input">
- <search name="MyProject" domain="mydomain" provider="google"/>
- </forrest:property>
- </forrest:properties>
+ <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"/>
+ </forrest:property>
+ <forrest:property name="toc" max-depth="2"/>
</forrest:contract>
</forrest:hook>
-<!-#-
- You can group elements to a template and call it from any view. e.g.
+ <forrest:contract name="search-input">
+ <forrest:property name="search-input">
+ <search name="MyProject" domain="mydomain" provider="google"/>
+ </forrest:property>
+ </forrest:contract>
+ </forrest:hook>
+ <!-- You can group elements to a template and call it from any view.
e.g.
<forrest:hook name="export-link">
<forrest:contract name="content-xml-link"/>
<forrest:contract name="content-pdf-link"/>
@@ -90,38 +85,30 @@
HEADSUP:
<forrest:call-template name="export-link"/> is *not* working anymore!!!
--#->
+-->
<jx:import uri="cocoon://prepare.tiles.export-link"/>
- <!-#- FIXME: jxpath -#->
- <!-#- Use this when jxpath bug is solved -#->
- <!-#-<jx:import uri="lm:tiles.export-link"/>-#->
-
<forrest:hook name="content">
- <forrest:contract name="content-title">
- <forrest:properties contract="content-title">
- <forrest:property name="content-title" nugget="get.title">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
- </forrest:property>
- </forrest:properties>
- </forrest:contract>
- <forrest:contract name="content-abstract">
- <forrest:properties contract="content-abstract">
- <forrest:property name="content-abstract" nugget="get.abstract">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.abstract.xml"/>
- </forrest:property>
- </forrest:properties>
- </forrest:contract>
- <forrest:contract name="content-minitoc">
- <forrest:properties contract="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:properties>
+ <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:hook>
+ </forrest:hook>
+ <!--
+ <forrest:hook name="container">
+ <forrest:hook name="header">
+ <forrest:hook name="nav-main-hook">
+ </forrest:hook>
+ </forrest:hook>
+ <forrest:hook name="page">
+ <forrest:hook name="leftbar">
+ </forrest:hook>
+ <forrest:hook name="content">
<forrest:contract name="content-main">
<forrest:properties contract="content-main">
<forrest:property name="content-main" nugget="get.body">
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-abstract.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-abstract.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-abstract.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-abstract.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-abstract.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-abstract.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-abstract.ft
Fri Dec 16 21:02:05 2005
@@ -18,7 +18,7 @@
<forrest:contract
xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- name="content-abstract" type="nugget">
+ name="content-abstract">
<description>
content-abstract will output the abstract of the content.
</description>
@@ -30,14 +30,18 @@
</forrest:properties>
</forrest:contract>]]></usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="content-abstract" inputFormat="xsl" body="true"
head="false">
+ name="content-abstract" inputFormat="xsl" >
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="content-abstract-body">
- <xsl:param name="content-abstract"/>
- <xsl:comment>+ |start content-abstract +</xsl:comment>
- <xsl:copy-of
- select="$content-abstract/[EMAIL PROTECTED]'abstract']"/>
- <xsl:comment>+ |end content-abstract +</xsl:comment>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:comment>+ |start content-abstract +</xsl:comment>
+ <xsl:copy>
+ <xsl:apply-templates select="//[EMAIL PROTECTED]'abstract']"/>
+ </xsl:copy>
+ <xsl:comment>+ |end content-abstract +</xsl:comment>
+ </forrest:part>
+ </forrest:content>
</xsl:template>
</xsl:stylesheet>
</forrest:template>
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-minitoc.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-minitoc.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-minitoc.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-minitoc.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-minitoc.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-minitoc.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-minitoc.ft
Fri Dec 16 21:02:05 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0";
- name="content-minitoc" type="nugget">
+ name="content-minitoc">
<description>
content-minitoc - Configure the TOC, i.e. the Table of Contents.
@max-depth -
@@ -27,46 +27,41 @@
@location ("page","menu","page,menu", "none") -
Where to show the TOC.
</description>
- <usage><![CDATA[<forrest:contract name="content-minitoc">
- <forrest:properties contract="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" max-depth="2"
min-sections="1" location="page"/>
- </forrest:properties>
+ <usage><![CDATA[<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>]]></usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="content-minitoc" inputFormat="xsl" body="true"
- head="false">
+ name="content-minitoc" inputFormat="xsl" >
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <!--FIXME: that need come from the content-main-->
- <xsl:template name="content-minitoc-body"
- match="[EMAIL PROTECTED]'content']/[EMAIL
PROTECTED]'skinconf-toc-page']">
- <xsl:param name="content-minitoc-toc"/>
- <xsl:param name="content-minitoc-conf"/>
- <xsl:comment>+ |start content-minitoc +</xsl:comment>
- <xsl:if test="contains($content-minitoc-conf/toc/@location,'page')">
- <xsl:if
- test="count($content-minitoc-toc/tocitems/tocitem) >=
$content-minitoc-conf/toc/@min-sections">
- <div id="content-minitoc-area">
- <xsl:call-template name="content-minitoc-processing">
- <xsl:with-param name="tocroot"
- select="$content-minitoc-toc/tocitems"/>
- <xsl:with-param name="content-minitoc-conf"
- select="$content-minitoc-conf"/>
- </xsl:call-template>
- </div>
- </xsl:if>
- </xsl:if>
- <xsl:comment>+ |end minitoc +</xsl:comment>
+ <xsl:param name="content-minitoc-toc" select="/"/>
+ <xsl:param name="content-minitoc-conf"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:comment>+ |start content-minitoc +</xsl:comment>
+ <xsl:if test="contains($content-minitoc-conf/@location,'page')">
+ <xsl:if
+ test="count(tocitems/tocitem) >=
$content-minitoc-conf/@min-sections">
+ <div id="content-minitoc-area">
+ <xsl:call-template name="content-minitoc-processing">
+ <xsl:with-param name="tocroot" select="tocitems"/>
+ <xsl:with-param name="content-minitoc-conf"
+ select="$content-minitoc-conf"/>
+ </xsl:call-template>
+ </div>
+ </xsl:if>
+ </xsl:if>
+ <xsl:comment>+ |end minitoc +</xsl:comment>
+ </forrest:part>
+ </forrest:content>
</xsl:template>
<xsl:template name="content-minitoc-processing">
<xsl:param name="tocroot"/>
<xsl:param name="content-minitoc-conf"/>
<xsl:if
- test="count($tocroot/tocitem) >=
$content-minitoc-conf/toc/@min-sections">
- <xsl:if test="contains($content-minitoc-conf/toc/@location,'page')">
+ test="count($tocroot/tocitem) >=
$content-minitoc-conf/@min-sections">
+ <xsl:if test="contains($content-minitoc-conf/@location,'page')">
<ul class="minitoc">
<xsl:for-each select="$tocroot/tocitem">
<li>
@@ -74,7 +69,7 @@
<xsl:value-of select="@title"/>
</a>
<xsl:if
- test="@level<$content-minitoc-conf/toc/@max-depth+1">
+ test="@level<$content-minitoc-conf/@max-depth+1">
<xsl:call-template name="content-minitoc-processing">
<xsl:with-param name="tocroot" select="."/>
<xsl:with-param name="content-minitoc-conf"
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-pdf-link.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-pdf-link.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-pdf-link.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-pdf-link.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-pdf-link.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-pdf-link.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-pdf-link.ft
Fri Dec 16 21:02:05 2005
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract name="content-pdf-link" type="nugget"
+<forrest:contract name="content-pdf-link"
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
<description>
content-pdf-link will output the PDF link with image to the content.
@@ -23,15 +23,22 @@
<usage><![CDATA[<forrest:contract name="content-pdf-link"/>]]></usage>
<forrest:template
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="content-pdf-link" inputFormat="xsl" body="true"
head="false">
+ name="content-pdf-link" inputFormat="xsl" >
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="content-pdf-link-body">
- <a href="{$filename-noext}.pdf" class="format">
- <img class="skin" src="{$skin-img-dir}/pdfdoc.gif"
alt="PDF - icon"/>
- <span class="caption">PDF</span>
- </a>
- </xsl:template>
-
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ <xsl:variable name="filename-noext" select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <a href="{$filename-noext}.pdf" class="format">
+ <img class="skin" src="{$skin-img-dir}/pdfdoc.gif"
+ alt="PDF - icon"/>
+ <span class="caption">PDF</span>
+ </a>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
</xsl:stylesheet>
</forrest:template>
</forrest:contract>
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-source-xml-link.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-source-xml-link.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-source-xml-link.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-source-xml-link.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-source-xml-link.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-source-xml-link.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-source-xml-link.ft
Fri Dec 16 21:02:05 2005
@@ -30,12 +30,22 @@
xmlns:forrest="http://apache.org/forrest/templates/1.0";
format="html" name="content-source-xml-link" inputFormat="xsl" body="true">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="content-source-xml-link-body">
- <a href="{$filename-noext}.source.xml" class="format">
- <img class="skin"
src="{$skin-img-dir}/xmldoc.gif" alt="Source XML - icon" />
- <span class="caption">Source
XML</span>
- </a>
- </xsl:template>
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:variable name="skin-img-dir"
+ select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ <xsl:variable name="filename-noext"
+ select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <a href="{$filename-noext}.source.xml" class="format">
+ <img class="skin" src="{$skin-img-dir}/xmldoc.gif"
+ alt="Source XML - icon" />
+ <span class="caption">Source XML</span>
+ </a>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
</xsl:stylesheet>
</forrest:template>
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-title.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-title.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-title.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-title.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-title.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-title.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-title.ft
Fri Dec 16 21:02:05 2005
@@ -18,31 +18,31 @@
<forrest:contract
xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- name="content-title" type="nugget">
+ name="content-title">
<description>
content-title - Template will output the title (first h1 of the content)
and the sub-title (first h3 of the content).
</description>
- <usage><![CDATA[<forrest:contract name="content-title">
- <forrest:properties contract="content-title">
- <forrest:property name="content-title" nugget="get.body">
- <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
- </forrest:property>
- </forrest:properties>
-</forrest:contract>]]></usage>
+ <usage><![CDATA[<forrest:contract name="siteinfo-meta"
dataURI="cocoon://#{$getRequest}.title.xml"/>
+]]></usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="content-title" inputFormat="xsl" body="true"
head="true">
+ name="content-title" inputFormat="xsl">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="content-title-head" >
- <xsl:param name="content-title"/>
- <xsl:comment>+ |start content-title +</xsl:comment>
+ <xsl:param name="content-title" select="/"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:comment>+ |start content-title +</xsl:comment>
+ <h1>
+ <xsl:value-of select="$content-title/*"/>
+ </h1>
+ <xsl:comment>+ |end content-title +</xsl:comment>
+ </forrest:part>
+ <forrest:part xpath="/html/head">
+ <xsl:comment>+ |start content-title +</xsl:comment>
<xsl:copy-of select="$content-title/*"/>
<xsl:comment>+ |end content-title +</xsl:comment>
- </xsl:template>
- <xsl:template name="content-title-body" >
- <xsl:param name="content-title"/>
- <xsl:comment>+ |start content-title +</xsl:comment>
- <h1><xsl:value-of select="$content-title/*"/></h1>
- <xsl:comment>+ |end content-title +</xsl:comment>
+ </forrest:part>
+ </forrest:content>
</xsl:template>
</xsl:stylesheet>
</forrest:template>
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-xml-link.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-xml-link.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-xml-link.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-xml-link.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-xml-link.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/content-xml-link.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/content-xml-link.ft
Fri Dec 16 21:02:05 2005
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <forrest:contract name="content-xml-link" type="nugget"
+ <forrest:contract name="content-xml-link"
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
<description>
content-xml-link will output an XML link with image to the content.
@@ -25,15 +25,25 @@
<usage><![CDATA[<forrest:contract name="content-xml-link"/>]]></usage>
<forrest:template
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="content-xml-link" inputFormat="xsl" body="true">
- <xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="content-xml-link-body">
- <a href="{$filename-noext}.xml" class="format">
- <img class="skin"
src="{$skin-img-dir}/xmldoc.gif" alt="XML - icon" />
- <span class="caption">XML</span>
- </a>
- </xsl:template>
-
- </xsl:stylesheet>
+ name="content-xml-link" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:variable name="skin-img-dir"
+ select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ <xsl:variable name="filename-noext"
+ select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <a href="{$filename-noext}.pdf" class="format">
+ <img class="skin" src="{$skin-img-dir}/pdfdoc.gif"
+ alt="PDF - icon"/>
+ <span class="caption">PDF</span>
+ </a>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
+ </xsl:stylesheet>
</forrest:template>
</forrest:contract>
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/master.ft
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/master.ft?rev=357294&r1=357293&r2=357294&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/master.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/master.ft
Fri Dec 16 21:02:05 2005
@@ -66,6 +66,8 @@
</xsl:template>
<!-- copy n paste -->
<!--
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part/>
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/nav-section.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/nav-section.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/nav-section.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/nav-section.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/nav-section.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/nav-section.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/nav-section.ft
Fri Dec 16 21:02:05 2005
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract name="nav-section" type="nugget"
+<forrest:contract name="nav-section"
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
<description>
<p>
@@ -30,115 +30,123 @@
</div>
</div>
</description>
- <usage><![CDATA[<forrest:contract name="nav-section">
- <forrest:properties contract="nav-section">
- <forrest:property name="nav-section" nugget="get.navigation">
- <jx:import
uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
- </forrest:property>
- <forrest:property name="nav-section-toc" nugget="get.toc">
- <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
- </forrest:property>
- [<forrest:property name="toc" max-depth="2"/>]
- [<forrest:property name="expanding">false</forrest:property>]
- </forrest:properties>
+ <!--FIXME: Please add describtion about the params used in the contract -->
+ <usage><![CDATA[<forrest:contract name="nav-section"
dataURI="cocoon://#{$cocoon/parameters/getRequest}.toc.xml">
+ [<forrest:property name="nav-section-toc" nugget="get.toc">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
+ </forrest:property>]
+ [<forrest:property name="toc" max-depth="2"/>]
+ [<forrest:property name="expanding">false</forrest:property>]
</forrest:contract>]]></usage>
<forrest:template
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="nav-section" inputFormat="xsl" body="true" head="true">
-
- <xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="nav-section-head">
- <xsl:param name="expanding" select="'true'"/>
- <xsl:if test="$expanding = 'true'">
- <script type="text/javascript" language="javascript"
+ name="nav-section" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:variable name="root"
+ select="$defaultVariables/*/[EMAIL PROTECTED]'root']/@value"/>
+ <xsl:param name="expanding" select="'true'"/>
+ <xsl:param name="nav-section" select="/"/>
+ <xsl:param name="nav-section-toc" select="'test'"/>
+ <xsl:param name="toc" select="'noToc'"/>
+ <xsl:variable name="max-depth">
+ <xsl:choose>
+ <xsl:when test="$toc = 'noToc'">0</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$toc/@max-depth"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:comment>+ |start <xsl:value-of select="$max-depth"/> menu
+</xsl:comment>
+ <xsl:if test="$nav-section/navigation/menu/[EMAIL
PROTECTED]'menu']/ul/li">
+ <xsl:call-template name="menu">
+ <xsl:with-param name="menuRoot"
+ select="$nav-section/navigation/menu"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:comment>+ |end menu +</xsl:comment>
+ </forrest:part>
+ <xsl:if test="$expanding = 'true'">
+ <forrest:part xpath="/html/head">
+ <script type="text/javascript" language="javascript"
src="{$root}themes/menu.js"> </script>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="nav-section-body">
- <xsl:param name="nav-section" select="'test'"/>
- <xsl:param name="nav-section-toc" select="'test'"/>
- <xsl:param name="toc" select="'noToc'"/>
-<xsl:comment>+
- |start menu
- +</xsl:comment>
- <xsl:variable name="max-depth">
- <xsl:choose>
- <xsl:when test="$toc = 'noToc'">0</xsl:when>
- <xsl:otherwise><xsl:value-of
select="$toc/@max-depth"/></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:if test="$nav-section/navigation/menu/[EMAIL
PROTECTED]'menu']/ul/li">
- <xsl:call-template name="menu">
- <xsl:with-param name="root" select="$nav-section/navigation/menu"/>
- <xsl:with-param name="nav-section-toc" select="$nav-section-toc"/>
- <xsl:with-param name="max-depth" select="$max-depth"/>
- </xsl:call-template>
- </xsl:if>
-<xsl:comment>+
- |end menu
- +</xsl:comment>
+ </forrest:part>
+ </xsl:if>
+ </forrest:content>
</xsl:template>
<xsl:template name="menu">
- <xsl:param name="root" value="'test'"/>
- <xsl:param name="nav-section-toc" value="'test'"/>
- <xsl:param name="max-depth" value="0"/>
-<xsl:comment>+
- |start Menu
- +</xsl:comment>
+ <xsl:param name="menuRoot" value="'test'"/>
+ <xsl:comment>+ |start Menu +</xsl:comment>
<div id="nav-section">
<ul>
-<!--menu - inner-->
- <xsl:for-each select = "$root/[EMAIL PROTECTED]'menu']/ul/li">
+ <!--menu - inner-->
+ <xsl:for-each select = "$menuRoot/[EMAIL PROTECTED]'menu']/ul/li">
<xsl:call-template name = "innermenuli" >
<xsl:with-param name="id" select="concat('1.', position())"/>
- <xsl:with-param name="nav-section-toc"
select="$nav-section-toc"/>
- <xsl:with-param name="max-depth" select="$max-depth"/>
</xsl:call-template>
</xsl:for-each>
</ul>
</div>
</xsl:template>
-
<xsl:template name="innermenuli">
<xsl:param name="id"/>
- <xsl:param name="nav-section-toc"/>
- <xsl:param name="max-depth"/>
<xsl:variable name="tagid">
<xsl:choose>
- <xsl:when
test="descendant-or-self::node()/li/div/@class='current'"><xsl:value-of
select="concat('menu_selected_',$id)"/></xsl:when>
- <xsl:otherwise><xsl:value-of
select="concat('menu_',concat(font,$id))"/></xsl:otherwise>
+ <xsl:when
test="descendant-or-self::node()/li/div/@class='current'">
+ <xsl:value-of select="concat('menu_selected_',$id)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat('menu_',concat(font,$id))"/>
+ </xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="selected">
<xsl:choose>
- <xsl:when
test="descendant-or-self::node()/li/div/@class='current'">selected</xsl:when>
+ <xsl:when
test="descendant-or-self::node()/li/div/@class='current'">
+ selected</xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <li class="pagegroup{$selected}" id="{$tagid}Title"><span
onclick="SwitchMenu('{$tagid}')"><xsl:value-of select="h1"/></span>
+ <li class="pagegroup{$selected}" id="{$tagid}Title">
+ <span onclick="SwitchMenu('{$tagid}')">
+ <xsl:value-of select="h1"/>
+ </span>
<ul class="{$selected}menuitemgroup" id="{$tagid}">
<xsl:for-each select= "ul/li">
-
<xsl:choose>
<xsl:when test="a">
- <li class="menuitem"><a href="{a/@href}"
title="{a/@title}"><xsl:value-of select="a" /></a></li>
+ <li class="menuitem">
+ <a href="{a/@href}" title="{a/@title}">
+ <xsl:value-of select="a" />
+ </a>
+ </li>
</xsl:when>
<xsl:when test="div/@class='current'">
<li class="menupage">
- <div class="menupagetitle"><xsl:value-of select="div"
/></div>
+ <div class="menupagetitle">
+ <xsl:value-of select="div" />
+ </div>
<xsl:if test="$max-depth>0">
<ul>
<li class="menupageitemgroup">
- <xsl:for-each select =
"$nav-section-toc//tocitems/tocitem">
+ <xsl:for-each select =
+ "$nav-section-toc//tocitems/tocitem">
<div class="menupageitem">
<xsl:choose>
- <xsl:when
test="string-length(normalize-space(@title))>15">
- <a href="[EMAIL PROTECTED]"
title="{normalize-space(@title)}"><xsl:value-of
+ <xsl:when
+
test="string-length(normalize-space(@title))>15">
+ <a href="[EMAIL PROTECTED]"
+ title="{normalize-space(@title)}">
+ <xsl:value-of
select="substring(@title,0,20)" />...</a>
</xsl:when>
<xsl:otherwise>
- <a href="[EMAIL PROTECTED]"
title="{normalize-space(@title)}">
+ <a href="[EMAIL PROTECTED]"
+ title="{normalize-space(@title)}">
<xsl:value-of select="@title" />
</a>
</xsl:otherwise>
@@ -152,13 +160,11 @@
</xsl:when>
<xsl:otherwise>
<xsl:call-template name = "innermenuli">
- <xsl:with-param name="id" select="concat($id, '.',
position())"/>
- <xsl:with-param name="nav-section-toc"
select="$nav-section-toc"/>
- <xsl:with-param name="max-depth" select="$max-depth"/>
+ <xsl:with-param name="id"
+ select="concat($id, '.', position())"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
-
</xsl:for-each>
</ul>
</li>
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/search-input.ft
(from r357269,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/search-input.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/search-input.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/search-input.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/search-input.ft&r1=357269&r2=357294&rev=357294&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/search-input.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/search-input.ft
Fri Dec 16 21:02:05 2005
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract name="search-input" type="nugget"
+<forrest:contract name="search-input"
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
<description>
<p>search-input will output the default search form.</p>
@@ -24,63 +24,65 @@
other words google will search the @domain for the query string.</p>
</description>
<usage><![CDATA[<forrest:contract name="search-input">
- <forrest:properties contract="search-input">
- <forrest:property
name="search-lucene">lucene-search.html</forrest:property>
- <forrest:property name="search-input">
- <search name="MyProject" domain="mydomain" provider="google"/>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="search-lucene">lucene-search.html</forrest:property>
+ <forrest:property name="search-input">
+ <search name="MyProject" domain="mydomain" provider="google"/>
+ </forrest:property>
</forrest:contract>]]></usage>
<forrest:template
xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="search-input" inputFormat="xsl" body="true" head="false">
-
- <xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <!--FIXME: IMO each search provider should provide a form.
This form should be refactored into
+ name="search-input" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <!--FIXME: IMO each search provider should provide a form. This form
should be refactored into
a meta-search from-->
- <xsl:template name="search-input-body">
- <xsl:param name="search-lucene" select="'lucene-search.html'"/>
- <xsl:param name="search-input"/>
-<xsl:comment>+
- |start Search
- +</xsl:comment>
- <div class="search-input">
- <xsl:choose>
- <xsl:when test="$search-input/search/@provider = 'lucene'">
- <!-- Lucene search -->
- <form method="get" action="{$root}{$search-lucene}">
- <div id="search-field"> <input type="text" id="query"
- name="queryString" size="25"
- value="Search the site with
{$search-input/search/@provider}:"
- onFocus="getBlank (this, 'Search the site with
{$search-input/search/@provider}:');"/>
-  </div>
- <div
id="search-submit">
-
<input type="submit" value="Search" name="Search" i18n:attr="value"/>
- </div>
- </form>
- </xsl:when>
- <xsl:otherwise>
- <form method="get" action="http://www.google.com/search";>
- <div id="search-hidden">
- <input type="hidden" name="sitesearch"
- value="{$search-input/search/@domain}"/>
- </div>
- <div id="search-field">
- <input type="text" id="query" name="q" size="25"/>
- </div>
- <div id="search-submit">
- <input type="submit" value="Search" name="Search"
i18n:attr="value"/>
- </div>
- </form>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:param name="search-lucene" select="'lucene-search.html'"/>
+ <xsl:param name="search-input"/>
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:variable name="root" select="$defaultVariables/*/[EMAIL
PROTECTED]'root']/@value"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:comment>+ |start Search +</xsl:comment>
+ <div class="search-input">
+ <xsl:choose>
+ <xsl:when test="$search-input/search/@provider = 'lucene'">
+ <!-- Lucene search -->
+ <form method="get" action="{$root}{$search-lucene}">
+ <div id="search-field"> <input type="text" id="query"
+ name="queryString" size="25"
+ value="Search the site with
{$search-input/search/@provider}:"
+ onFocus="getBlank (this, 'Search the site with
{$search-input/search/@provider}:');"/>
+  </div>
+ <div id="search-submit">
+ <input type="submit" value="Search" name="Search"
+ i18n:attr="value"/>
+ </div>
+ </form>
+ </xsl:when>
+ <xsl:otherwise>
+ <form method="get" action="http://www.google.com/search";>
+ <div id="search-hidden">
+ <input type="hidden" name="sitesearch"
+ value="{$search-input/search/@domain}"/>
+ </div>
+ <div id="search-field">
+ <input type="text" id="query" name="q" size="25"/>
+ </div>
+ <div id="search-submit">
+ <input type="submit" value="Search" name="Search"
+ i18n:attr="value"/>
+ </div>
+ </form>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
-<xsl:comment>+
- |end search
- +</xsl:comment>
- </xsl:template>
- </xsl:stylesheet>
+ <xsl:comment>+ |end search +</xsl:comment>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
+ </xsl:stylesheet>
</forrest:template>
</forrest:contract>
Modified: forrest/trunk/main/template-sites/v3/src/documentation/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/sitemap.xmap?rev=357294&r1=357293&r2=357294&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v3/src/documentation/sitemap.xmap
(original)
+++ forrest/trunk/main/template-sites/v3/src/documentation/sitemap.xmap Fri Dec
16 21:02:05 2005
@@ -29,7 +29,8 @@
</map:actions>
<map:transformers default="xslt">
<map:transformer logger="sitemap.transformer.jx" name="jx"
- pool-max="16"
src="org.apache.cocoon.transformation.JXTemplateTransformer" />
+ pool-max="16"
+ src="org.apache.cocoon.transformation.JXTemplateTransformer" />
<map:transformer name="dispatcher"
src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" />
</map:transformers>
@@ -37,6 +38,24 @@
<map:selector logger="sitemap.selector.parameter" name="parameter"
src="org.apache.cocoon.selection.ParameterSelector" />
</map:selectors>
+
+ <map:serializers>
+ <map:serializer logger="sitemap.serializer.xhtml"
+ mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64"
+ pool-min="2"
+ src="org.apache.cocoon.serialization.XMLSerializer">
+ <doctype-public>
+ -//W3C//DTD XHTML 1.0 Strict//EN
+ </doctype-public>
+ <doctype-system>
+ http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
+ </doctype-system>
+ <encoding>UTF-8</encoding>
+ <indent>yes</indent>
+ <omit-xml-declaration>no</omit-xml-declaration>
+ <standalone>no</standalone>
+ </map:serializer>
+ </map:serializers>
</map:components>
<map:resources>
@@ -84,7 +103,7 @@
<map:parameter name="hooksTransformer"
value="lm://hooks-to-html.xsl" />
</map:transform>
- <map:serialize type="html" />
+ <map:serialize type="xhtml" />
</map:match>
<map:match pattern="**.xml">
<map:call resource="transform-to-document">
