forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [10/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...
Date Thu, 27 Aug 2009 12:07:47 GMT
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-theme-switcher.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-theme-switcher.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/branding-theme-switcher.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-theme-switcher.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,42 @@
   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="branding-theme-switcher">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="branding-theme-switcher">
   <description>
     <p>
-      <strong>branding-theme-switcher</strong> provides a way to switch the
-      underlying stylesheets (b).
-    </p>
+    <strong>branding-theme-switcher</strong>provides a way to switch the
+    underlying stylesheets (b).</p>
     <pre class="code">
 <![CDATA[A theme is a presentation layer that provides an aggregation of
 a) theme structure information (*.fv)
 b) theme style information (*.css & *.png|jpg|gif|...)
 c) theme functionality (*.js & *.ft)]]>
-    </pre>
-    <p>
-      A "real" theme switcher would change a/b/c.
-    </p>
 
-    <p>
-      A "real" color-theme switcher should also provide a possibility to change
-      each color with a WEB-GUI.
-    </p>
+
+    
+</pre>
+    <p>A "real" theme switcher would change a/b/c.</p>
+    <p>A "real" color-theme switcher should also provide a possibility to
+    change each color with a WEB-GUI.</p>
     <div class="note">
       <div class="label">Note</div>
-      <div class="content">
-        branding-theme-switcher-profiler and branding-theme-switcher-defaultTheme are required!<br/>
-        branding-theme-switcher-profiler {true|false} only works on the defaultTheme.<br/>
-        normally you are not using an "a link" (branding-theme-switcher-a) and a "selectbox" 
-        (branding-theme-switcher-select) switcher at the same time in the same position, so uncomment the one you want.
-      </div>
+      <div class="content">branding-theme-switcher-profiler and
+      branding-theme-switcher-defaultTheme are required! 
+      <br />branding-theme-switcher-profiler {true|false} only works on the
+      defaultTheme. 
+      <br />normally you are not using an "a link" (branding-theme-switcher-a)
+      and a "selectbox" (branding-theme-switcher-select) switcher at the same
+      time in the same position, so uncomment the one you want.</div>
     </div>
-    <p>
-      In combination with the branding-theme-profiler this contract provides a
-      quick way to create new themes. The default theme can have unlimited color
-      derivatives. If you turn on the color profiling this contract will
-      activate the default theme in combination with the profiling styles.
-    </p>
+    <p>In combination with the branding-theme-profiler this contract provides a
+    quick way to create new themes. The default theme can have unlimited color
+    derivatives. If you turn on the color profiling this contract will activate
+    the default theme in combination with the profiling styles.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="branding-theme-switcher">
+    <![CDATA[<forrest:contract name="branding-theme-switcher">
   <!-- branding-theme-switcher-profiler and branding-theme-switcher-defaultTheme are required -->
   <!-- branding-theme-switcher-profiler {true|false} only works on the defaultTheme -->
   <forrest:property name="branding-theme-switcher-profiler" activated="true"/>
@@ -66,50 +61,55 @@
   <!--<forrest:property name="branding-theme-switcher-a" seperator="|" caption="Theme switcher: "/>-->
   <!--<forrest:property name="branding-theme-switcher-select" caption="Theme switcher: "/>-->
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="branding-theme-switcher" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
+  name="branding-theme-switcher" 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="branding-theme-switcher-defaultTheme" />
       <xsl:param name="branding-theme-switcher-profiler" />
-      <xsl:param name="branding-theme-switcher-a" select="'false'"/>
-      <xsl:param name="branding-theme-switcher-select" select="'false'"/>
-      <xsl:variable name="seperator" select="$branding-theme-switcher-a/@seperator"/>
-      <xsl:variable name="caption" select="$branding-theme-switcher-a/@caption"/>
-      <xsl:variable name="captionSelect" select="$branding-theme-switcher-select/@caption"/>
-      <xsl:variable name="defaultTheme" select="$branding-theme-switcher-defaultTheme/@defaultTheme"/>
-      <xsl:variable name="profilerActivated" select="$branding-theme-switcher-profiler/@activated"/>
-      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+      <xsl:param name="branding-theme-switcher-a" select="'false'" />
+      <xsl:param name="branding-theme-switcher-select" select="'false'" />
+      <xsl:variable name="seperator"
+      select="$branding-theme-switcher-a/@seperator" />
+      <xsl:variable name="caption"
+      select="$branding-theme-switcher-a/@caption" />
+      <xsl:variable name="captionSelect"
+      select="$branding-theme-switcher-select/@caption" />
+      <xsl:variable name="defaultTheme"
+      select="$branding-theme-switcher-defaultTheme/@defaultTheme" />
+      <xsl:variable name="profilerActivated"
+      select="$branding-theme-switcher-profiler/@activated" />
+      <xsl:variable name="root"
+      select="$defaultVariables/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
-<script type="text/javascript" 
-                    src="{$root}themes/cssStyleSwitcher.js">&#160;</script>
-<script type="text/javascript"> 
-                    initBrandingThemeSwitcher('<xsl:value-of 
-                    select="$defaultTheme"/>','<xsl:value-of 
-                    select="$profilerActivated"/>'); </script>
+            <script type="text/javascript"
+            src="{$root}themes/cssStyleSwitcher.js">&#160;</script>
+            <script type="text/javascript">initBrandingThemeSwitcher(' 
+            <xsl:value-of select="$defaultTheme" />',' 
+            <xsl:value-of select="$profilerActivated" />');</script>
           </forrest:part>
           <forrest:part>
-            <xsl:if test="$branding-theme-switcher-a!='false'">xx
-            <xsl:value-of select="$caption"/>
-              <span id="theme-switcher-dyn-a">dynamic theme switcher links</span>
-<script type="text/javascript"> 
-              initASwitcher('theme-switcher-dyn-a','<xsl:value-of 
-              select="$seperator"/>'); </script>
-            </xsl:if>
+            <xsl:if test="$branding-theme-switcher-a!='false'">xx 
+            <xsl:value-of select="$caption" />
+            <span id="theme-switcher-dyn-a">dynamic theme switcher links</span>
+            <script type="text/javascript">
+            initASwitcher('theme-switcher-dyn-a',' 
+            <xsl:value-of select="$seperator" />');</script></xsl:if>
             <xsl:if test="$branding-theme-switcher-select!='false'">
               <div class="theme-switcher-dyn">
                 <form action="">
-                  <xsl:value-of select="$captionSelect"/>
-                  <select id="themeSwitcherSelect" 
+                  <xsl:value-of select="$captionSelect" />
+                  <select id="themeSwitcherSelect"
                   onchange="switchThemeSelect(this);">
                     <option value="-1">Select a theme</option>
                   </select>
                 </form>
-<script type="text/javascript"> 
-                initSelectSwitcher('themeSwitcherSelect'); </script>
+                <script type="text/javascript">
+                initSelectSwitcher('themeSwitcherSelect');</script>
               </div>
             </xsl:if>
           </forrest:part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/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/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/content-abstract.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/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,25 +15,24 @@
   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="content-abstract">
-  <description>
-    content-abstract will output the abstract of the content.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="content-abstract">
+  <description>content-abstract will output the abstract of the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-abstract" inputFormat="xsl" >
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  name="content-abstract" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:comment>+ |start content-abstract +</xsl:comment>
             <xsl:copy>
-              <xsl:apply-templates select="//div[@class='abstract']"/>
+              <xsl:apply-templates select="//div[@class='abstract']" />
             </xsl:copy>
             <xsl:comment>+ |end content-abstract +</xsl:comment>
           </forrest:part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-author.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-author.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/content-author.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-author.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,30 +15,24 @@
   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="content-author">
-  <description>
-    content-author will output the author of the content.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="content-author">
+  <description>content-author will output the author of the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-author"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="content-author"/>]]>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-author" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="content-author-body"/>
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="content-author-body" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-        <xsl:comment>+
-	    |start content-author
-	    +</xsl:comment>
-        <xsl:copy-of select="div[@id='content']/div[@class='author']"/>
-        <xsl:comment>+
-    |end content-author
-    +</xsl:comment>
+            <xsl:comment>+ |start content-author +</xsl:comment>
+            <xsl:copy-of select="div[@id='content']/div[@class='author']" />
+            <xsl:comment>+ |end content-author +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-authors.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-authors.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/content-authors.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-authors.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,32 +16,32 @@
   limitations under the License.
 -->
 <forrest:contract name="content-authors"
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-authors will output the authors of the content.
-  </description>
+xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-authors will output the authors of the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-authors" 
+    <![CDATA[<forrest:contract name="content-authors" 
           dataURI="cocoon://#{$getRequest}.authors.xml"/>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-authors" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  name="content-authors" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:comment>+ |start content-authors +</xsl:comment>
             <xsl:call-template name="content-author-processing">
-              <xsl:with-param name="authors" 
-                select="div[@id='content-authors']"/>
+              <xsl:with-param name="authors"
+              select="div[@id='content-authors']" />
             </xsl:call-template>
             <xsl:comment>+ |end content-authors +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template name="content-author-processing">
-        <xsl:param name="authors"/>
+        <xsl:param name="authors" />
         <xsl:if test="$authors/div[@class='author']">
           <p>
             <xsl:for-each select="$authors/div[@class='author']">
@@ -49,10 +49,11 @@
                 <xsl:when test="position()=1">by</xsl:when>
                 <xsl:otherwise>,</xsl:otherwise>
               </xsl:choose>
-<xsl:text>
-              </xsl:text>
+              <xsl:text>
+              
+</xsl:text>
               <span class="name">
-                <xsl:value-of select="./div[@class='name']/text()"/>
+                <xsl:value-of select="./div[@class='name']/text()" />
               </span>
             </xsl:for-each>
           </p>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-css.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-css.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/content-css.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-css.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,48 +15,38 @@
   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="content-css">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="content-css">
   <description>
-    <warning>
-      Use at your own risk!!!
-    </warning>
-
-    <note>
-      Allowing and activating abitrary styles has its danger. The problem is
-      that Forrest attempts to provide a unified output formats regardless of
-      the input format. If you use this contract and allow arbitrary styles
-      through then forrest loose the ability to do this because user can create
-      "headings" by making text larger and bold, for example. Forrest has no way
-      of knowing this is supposed to be a heading and therefore cannot render it
-      as such.
-    </note>
-
-    <p>
-      This contract picks up the style element of the input and pass it through
-      to the output.
-    </p>
+    <warning>Use at your own risk!!!</warning>
+    <note>Allowing and activating abitrary styles has its danger. The problem
+    is that Forrest attempts to provide a unified output formats regardless of
+    the input format. If you use this contract and allow arbitrary styles
+    through then forrest loose the ability to do this because user can create
+    "headings" by making text larger and bold, for example. Forrest has no way
+    of knowing this is supposed to be a heading and therefore cannot render it
+    as such.</note>
+    <p>This contract picks up the style element of the input and pass it
+    through to the output.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="content-css" 
+    <![CDATA[<forrest:contract name="content-css" 
   dataURI="cocoon://#{$getRequest}.body.xml"/>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-css" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  name="content-css" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
-            <xsl:apply-templates select="//style"/>
+            <xsl:apply-templates select="//style" />
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template match="style">
         <style type="text/css">
-          <xsl:value-of select="."/>
+          <xsl:value-of select="." />
         </style>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-feeder.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-feeder.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/content-feeder.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-feeder.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,45 +16,43 @@
   limitations under the License.
 -->
 <forrest:contract name="content-feeder"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-feeder will output the html information retrieved by the feeder
-    plugin (needs to be installed!).
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-feeder will output the html information retrieved by the
+  feeder plugin (needs to be installed!).</description>
   <usage>
-<![CDATA[<forrest:contract name="content-feeder" dataUri="/feeds/somefeed.rss.xml"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    <![CDATA[<forrest:contract name="content-feeder" dataUri="/feeds/somefeed.rss.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-feeder" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:variable name="content-feeder" select="/"/>
-      <xsl:template match="/" >
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:variable name="content-feeder" select="/" />
+      <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:apply-templates select="$content-feeder/document"/>
+            <xsl:apply-templates select="$content-feeder/document" />
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template match="document">
         <div id="content-feeder">
-          <xsl:apply-templates select="body/section"/>
+          <xsl:apply-templates select="body/section" />
         </div>
       </xsl:template>
       <xsl:template match="section">
         <div class="channelTitle">
-          <xsl:value-of select="title"/>
+          <xsl:value-of select="title" />
         </div>
         <div class="channelItems">
-          <xsl:apply-templates select="p[@class]"/>
+          <xsl:apply-templates select="p[@class]" />
         </div>
       </xsl:template>
-      <xsl:template match="link"><a href="{@href}">...more</a>
+      <xsl:template match="link">
+        <a href="{@href}">...more</a>
       </xsl:template>
       <xsl:template match="p[@class]">
         <div class="{@class}">
-          <xsl:apply-templates/>
+          <xsl:apply-templates />
         </div>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-include-html.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-include-html.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/content-include-html.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-include-html.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,32 +16,26 @@
   limitations under the License.
 -->
 <forrest:contract name="content-include-html" type="nugget"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-include-html retrieves the content from a Forrest generated HTML
-    document and includes the current document.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-include-html retrieves the content from a Forrest
+  generated HTML document and includes the current document.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-include-html">
+    <![CDATA[<forrest:contract name="content-include-html">
     <forrest:properties contract="content-include-html">
       <forrest:property name="content-include-html" nugget="get.nugget.include.html">
         <jx:import uri="/path/to/a/document.html"/>
       </forrest:property>
     </forrest:properties>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="html" 
-    name="content-include-html" 
-    inputFormat="xsl" 
-    body="true" 
-    head="false">
-    <xsl:stylesheet version="1.1" 
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-include-html-body" >
-        <xsl:param name="content-include-html"/>
-        <xsl:copy-of select="$content-include-html//div[@id='content']/*"/>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="content-include-html" inputFormat="xsl" body="true"
+  head="false">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="content-include-html-body">
+        <xsl:param name="content-include-html" />
+        <xsl:copy-of select="$content-include-html//div[@id='content']/*" />
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-ls-contracts.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-ls-contracts.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/content-ls-contracts.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-ls-contracts.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,14 +16,12 @@
   limitations under the License.
 -->
 <forrest:contract name="content-ls-contracts" type="nugget"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-ls-contracts will output the contracts provided by the themer plugin
-    (the org.apache.forrest.plugin.input.viewHelper.xhtml.ls needs to be
-    installed!).
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-ls-contracts will output the contracts provided by the
+  themer plugin (the org.apache.forrest.plugin.input.viewHelper.xhtml.ls needs
+  to be installed!).</description>
   <usage>
-<![CDATA[<forrest:contract name="content-ls-contracts">
+    <![CDATA[<forrest:contract name="content-ls-contracts">
   <forrest:properties contract="content-ls-contracts">
     <forrest:property name="content-ls-contracts" 
       nugget="get.nugget.ls.contracts">
@@ -33,83 +31,89 @@
       description="false" usage="true" path="false"/>
   </forrest:properties>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="content-ls-contracts" inputFormat="xsl" body="true" head="false">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-ls-contracts-body" >
-        <xsl:param name="content-ls-contracts"/>
-        <xsl:param name="content-ls-contracts-config"/>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="content-ls-contracts" inputFormat="xsl" body="true"
+  head="false">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="content-ls-contracts-body">
+        <xsl:param name="content-ls-contracts" />
+        <xsl:param name="content-ls-contracts-config" />
         <div id="content-ls-contracts">
           <xsl:apply-templates select="$content-ls-contracts/document">
-            <xsl:with-param name="content-ls-contracts-config" select="$content-ls-contracts-config"/>
+            <xsl:with-param name="content-ls-contracts-config"
+            select="$content-ls-contracts-config" />
           </xsl:apply-templates>
         </div>
       </xsl:template>
       <xsl:template match="document">
-        <xsl:param name="content-ls-contracts-config"/>
+        <xsl:param name="content-ls-contracts-config" />
         <xsl:if test="normalize-space(header/title)!=''">
           <h1>
-            <xsl:value-of select="header/title"/>
+            <xsl:value-of select="header/title" />
           </h1>
           <xsl:apply-templates select="body/section">
-            <xsl:with-param name="content-ls-contracts-config" select="$content-ls-contracts-config"/>
+            <xsl:with-param name="content-ls-contracts-config"
+            select="$content-ls-contracts-config" />
           </xsl:apply-templates>
         </xsl:if>
       </xsl:template>
       <xsl:template match="section">
-        <xsl:param name="content-ls-contracts-config"/>
-<!-- count the number of section in the ancestor-or-self axis to compute
-	         the title element name later on -->
-        <xsl:variable name="sectiondepth" select="count(ancestor-or-self::section)"/>
-<!-- generate a title element, level 1 -> h3, level 2 -> h4 and so on... -->
+        <xsl:param name="content-ls-contracts-config" />
+        <!-- count the number of section in the ancestor-or-self axis to compute
+                 the title element name later on -->
+        <xsl:variable name="sectiondepth"
+        select="count(ancestor-or-self::section)" />
+        <!-- generate a title element, level 1 -> h3, level 2 -> h4 and so on... -->
         <xsl:element name="{concat('h',$sectiondepth + 2)}">
-          <xsl:value-of select="title"/>
+          <xsl:value-of select="title" />
         </xsl:element>
         <xsl:apply-templates select="*[not(self::title)]">
-          <xsl:with-param name="content-ls-contracts-config" select="$content-ls-contracts-config"/>
+          <xsl:with-param name="content-ls-contracts-config"
+          select="$content-ls-contracts-config" />
         </xsl:apply-templates>
       </xsl:template>
       <xsl:template match="source">
         <pre class="code">
-          <xsl:apply-templates/>
-        </pre>
+          
+<xsl:apply-templates />
+        
+</pre>
       </xsl:template>
       <xsl:template match="p[@class='file']">
-        <xsl:param name="content-ls-contracts-config"/>
+        <xsl:param name="content-ls-contracts-config" />
         <xsl:if test="$content-ls-contracts-config[@file='true']">
           <p class="{@class}">
-            <xsl:apply-templates/>
+            <xsl:apply-templates />
           </p>
         </xsl:if>
       </xsl:template>
       <xsl:template match="p[@class='description']">
-        <xsl:param name="content-ls-contracts-config"/>
+        <xsl:param name="content-ls-contracts-config" />
         <xsl:if test="$content-ls-contracts-config[@description='true']">
           <p class="{@class}">
-            <xsl:apply-templates/>
+            <xsl:apply-templates />
           </p>
         </xsl:if>
       </xsl:template>
       <xsl:template match="p[@class='usage']">
-        <xsl:param name="content-ls-contracts-config"/>
+        <xsl:param name="content-ls-contracts-config" />
         <xsl:if test="$content-ls-contracts-config[@usage='true']">
           <p class="{@class}">
-            <xsl:apply-templates/>
+            <xsl:apply-templates />
           </p>
         </xsl:if>
       </xsl:template>
       <xsl:template match="p[@class='realpath']">
-        <xsl:param name="content-ls-contracts-config"/>
+        <xsl:param name="content-ls-contracts-config" />
         <xsl:if test="$content-ls-contracts-config[@realpath='true']">
           <p class="{@class}">
-            <xsl:apply-templates/>
+            <xsl:apply-templates />
           </p>
         </xsl:if>
       </xsl:template>
-      <xsl:template match="p"/>
+      <xsl:template match="p" />
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main-lenya.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main-lenya.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/content-main-lenya.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main-lenya.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,15 +15,13 @@
   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="content-main-lenya" type="nugget">
-  <description>
-    content-main-lenya - Template will output the content-main-lenya.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="content-main-lenya" type="nugget">
+  <description>content-main-lenya - Template will output the
+  content-main-lenya.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-main-lenya">
+    <![CDATA[<forrest:contract name="content-main-lenya">
   <forrest:properties contract="content-main-lenya">
     <forrest:property name="content-main-lenya" 
       nugget="get.nugget.lenya.content.main">
@@ -31,19 +29,17 @@
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="html" name="content-main-lenya" inputFormat="xsl" body="true" head="false">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-main-lenya-body" >
-        <xsl:param name="content-main-lenya"/>
-        <xsl:comment>+
-	    |start content-main-lenya
-	    +</xsl:comment>
-        <xsl:copy-of select="$content-main-lenya//div[@id='body']/*"/>
-        <xsl:comment>+
-    |end content-main-lenya
-    +</xsl:comment>
+  format="html" name="content-main-lenya" inputFormat="xsl" body="true"
+  head="false">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="content-main-lenya-body">
+        <xsl:param name="content-main-lenya" />
+        <xsl:comment>+ |start content-main-lenya +</xsl:comment>
+        <xsl:copy-of select="$content-main-lenya//div[@id='body']/*" />
+        <xsl:comment>+ |end content-main-lenya +</xsl:comment>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main.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/content-main.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main.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,23 @@
   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="content-main">
-  <description>
-    content-main - Template will output the content-main.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="content-main">
+  <description>content-main - Template will output the
+  content-main.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-main" 
+    <![CDATA[<forrest:contract name="content-main" 
             dataURI="cocoon://#{$getRequest}.body.xml"/>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-main" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  name="content-main" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:comment>+ |start content-main +</xsl:comment>
-            <xsl:copy-of 
-              select="//div[@id='content-main']/*"/>
+            <xsl:copy-of select="//div[@id='content-main']/*" />
             <xsl:comment>+ |end content-main +</xsl:comment>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-minitoc.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-minitoc.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/content-minitoc.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-minitoc.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,34 +16,33 @@
   limitations under the License.
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-minitoc">
-  <description>
-    content-minitoc - 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). @min-sections - Minimum required to create a TOC. @location
-    ("page","menu","page,menu", "none") - Where to show the TOC.
-  </description>
+name="content-minitoc">
+  <description>content-minitoc - 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). @min-sections - Minimum required to create a TOC.
+  @location ("page","menu","page,menu", "none") - Where to show the
+  TOC.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-minitoc" dataURI="cocoon://#{$getRequest}.toc.xml">
+    <![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" 
-    name="content-minitoc" inputFormat="xsl" >
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="content-minitoc-toc" select="/"/>
-      <xsl:param name="content-minitoc-conf"/>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-minitoc" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <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">
+              <xsl:if test="count(tocitems/tocitem) &gt;= $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="tocroot" select="tocitems" />
                   </xsl:call-template>
                 </div>
               </xsl:if>
@@ -53,20 +52,22 @@
         </forrest:content>
       </xsl:template>
       <xsl:template name="content-minitoc-processing">
-        <xsl:param name="tocroot"/>
-        <xsl:if 
-          test="count($tocroot/tocitem) >= $content-minitoc-conf/@min-sections">
+        <xsl:param name="tocroot" />
+        <xsl:if test="count($tocroot/tocitem) &gt;= $content-minitoc-conf/@min-sections">
+
           <xsl:if test="contains($content-minitoc-conf/@location,'page')">
             <ul class="minitoc">
               <xsl:for-each select="$tocroot/tocitem">
-                <li><a href="{@href}">
-                  <xsl:value-of select="@title"/></a>
-                  <xsl:if 
-                    test="@level&#60;$content-minitoc-conf/@max-depth+1">
+                <li>
+                  <a href="{@href}">
+                    <xsl:value-of select="@title" />
+                  </a>
+                  <xsl:if test="@level&#60;$content-minitoc-conf/@max-depth+1">
                     <xsl:call-template name="content-minitoc-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/html/content-motd-page.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-motd-page.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/content-motd-page.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-motd-page.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,33 @@
   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="content-motd-page">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="content-motd-page">
   <description>
-    <p>
-      Message of the day (MOTD).
-      <br/>
-      If the optional &lt;motd&gt; element is used, then messages will be
-      appended depending on the URI string pattern.
-    </p>
-
-    <p>
-      motd-option :
-      <br/>
-      Each option will match a pattern and apply its text. The "pattern"
-      attribute specifies the pattern to be matched. This can be a specific
-      page, or a general pattern to match a set of pages, e.g. everything in the
-      "samples" directory.
-    </p>
-
-    <p>
-      motd-title :
-      <br/>
-      This text will be added in brackets after the &lt;html>&lt;title> and this
-      can be empty.
-    </p>
-
-    <p>
-      motd-page :
-      <br/>
-      This text will be added in a panel on the face of the page, with the
-      "motd-page-url" being the hyperlink "More".
-    </p>
-
-    <p>
-      Values for the "location" attribute are:
-    </p>
+    <p>Message of the day (MOTD). 
+    <br />If the optional &lt;motd&gt; element is used, then messages will be
+    appended depending on the URI string pattern.</p>
+    <p>motd-option : 
+    <br />Each option will match a pattern and apply its text. The "pattern"
+    attribute specifies the pattern to be matched. This can be a specific page,
+    or a general pattern to match a set of pages, e.g. everything in the
+    "samples" directory.</p>
+    <p>motd-title : 
+    <br />This text will be added in brackets after the
+    &lt;html&gt;&lt;title&gt; and this can be empty.</p>
+    <p>motd-page : 
+    <br />This text will be added in a panel on the face of the page, with the
+    "motd-page-url" being the hyperlink "More".</p>
+    <p>Values for the "location" attribute are:</p>
     <ul>
-      <li>page : on the face of the page, e.g. in the spare space of </li>
+      <li>page : on the face of the page, e.g. in the spare space of</li>
       <li>the toc alt : at the bottom of the left-hand navigation panel</li>
-      <li>both : both </li>
+      <li>both : both</li>
     </ul>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="content-motd-page">
+    <![CDATA[<forrest:contract name="content-motd-page">
   <forrest:property name="content-motd-page">
     <motd>
       <motd-option pattern="samples/sample.html">
@@ -80,13 +61,15 @@
     </motd>
   </forrest:property>
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-motd-page" 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="content-motd-page"/>
-      <xsl:variable name="path" select="$defaultVariables/*[@name='path']/@value"/>
+  name="content-motd-page" 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="content-motd-page" />
+      <xsl:variable name="path"
+      select="$defaultVariables/*[@name='path']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -95,14 +78,20 @@
               <xsl:for-each select="$content-motd-page/motd/motd-option">
                 <xsl:if test="contains($path, @pattern)">
                   <div class="motd-area">
-                    <xsl:value-of select="motd-page"/>
+                    <xsl:value-of select="motd-page" />
                     <xsl:if test="motd-page-url">
-<xsl:text> (</xsl:text><a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="motd-page-url"/>
-                      </xsl:attribute>
-                      <i18n:text >More</i18n:text></a>
-<xsl:text>)</xsl:text>
+                      <xsl:text>
+ (
+</xsl:text>
+                      <a>
+                        <xsl:attribute name="href">
+                          <xsl:value-of select="motd-page-url" />
+                        </xsl:attribute>
+                        <i18n:text>More</i18n:text>
+                      </a>
+                      <xsl:text>
+)
+</xsl:text>
                     </xsl:if>
                   </div>
                 </xsl:if>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-odt-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-odt-link.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/content-odt-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-odt-link.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,26 +16,29 @@
   limitations under the License.
 -->
 <forrest:contract name="content-odt-link"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-odt-link will output the ODT link with image to the content.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-odt-link will output the ODT link with image to the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-odt-link"/>]]>
-  </usage>
-  <forrest:template
-  	xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  	name="content-odt-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/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
+    <![CDATA[<forrest:contract name="content-odt-link"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-odt-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/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="filename-noext"
+      select="$defaultVariables/*[@name='filename-noext']/@value" />
       <xsl:template match="/">
         <forrest:content>
-          <forrest:part><a href="{$filename-noext}.odt" class="format">
-            <img class="skin" src="{$skin-img-dir}/odt.gif"
-                alt="ODT - icon"/>
-            <span class="caption">ODT</span></a>
+          <forrest:part>
+            <a href="{$filename-noext}.odt" class="format">
+              <img class="skin" src="{$skin-img-dir}/odt.gif"
+              alt="ODT - icon" />
+              <span class="caption">ODT</span>
+            </a>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pdf-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pdf-link.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/content-pdf-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pdf-link.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,26 +16,29 @@
   limitations under the License.
 -->
 <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.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-pdf-link will output the PDF link with image to the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-pdf-link"/>]]>
-  </usage>
-  <forrest:template
-  	xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  	name="content-pdf-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/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
+    <![CDATA[<forrest:contract name="content-pdf-link"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-pdf-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/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="filename-noext"
+      select="$defaultVariables/*[@name='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>
+            <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>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pod-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pod-link.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/content-pod-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pod-link.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,26 +16,29 @@
   limitations under the License.
 -->
 <forrest:contract name="content-pod-link"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-pod-link will output the POD link with image to the content.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-pod-link will output the POD link with image to the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-pod-link"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    <![CDATA[<forrest:contract name="content-pod-link"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-pod-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/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
+    <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/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="filename-noext"
+      select="$defaultVariables/*[@name='filename-noext']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-          <a href="{$filename-noext}.pod" class="format">
-          <img class="skin" src="{$skin-img-dir}/poddoc.png" alt="POD - icon" />
-          <span class="caption">POD</span></a>
+            <a href="{$filename-noext}.pod" class="format">
+              <img class="skin" src="{$skin-img-dir}/poddoc.png"
+              alt="POD - icon" />
+              <span class="caption">POD</span>
+            </a>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-source-xml-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-source-xml-link.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/content-source-xml-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-source-xml-link.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,33 +16,33 @@
   limitations under the License.
 -->
 <forrest:contract name="content-source-xml-link"
-    xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-source-xml-link will output the XML link with image to the original
-    source content of the document. Input plugins should provide the ability to
-    retrieve the original source XML by making a request for *.source.xml, this
-    contract provides a link to that file. If you want to provide a link to the
-    XDoc format of the content use the content-xml-link template.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-source-xml-link will output the XML link with image to
+  the original source content of the document. Input plugins should provide the
+  ability to retrieve the original source XML by making a request for
+  *.source.xml, this contract provides a link to that file. If you want to
+  provide a link to the XDoc format of the content use the content-xml-link
+  template.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-source-xml-link"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    <![CDATA[<forrest:contract name="content-source-xml-link"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="html" name="content-source-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/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="filename-noext" 
-          select="$defaultVariables/*[@name='filename-noext']/@value"/>
+    <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/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="filename-noext"
+      select="$defaultVariables/*[@name='filename-noext']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/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>
+            <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>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/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/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/content-title.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/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,34 +15,31 @@
   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="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>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" 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" dataURI="cocoon://#{$getRequest}.title.xml"/>
+    <![CDATA[<forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
 ]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-title" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="content-title" select="/"/>
+  name="content-title" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="content-title" select="/" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:comment>+ |start content-title +</xsl:comment>
             <h1 class="content-title">
-              <xsl:value-of select="$content-title/*"/>
+              <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:copy-of select="$content-title/*" />
             <xsl:comment>+ |end content-title +</xsl:comment>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-txt-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-txt-link.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/content-txt-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-txt-link.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,28 +16,29 @@
   limitations under the License.
 -->
 <forrest:contract name="content-txt-link"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    content-txt-link will output the TXT link with image to the content.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-txt-link will output the TXT link with image to the
+  content.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-txt-link"/>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-   name="content-txt-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/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
+    <![CDATA[<forrest:contract name="content-txt-link"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-txt-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/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="filename-noext"
+      select="$defaultVariables/*[@name='filename-noext']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/body">
-      <a href="{$filename-noext}.txt" class="format">
-        <img class="skin" 
-          src="{$skin-img-dir}/txtdoc.png" alt="TXT - icon" />
-        <span
-          class="caption">TXT</span></a>
+            <a href="{$filename-noext}.txt" class="format">
+              <img class="skin" src="{$skin-img-dir}/txtdoc.png"
+              alt="TXT - icon" />
+              <span class="caption">TXT</span>
+            </a>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-xml-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-xml-link.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/content-xml-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-xml-link.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,31 +16,30 @@
   limitations under the License.
 -->
 <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. This
-    link will retrieve the content as an XDoc. If you want to retrieve the
-    source use content-source-xml-link.ft.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>content-xml-link will output an XML link with image to the
+  content. This link will retrieve the content as an XDoc. If you want to
+  retrieve the source use content-source-xml-link.ft.</description>
   <usage>
-<![CDATA[<forrest:contract name="content-xml-link"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    <![CDATA[<forrest:contract name="content-xml-link"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   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/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="filename-noext" 
-          select="$defaultVariables/*[@name='filename-noext']/@value"/>
+    <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/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="filename-noext"
+      select="$defaultVariables/*[@name='filename-noext']/@value" />
       <xsl:template match="/">
         <forrest:content>
-          <forrest:part><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>
+          <forrest:part>
+            <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>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericMarkup.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericMarkup.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/genericMarkup.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericMarkup.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,38 +15,34 @@
   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="genericMarkup">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="genericMarkup">
   <description>
-    <p>
-      genericMarkup - Template will output generic markup.
-    </p>
+    <p>genericMarkup - Template will output generic markup.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="genericMarkup">
+    <![CDATA[<forrest:contract name="genericMarkup">
   <forrest:property name="genericMarkup">
     <hr/>
   </forrest:property>
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="genericMarkup" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="genericMarkup"/>
+  name="genericMarkup" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="genericMarkup" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:apply-templates 
-              select="$genericMarkup/*|$genericMarkup/comment()| $genericMarkup/processing-instruction() | $genericMarkup/text()"/>
+            <xsl:apply-templates select="$genericMarkup/*|$genericMarkup/comment()| $genericMarkup/processing-instruction() | $genericMarkup/text()" />
           </forrest:part>
         </forrest:content>
       </xsl:template>
-      <xsl:template 
-        match="@* | * | comment() | processing-instruction() | text()">
+      <xsl:template match="@* | * | comment() | processing-instruction() | text()">
+
         <xsl:copy>
-          <xsl:apply-templates 
-            select="@* | * | comment() | processing-instruction() | text()"/>
+          <xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()" />
         </xsl:copy>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericXhtml.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericXhtml.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/genericXhtml.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericXhtml.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,28 +15,26 @@
   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="genericXhtml">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="genericXhtml">
   <description>
-    <p>
-      genericXhtml - Template will output generic markup.
-    </p>
+    <p>genericXhtml - Template will output generic markup.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="genericXhtml"
+    <![CDATA[<forrest:contract name="genericXhtml"
   dataURI="cocoon://#{$getRequest}.xml"/>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    name="genericXhtml" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="genericXhtml" inputFormat="xsl">
+    <xsl:stylesheet version="1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:copy-of select="xhtml:html/xhtml:body/*"/>
+            <xsl:copy-of select="xhtml:html/xhtml:body/*" />
           </forrest:part>
           <forrest:part xpath="/html/head">
-            <xsl:copy-of select="xhtml:html/xhtml:head/*"/>
+            <xsl:copy-of select="xhtml:html/xhtml:head/*" />
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/google-analytics.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/google-analytics.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/google-analytics.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/google-analytics.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,41 +16,36 @@
     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="google-analytics">
-    <description>
-        <p>
-            Embeds the necessary Javascript to allow Google Analytics to
-            track website visitors.
-        </p>
-    </description>
-    <usage>
-        Place the following code at the end of your page body, i.e. just 
-        before the &lt;/body&gt; tag.  
-        <![CDATA[
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="google-analytics">
+  <description>
+    <p>Embeds the necessary Javascript to allow Google Analytics to track
+    website visitors.</p>
+  </description>
+  <usage>Place the following code at the end of your page body, i.e. just
+  before the &lt;/body&gt; tag. 
+<![CDATA[
 <forrest:contract name="google-analytics">
   <forrest:property name="google-analytics-uacct">GOOGLE_ANALYTICS_KEY</forrest:propery>
 </forrest:contract> ]]>
-    </usage>
-    <forrest:template
-        xmlns:forrest="http://apache.org/forrest/templates/1.0"
-        name="google-analytics" inputFormat="xsl">
-        <xsl:stylesheet version="1.1"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:forrest="http://apache.org/forrest/templates/1.0">
-            <xsl:param name="google-analytics-uacct"/>
-            <xsl:template match="/">
-                <forrest:content>
-                    <forrest:part xpath="/html/body">
-                        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-                        </script>
-                        <script type="text/javascript">
-                          _uacct = "<xsl:value-of select='$google-analytics-uacct'/>";
-                          urchinTracker();
-                        </script>
-                   </forrest:part>
-                </forrest:content>
-            </xsl:template>
-        </xsl:stylesheet>
-    </forrest:template>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="google-analytics" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:forrest="http://apache.org/forrest/templates/1.0">
+      <xsl:param name="google-analytics-uacct" />
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part xpath="/html/body">
+            <script src="http://www.google-analytics.com/urchin.js"
+            type="text/javascript"></script>
+            <script type="text/javascript">_uacct = " 
+            <xsl:value-of select='$google-analytics-uacct' />";
+            urchinTracker();</script>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-form-blank.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-form-blank.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/helper-form-blank.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-form-blank.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,32 +15,31 @@
   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="helper-form-blank">
-<!--NOTE: 
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="helper-form-blank">
+  <!--NOTE: 
   THIS IS JUST AN EXPLANATION!!!-->
   <description>
-    <p>
-      This contract will output a link to the getBlank.js that can be used when
-      working with forms and default values for text fields. See the pelt
-      implementation of the search-input contract, which is using this.
-    </p>
+    <p>This contract will output a link to the getBlank.js that can be used
+    when working with forms and default values for text fields. See the pelt
+    implementation of the search-input contract, which is using this.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="helper-form-blank"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="helper-form-blank"/>]]>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="helper-form-blank" 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/*[@name='root']/@value"/>
+  name="helper-form-blank" 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/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
-<script type="text/javascript" src="{$root}themes/getBlank.js">&#160;</script>
+            <script type="text/javascript" src="{$root}themes/getBlank.js">
+            &#160;</script>
           </forrest:part>
         </forrest:content>
       </xsl:template>



Mime
View raw message