forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [11/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/helper-prototype-ajax.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-prototype-ajax.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-prototype-ajax.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-prototype-ajax.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,35 +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-prototype-ajax">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="helper-prototype-ajax">
   <description>
-    <p>
-      This contract gives basic ajax support with the help of the prototype.js.
-      <br/>
-      The prototype.js offers a framework for javascript.
-      <br/>
-      For details, see the Prototype web site:
-      <a href="http://prototype.conio.net/">http://prototype.conio.net/</a>.
-    </p>
+    <p>This contract gives basic ajax support with the help of the
+    prototype.js. 
+    <br />The prototype.js offers a framework for javascript. 
+    <br />For details, see the Prototype web site: 
+    <a href="http://prototype.conio.net/">http://prototype.conio.net/</a>.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="helper-prototype-ajax"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="helper-prototype-ajax"/>]]>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="helper-prototype-ajax" 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-prototype-ajax" 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/prototype.js"> 
-              &#160;</script>
+            <script type="text/javascript" src="{$root}themes/prototype.js">
+            &#160;</script>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-render-image.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-render-image.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-render-image.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-render-image.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,91 +15,96 @@
   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-render-image">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="helper-render-image">
   <description>
-    <p>
-      helper-render-image is a helper class to be used <strong>only</strong>
-      internally as import/include from within other contracts!
-    </p>
+    <p>helper-render-image is a helper class to be used 
+    <strong>only</strong>internally as import/include from within other
+    contracts!</p>
   </description>
   <usage>
-<![CDATA[internal only!!!
+    <![CDATA[internal only!!!
   
   <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    name="helper-render-image" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="helper-render-image" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="renderlogo">
-        <xsl:param name="name"/>
-        <xsl:param name="url"/>
-        <xsl:param name="logo"/>
-        <xsl:param name="rollover"/>
-        <xsl:param name="width"/>
-        <xsl:param name="height"/>
-        <xsl:param name="root"/>
-        <xsl:param name="description"/>
+        <xsl:param name="name" />
+        <xsl:param name="url" />
+        <xsl:param name="logo" />
+        <xsl:param name="rollover" />
+        <xsl:param name="width" />
+        <xsl:param name="height" />
+        <xsl:param name="root" />
+        <xsl:param name="description" />
         <xsl:variable name="logoSrc">
           <xsl:if test="not(starts-with($logo, 'http://'))">
-            <xsl:value-of select="$root"/>
+            <xsl:value-of select="$root" />
           </xsl:if>
-          <xsl:value-of select="$logo"/>
+          <xsl:value-of select="$logo" />
         </xsl:variable>
         <xsl:variable name="overSrc">
           <xsl:if test="not(starts-with($rollover, 'http://'))">
-            <xsl:value-of select="$root"/>
+            <xsl:value-of select="$root" />
           </xsl:if>
-          <xsl:value-of select="$rollover"/>
+          <xsl:value-of select="$rollover" />
         </xsl:variable>
         <xsl:if test="$rollover">
-<script type="text/javascript" > function 
-            swapImage(name,src){ document[name].src=src; } </script>
-<!--tricking the cli to request the overSrc image--><a href="{$overSrc}">
-<xsl:text> </xsl:text></a>
-        </xsl:if><a href="{$url}">
-        <xsl:if test="$rollover">
-          <xsl:attribute name="onMouseOver">swapImage('<xsl:value-of 
-              select="$name"/>','<xsl:value-of 
-              select="$overSrc"/>');</xsl:attribute>
-          <xsl:attribute name="onMouseOut">swapImage('<xsl:value-of 
-              select="$name"/>','<xsl:value-of 
-              select="$logoSrc"/>');</xsl:attribute>
+          <script type="text/javascript">function swapImage(name,src){
+          document[name].src=src; }</script>
+          <!--tricking the cli to request the overSrc image-->
+          <a href="{$overSrc}">
+            <xsl:text>
+ 
+</xsl:text>
+          </a>
         </xsl:if>
-        <xsl:choose>
-          <xsl:when test="$logo and not($logo = '')">
-            <img alt="{$name}" class="logoImage">
-              <xsl:attribute name="src">
-                <xsl:value-of select="$logoSrc"/>
-              </xsl:attribute>
-              <xsl:if test="$width">
-                <xsl:attribute name="width">
-                  <xsl:value-of select="$width"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="$height">
-                <xsl:attribute name="height">
-                  <xsl:value-of select="$height"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="$description">
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$description"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="$rollover">
-                <xsl:attribute name="name">
-                  <xsl:value-of select="$name"/>
+        <a href="{$url}">
+          <xsl:if test="$rollover">
+            <xsl:attribute name="onMouseOver">swapImage(' 
+            <xsl:value-of select="$name" />',' 
+            <xsl:value-of select="$overSrc" />');</xsl:attribute>
+            <xsl:attribute name="onMouseOut">swapImage(' 
+            <xsl:value-of select="$name" />',' 
+            <xsl:value-of select="$logoSrc" />');</xsl:attribute>
+          </xsl:if>
+          <xsl:choose>
+            <xsl:when test="$logo and not($logo = '')">
+              <img alt="{$name}" class="logoImage">
+                <xsl:attribute name="src">
+                  <xsl:value-of select="$logoSrc" />
                 </xsl:attribute>
-              </xsl:if>
-            </img>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$name"/>
-          </xsl:otherwise>
-        </xsl:choose></a>
+                <xsl:if test="$width">
+                  <xsl:attribute name="width">
+                    <xsl:value-of select="$width" />
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:if test="$height">
+                  <xsl:attribute name="height">
+                    <xsl:value-of select="$height" />
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:if test="$description">
+                  <xsl:attribute name="title">
+                    <xsl:value-of select="$description" />
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:if test="$rollover">
+                  <xsl:attribute name="name">
+                    <xsl:value-of select="$name" />
+                  </xsl:attribute>
+                </xsl:if>
+              </img>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$name" />
+            </xsl:otherwise>
+          </xsl:choose>
+        </a>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/master.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/master.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/master.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/master.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,57 +15,51 @@
   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="master">
-<!--NOTE: 
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="master">
+  <!--NOTE: 
   THIS IS JUST AN EXPLANATION!!!-->
   <description>
-    <p>
-      This is just a master contract, it will output something but *nothing* in
-      special. It should just serve to explain a wee bit contracts and what you
-      can do with them.
-    </p>
+    <p>This is just a master contract, it will output something but *nothing*
+    in special. It should just serve to explain a wee bit contracts and what
+    you can do with them.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="master"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="master"/>]]>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="master" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!-- If you need default variables: -->
-<!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
-<!-- then extract the variable like: -->
-<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
-<!-- more information which variables are available can be found at http://localhost:8888/**.props
+  name="master" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <!-- If you need default variables: -->
+      <!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
+      <!-- then extract the variable like: -->
+      <!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
+      <!-- more information which variables are available can be found at http://localhost:8888/**.props
      which connects to the org.apache.forrest.plugin.output.inputModule plugin.
      A custom generator contacts the forrest properties input module to get all aviable key/values and
      outputs them to xml (dtd like forrest.properties.xml). -->
-<!-- Since contracts are standalone every implementation has to be invoked by some input.-->
-<!--  That means for xsl contracts that they are working for any xml input. 
+      <!-- Since contracts are standalone every implementation has to be invoked by some input.-->
+      <!--  That means for xsl contracts that they are working for any xml input. 
           We need to match the root element to invoke the contract processing!!! 
           If no data model is requested by the structurer, the dispatcher will use a foo-doc in the transformation.
           That means that matching "/" always will work. -->
       <xsl:template match="/">
-<!-- The dispatcher needs a well-formed xml document to work with. 
+        <!-- The dispatcher needs a well-formed xml document to work with. 
             The forrest:content element (as root element) can contain as many forrest:part's as you want. -->
         <forrest:content>
-<!-- forrest:part within this element the actual content is going to. 
+          <!-- forrest:part within this element the actual content is going to. 
             If you use no @xpath then we insert content on the current structurer position.-->
-          <forrest:part>
-            Content going to the location defined by the structurer.
-          </forrest:part>
-<!--If you want to inject the content into a certain DOM position and
+          <forrest:part>Content going to the location defined by the
+          structurer.</forrest:part>
+          <!--If you want to inject the content into a certain DOM position and
               *not* the current position in the structurer, you can use the @xpath attribute. -->
-          <forrest:part xpath="/html/head">
-            Content going to a fixed location defined by the contract (here: /html/head).
-          </forrest:part>
+          <forrest:part xpath="/html/head">Content going to a fixed location
+          defined by the contract (here: /html/head).</forrest:part>
         </forrest:content>
       </xsl:template>
-<!-- copy n paste -->
-<!--
+      <!-- copy n paste -->
+      <!--
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
       <xsl:template match="/">

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

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing-foo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing-foo.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/nav-main-testing-foo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing-foo.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,29 +16,28 @@
   limitations under the License.
 -->
 <forrest:contract name="nav-main-testing-foo" type="nugget"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    nav-main will output the main or primary navigation AKA tabs.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-main will output the main or primary navigation AKA
+  tabs.</description>
   <usage>
-<![CDATA[<forrest:contract name="nav-main-testing-foo" nugget="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="nav-main-testing-foo" 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="path" select="$defaultVariables/*[@name='path']/@value"/>
-      <xsl:template match="/" >
+    <![CDATA[<forrest:contract name="nav-main-testing-foo" nugget="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="nav-main-testing-foo" 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="path"
+      select="$defaultVariables/*[@name='path']/@value" />
+      <xsl:template match="/">
         <forrest:content>
-          <forrest:part> nav-main-testing-foo testing - no @xpath<br/>
-            Path: <xsl:value-of select="$path"/>
-            <br/>
-            skin-img-dir:  <xsl:copy-of select="$defaultVariables/*"/> value:
-            <xsl:value-of select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
-<!--copy-of -->
-          </forrest:part>
+          <forrest:part>nav-main-testing-foo testing - no @xpath 
+          <br />Path: 
+          <xsl:value-of select="$path" />
+          <br />skin-img-dir: 
+          <xsl:copy-of select="$defaultVariables/*" />value: 
+          <xsl:value-of select="$defaultVariables/*[@name='skin-img-dir']/@value" />
+          <!--copy-of --></forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing.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/nav-main-testing.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing.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,29 @@
   limitations under the License.
 -->
 <forrest:contract name="nav-main-testing" type="nugget"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    nav-main will output the main or primary navigation AKA tabs.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-main will output the main or primary navigation AKA
+  tabs.</description>
   <usage>
-<![CDATA[<forrest:contract name="nav-main-testing" nugget="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="nav-main-testing" inputFormat="xsl" >
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="nav-main-testing" select="/"/>
-      <xsl:param name="nav-main-testing-test1" select="'test'"/>
-      <xsl:template match="/" >
+    <![CDATA[<forrest:contract name="nav-main-testing" nugget="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="nav-main-testing" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="nav-main-testing" select="/" />
+      <xsl:param name="nav-main-testing-test1" select="'test'" />
+      <xsl:template match="/">
         <forrest:content>
-          <forrest:part>
-             value-of select="$nav-main-testing-test1": <xsl:value-of select="$nav-main-testing-test1"/>
-            <div id="tabs">
-              <xsl:comment>+ |start Tabs new +</xsl:comment>
-              <xsl:copy-of 
-              select="$nav-main-testing/navigation/tab/ul[@id='nav-main']"/>
-              <xsl:comment>+ |end Tabs +</xsl:comment>
-            </div>
-          </forrest:part>
-          <forrest:part xpath="/html/head">
-             xXx nav-main-testing-foo testing -  xpath="/html/head"
-          </forrest:part>
+          <forrest:part>value-of select="$nav-main-testing-test1": 
+          <xsl:value-of select="$nav-main-testing-test1" />
+          <div id="tabs">
+            <xsl:comment>+ |start Tabs new +</xsl:comment>
+            <xsl:copy-of select="$nav-main-testing/navigation/tab/ul[@id='nav-main']" />
+            <xsl:comment>+ |end Tabs +</xsl:comment>
+          </div></forrest:part>
+          <forrest:part xpath="/html/head">xXx nav-main-testing-foo testing -
+          xpath="/html/head"</forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-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/nav-main.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-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
@@ -16,24 +16,21 @@
   limitations under the License.
 -->
 <forrest:contract name="nav-main" type="nugget"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    nav-main will output the main or primary navigation AKA tabs.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-main will output the main or primary navigation AKA
+  tabs.</description>
   <usage>
-<![CDATA[<forrest:contract name="nav-main" nugget="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="nav-main" inputFormat="xsl" >
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template match="/" >
+    <![CDATA[<forrest:contract name="nav-main" nugget="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="nav-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 Tabs new +</xsl:comment>
-            <xsl:copy-of 
-              select="navigation/tab/ul[@id='nav-main']"/>
+            <xsl:copy-of select="navigation/tab/ul[@id='nav-main']" />
             <xsl:comment>+ |end Tabs +</xsl:comment>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-section.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-section.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/nav-section.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-section.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,157 +16,170 @@
   limitations under the License.
 -->
 <forrest:contract name="nav-section"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
     <p>
-      <strong>nav-section</strong> will output the navigation to pages within
-      the current site section AKA menu.
-    </p>
+    <strong>nav-section</strong>will output the navigation to pages within the
+    current site section AKA menu.</p>
     <div class="note">
       <div class="label">Minitoc inclusion</div>
       <div class="content">
         <p>
-          <code>&lt;toc&gt;</code> argument can be used to specify the minitoc
-          depth.
-          <br/>
-          This argument is facultative and no minitoc will be displayed if it is
-          omitted.
-        </p>
+        <code>&lt;toc&gt;</code>argument can be used to specify the minitoc
+        depth. 
+        <br />This argument is facultative and no minitoc will be displayed if
+        it is omitted.</p>
       </div>
     </div>
   </description>
-<!--FIXME: Please add describtion about the params used in the contract -->
+  <!--FIXME: Please add describtion about the params used in the contract -->
   <usage>
-<![CDATA[<forrest:contract name="nav-section" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml">
+    <![CDATA[<forrest:contract name="nav-section" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.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"
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   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/*[@name='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: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: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: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:comment>+ |start 
+            <xsl:value-of select="$max-depth" />menu +</xsl:comment>
             <xsl:if test="$nav-section/navigation/menu/div[@id='menu']/ul/li">
               <xsl:call-template name="menu">
-                <xsl:with-param name="menuRoot" 
-                  select="$nav-section/navigation/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" src="{$root}themes/menu.js">&#160;</script>
+              <script type="text/javascript" src="{$root}themes/menu.js">
+              &#160;</script>
             </forrest:part>
           </xsl:if>
         </forrest:content>
       </xsl:template>
       <xsl:template name="menu">
-        <xsl:param name="menuRoot" value="'test'"/>
+        <xsl:param name="menuRoot" value="'test'" />
         <xsl:comment>+ |start Menu +</xsl:comment>
         <div id="nav-section">
           <ul>
-<!--menu - inner-->
-            <xsl:for-each select = "$menuRoot/div[@id='menu']/ul/li">
-              <xsl:call-template name = "innermenuli" >
-                <xsl:with-param name="id" select="concat('1.', position())"/>
+            <!--menu - inner-->
+            <xsl:for-each select="$menuRoot/div[@id='menu']/ul/li">
+              <xsl:call-template name="innermenuli">
+                <xsl:with-param name="id" select="concat('1.', position())" />
               </xsl:call-template>
             </xsl:for-each>
           </ul>
         </div>
       </xsl:template>
       <xsl:template name="innermenuli">
-        <xsl:param name="id"/>
+        <xsl:param name="id" />
         <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:value-of select="concat('menu_selected_',$id)" />
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="concat('menu_',concat(font,$id))"/>
+              <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'">
-              <xsl:text>selected</xsl:text>
+
+              <xsl:text>
+selected
+</xsl:text>
             </xsl:when>
             <xsl:otherwise></xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        <li class="pagegroup{normalize-space($selected)}" id="{$tagid}Title"><span>
+        <li class="pagegroup{normalize-space($selected)}" id="{$tagid}Title">
+          <span>
             <xsl:if test="$expanding = 'true'">
-              <xsl:attribute name="onclick">SwitchMenu('<xsl:value-of 
-                select="normalize-space($tagid)" />')</xsl:attribute>
+              <xsl:attribute name="onclick">SwitchMenu(' 
+              <xsl:value-of select="normalize-space($tagid)" />')</xsl:attribute>
             </xsl:if>
-            <xsl:value-of select="h1"/>
+            <xsl:value-of select="h1" />
           </span>
           <ul class="{$selected}menuitemgroup" id="{$tagid}">
-            <xsl:for-each select= "ul/li">
+            <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">
+                  <li class="menupage">
+                    <div class="menupagetitle">
                       <xsl:value-of select="div" />
                     </div>
                     <xsl:if test="$max-depth&gt;0">
                       <ul>
-                        <li class="menupageitemgroup"><xsl:for-each select = 
-                            "$nav-section-toc//tocitems/tocitem">
+                        <li class="menupageitemgroup">
+                          <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="{@href}" 
-                                    title="{normalize-space(@title)}">
-                                  <xsl:value-of 
-                                    select="substring(@title,0,20)" />...</a>
+                                <xsl:when test="string-length(normalize-space(@title))&gt;15">
+
+                                  <a href="{@href}"
+                                  title="{normalize-space(@title)}">
+                                  <xsl:value-of select="substring(@title,0,20)" />...</a>
                                 </xsl:when>
-                                <xsl:otherwise><a href="{@href}" 
-                                    title="{normalize-space(@title)}">
-                                  <xsl:value-of select="@title" /></a>
+                                <xsl:otherwise>
+                                  <a href="{@href}"
+                                  title="{normalize-space(@title)}">
+                                    <xsl:value-of select="@title" />
+                                  </a>
                                 </xsl:otherwise>
                               </xsl:choose>
                             </div>
-                          </xsl:for-each></li>
+                          </xsl:for-each>
+                        </li>
                       </ul>
-                    </xsl:if></li>
+                    </xsl:if>
+                  </li>
                 </xsl:when>
                 <xsl:otherwise>
-                  <xsl:call-template name = "innermenuli">
-                    <xsl:with-param name="id" 
-                      select="concat($id, '.', position())"/>
+                  <xsl:call-template name="innermenuli">
+                    <xsl:with-param name="id"
+                    select="concat($id, '.', position())" />
                   </xsl:call-template>
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:for-each>
-          </ul></li>
+          </ul>
+        </li>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/noFt.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/noFt.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/noFt.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/noFt.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,23 @@
   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="noFt">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="noFt">
   <description>
-    <p>
-      Error 440
-      <br/>
-      Template not found. This functions is a fallback when no ft is found. This
-      is just a dummy, it will output *nothing*.
-    </p>
+    <p>Error 440 
+    <br />Template not found. This functions is a fallback when no ft is found.
+    This is just a dummy, it will output *nothing*.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="html" name="noFt" inputFormat="xsl" >
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="noFt" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="/">
         <forrest:content>
-          <forrest:part>
-            Error 440 - Template not found. 
-          </forrest:part>
+          <forrest:part>Error 440 - Template not found.</forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/reference-links.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/reference-links.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/reference-links.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/reference-links.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,39 +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="reference-links">
-  <description>
-    reference-links - Template will output all document links sorted by name.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="reference-links">
+  <description>reference-links - Template will output all document links sorted
+  by name.</description>
   <usage>
-<![CDATA[<forrest:contract name="reference-links"
+    <![CDATA[<forrest:contract name="reference-links"
             dataURI="cocoon://#{$getRequest}.source.rewritten.xml"/>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" name="reference-links" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="reference-links" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:key name="references" match="*" use="concat(name(), '::', .)" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-          <h2>References</h2>
+            <h2>References</h2>
             <ul>
-            <xsl:comment>+ |start reference-links +</xsl:comment>
-              <xsl:for-each select="//link[generate-id(.) =
-              generate-id(key('references', concat(name(), '::', .))[1])]">
-                <xsl:sort select="."/>
-                  <li>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="@href"/>
-                      </xsl:attribute>
-                      <xsl:value-of select="."/>
-                    </a>
-                  </li>
-                </xsl:for-each>
-              </ul>
+              <xsl:comment>+ |start reference-links +</xsl:comment>
+              <xsl:for-each select="//link[generate-id(.) = generate-id(key('references', concat(name(), '::', .))[1])]">
+
+                <xsl:sort select="." />
+                <li>
+                  <a>
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="@href" />
+                    </xsl:attribute>
+                    <xsl:value-of select="." />
+                  </a>
+                </li>
+              </xsl:for-each>
+            </ul>
             <xsl:comment>+ |end reference-links +</xsl:comment>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/search-input.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/search-input.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/search-input.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/search-input.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,38 +16,33 @@
   limitations under the License.
 -->
 <forrest:contract name="search-input"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>
-      search-input will output the default search form.
-    </p>
-
-    <p>
-      To enable lucene search add provider="lucene" (default is google). @domain
-      will enable sitesearch for the specific domain with google. In other words
-      google will search the @domain for the query string.
-    </p>
+    <p>search-input will output the default search form.</p>
+    <p>To enable lucene search add provider="lucene" (default is google).
+    @domain will enable sitesearch for the specific domain with google. In
+    other words google will search the @domain for the query string.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="search-input">
+    <![CDATA[<forrest:contract name="search-input">
   <forrest:property name="search-lucene">lucene-search.html</forrest:property>
   <forrest:property name="search-input">
     <search name="MyProject" domain="example.org" 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"
-  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
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0" 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: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/*[@name='root']/@value"/>
+      <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/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -55,32 +50,30 @@
             <div class="search-input">
               <xsl:choose>
                 <xsl:when test="$search-input/search/@provider = 'lucene'">
-<!-- Lucene search -->
+                  <!-- 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}:');"/> 
-                      &#160;</div>
+                    <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}:');" />&#160;</div>
                     <div id="search-submit">
-                      <input type="submit" value="Search" name="Search" 
-                        i18n:attr="value"/>
+                      <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}"/>
+                      <input type="hidden" name="sitesearch"
+                      value="{$search-input/search/@domain}" />
                     </div>
                     <div id="search-field">
-                      <input type="text" id="query" name="q" size="25"/>
+                      <input type="text" id="query" name="q" size="25" />
                     </div>
                     <div id="search-submit">
-                      <input type="submit" value="Search" name="Search" 
-                        i18n:attr="value"/>
+                      <input type="submit" value="Search" name="Search"
+                      i18n:attr="value" />
                     </div>
                   </form>
                 </xsl:otherwise>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-compliance-links.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-compliance-links.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-compliance-links.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-compliance-links.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,23 +16,29 @@
   limitations under the License.
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="siteinfo-compliance-links">
-  <description>
-    Displays valid XHTML and CSS compliance links
-  </description>
+name="siteinfo-compliance-links">
+  <description>Displays valid XHTML and CSS compliance links</description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-compliance-links"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="siteinfo-compliance-links"/>]]>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-      name="siteinfo-compliance-links" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  name="siteinfo-compliance-links" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:comment>+ |start compliance links +</xsl:comment>
-            <div id="siteinfo-compliance-links"><a href="http://validator.w3.org/check?uri=referer">
-              <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a><a href="http://jigsaw.w3.org/css-validator/check/referer">
-              <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"/></a>
+            <div id="siteinfo-compliance-links">
+              <a href="http://validator.w3.org/check?uri=referer">
+                <img src="http://www.w3.org/Icons/valid-xhtml10"
+                alt="Valid XHTML 1.0!" height="31" width="88" />
+              </a>
+              <a href="http://jigsaw.w3.org/css-validator/check/referer">
+                <img style="border:0;width:88px;height:31px"
+                src="http://jigsaw.w3.org/css-validator/images/vcss"
+                alt="Valid CSS!" />
+              </a>
             </div>
             <xsl:comment>+ |end compliance links +</xsl:comment>
           </forrest:part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-copyright.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-copyright.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-copyright.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-copyright.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,16 +16,15 @@
   limitations under the License.
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="siteinfo-copyright">
+name="siteinfo-copyright">
   <description>
     <p>
-      <strong>siteinfo-copyright</strong>
-      <br/>
-      The following properties are used to construct a copyright statement.
-    </p>
+    <strong>siteinfo-copyright</strong>
+    <br />The following properties are used to construct a copyright
+    statement.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-copyright">
+    <![CDATA[<forrest:contract name="siteinfo-copyright">
   <forrest:property name="siteinfo-copyright">
     <copyright>
       <year [inception="[true|false]"]>2005</year>
@@ -35,42 +34,49 @@
     </copyright>
   </forrest:property>
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-copyright" inputFormat="xsl">
+  name="siteinfo-copyright" inputFormat="xsl">
     <xsl:stylesheet version="1.1"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:java="http://xml.apache.org/xslt/java"
-      exclude-result-prefixes="java">
-      <xsl:param name="siteinfo-copyright"/>
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:java="http://xml.apache.org/xslt/java"
+    exclude-result-prefixes="java">
+      <xsl:param name="siteinfo-copyright" />
       <xsl:template match="/">
         <forrest:content>
-          <forrest:part>
-            Copyright &#169;
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="$siteinfo-copyright/copyright/year"/>
-            <xsl:call-template name="current-year">
-              <xsl:with-param name="copyrightyear" select="$siteinfo-copyright/copyright/year"/>
-            </xsl:call-template>
-<xsl:text> </xsl:text>
-            <xsl:choose>
-              <xsl:when test="$siteinfo-copyright/copyright/copyright-link"><a>
+          <forrest:part>Copyright &#169; 
+          <xsl:text>
+ 
+</xsl:text>
+          <xsl:value-of select="$siteinfo-copyright/copyright/year" />
+          <xsl:call-template name="current-year">
+            <xsl:with-param name="copyrightyear"
+            select="$siteinfo-copyright/copyright/year" />
+          </xsl:call-template>
+          <xsl:text>
+ 
+</xsl:text>
+          <xsl:choose>
+            <xsl:when test="$siteinfo-copyright/copyright/copyright-link">
+              <a>
                 <xsl:attribute name="href">
-                  <xsl:value-of select="$siteinfo-copyright/copyright/copyright-link"/>
+                  <xsl:value-of select="$siteinfo-copyright/copyright/copyright-link" />
                 </xsl:attribute>
-                <xsl:value-of select="$siteinfo-copyright/copyright/vendor"/></a>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$siteinfo-copyright/copyright/vendor"/>
-              </xsl:otherwise>
-            </xsl:choose>
-<xsl:text> </xsl:text>
-            <xsl:value-of select="$siteinfo-copyright/copyright/msg"/>
-          </forrest:part>
+                <xsl:value-of select="$siteinfo-copyright/copyright/vendor" />
+              </a>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$siteinfo-copyright/copyright/vendor" />
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:text>
+ 
+</xsl:text>
+          <xsl:value-of select="$siteinfo-copyright/copyright/msg" /></forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template name="current-year">
-<!-- Displays the current year after the inception year (in the copyright i.e: 2002-2005)
+        <!-- Displays the current year after the inception year (in the copyright i.e: 2002-2005)
        - the copyright year (2005 by default) can be indicated in the copyrightyear parameter,
        - the year format (yyyy by default) can be indicated in the dateformat parameter,
        - the dates separator (- by default) can be indicated in the dateseparator parameter.
@@ -88,14 +94,17 @@
         <xsl:param name="dateformat">yyyy</xsl:param>
         <xsl:param name="dateseparator">-</xsl:param>
         <xsl:if test="$copyrightyear[@inception = 'true']">
-          <xsl:variable name="tz" select='java:java.util.SimpleTimeZone.new(0,"GMT+00:00")' />
-          <xsl:variable name="formatter" select="java:java.text.SimpleDateFormat.new($dateformat)"/>
-          <xsl:variable name="settz" select="java:setTimeZone($formatter, $tz)" />
-          <xsl:variable name="date" select="java:java.util.Date.new()"/>
-          <xsl:variable name="year" select="java:format($formatter, $date)"/>
+          <xsl:variable name="tz"
+          select='java:java.util.SimpleTimeZone.new(0,"GMT+00:00")' />
+          <xsl:variable name="formatter"
+          select="java:java.text.SimpleDateFormat.new($dateformat)" />
+          <xsl:variable name="settz"
+          select="java:setTimeZone($formatter, $tz)" />
+          <xsl:variable name="date" select="java:java.util.Date.new()" />
+          <xsl:variable name="year" select="java:format($formatter, $date)" />
           <xsl:if test="$copyrightyear != $year">
-            <xsl:value-of select="$dateseparator"/>
-            <xsl:value-of select="$year"/>
+            <xsl:value-of select="$dateseparator" />
+            <xsl:value-of select="$year" />
           </xsl:if>
         </xsl:if>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-credits.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-credits.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-credits.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-credits.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,19 +15,16 @@
 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="siteinfo-credits">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="siteinfo-credits">
   <description>
-    <p>
-      Output the credits.
-      <br/>
-      Credits are typically rendered as a set of small clickable images in the
-      page footer.
-    </p>
+    <p>Output the credits. 
+    <br />Credits are typically rendered as a set of small clickable images in
+    the page footer.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-credits">
+    <![CDATA[<forrest:contract name="siteinfo-credits">
   <forrest:properties contract="siteinfo-credits">
     <forrest:property name="siteinfo-credits">
       <credits>
@@ -42,30 +39,31 @@
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    name="siteinfo-credits" inputFormat="xsl" >
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:include href="cocoon://prepare.contract.html.branding-logo"/>
-      <xsl:param name="siteinfo-credits"/>
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="siteinfo-credits" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:include href="cocoon://prepare.contract.html.branding-logo" />
+      <xsl:param name="siteinfo-credits" />
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:variable name="root"
+      select="$defaultVariables/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:if test="$siteinfo-credits/credits">
               <div id="credits">
-                <xsl:for-each 
-                  select="$siteinfo-credits/credits/credit[not(@role='pdf')]">
+                <xsl:for-each select="$siteinfo-credits/credits/credit[not(@role='pdf')]">
+
                   <div class="credit">
                     <xsl:call-template name="renderlogo">
-                      <xsl:with-param name="name" select="name"/>
-                      <xsl:with-param name="url" select="url"/>
-                      <xsl:with-param name="logo" select="image"/>
-                      <xsl:with-param name="root" select="$root"/>
-                      <xsl:with-param name="width" select="width"/>
-                      <xsl:with-param name="height" select="height"/>
+                      <xsl:with-param name="name" select="name" />
+                      <xsl:with-param name="url" select="url" />
+                      <xsl:with-param name="logo" select="image" />
+                      <xsl:with-param name="root" select="$root" />
+                      <xsl:with-param name="width" select="width" />
+                      <xsl:with-param name="height" select="height" />
                     </xsl:call-template>
                   </div>
                 </xsl:for-each>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-current-time.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-current-time.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-current-time.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-current-time.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,27 +15,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="siteinfo-current-time">
-  <description>
-    siteinfo-current-time will output the current time and date with the help of
-    javascript.
-  </description>
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="siteinfo-current-time">
+  <description>siteinfo-current-time will output the current time and date with
+  the help of javascript.</description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-current-time"/>]]>
-  </usage>
-  <forrest:template 
+    <![CDATA[<forrest:contract name="siteinfo-current-time"/>]]>
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="siteinfo-current-time" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-current-time" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-<script type="text/javascript">document.write("<i18n:text >Today:</i18n:text>&#160;" + new Date());</script>
+            <script type="text/javascript">document.write(" 
+            <i18n:text>Today:</i18n:text>&#160;" + new Date());</script>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback-dyn.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback-dyn.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback-dyn.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback-dyn.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,37 +16,39 @@
   limitations under the License.
 -->
 <forrest:contract name="siteinfo-feedback-dyn" type="nugget"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    This function will output the html siteinfo-feedback-dyn information.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>This function will output the html siteinfo-feedback-dyn
+  information.</description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-feedback-dyn">
+    <![CDATA[<forrest:contract name="siteinfo-feedback-dyn">
   <forrest:properties contract="siteinfo-feedback-dyn">
     <forrest:property name="siteinfo-feedback-dyn-config" to="webmaster@foo.com" 
       href="mailto:webmaster@foo.com?subject=Feedback&#160;"> Send feedback 
       about the website to: </forrest:property>
   </forrest:properties>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="siteinfo-feedback-dyn" inputFormat="xsl" body="true" head="false">
-    <xsl:stylesheet version="1.1" 
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  format="html" name="siteinfo-feedback-dyn" inputFormat="xsl" body="true"
+  head="false">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="siteinfo-feedback-dyn-body">
-        <xsl:param name="siteinfo-feedback-dyn-config"/>
-        <xsl:value-of select="$siteinfo-feedback-dyn-config"/>
+        <xsl:param name="siteinfo-feedback-dyn-config" />
+        <xsl:value-of select="$siteinfo-feedback-dyn-config" />
         <xsl:choose>
-          <xsl:when test="$siteinfo-feedback-dyn-config[@href] and $siteinfo-feedback-dyn-config[@href!='']"><a id="feedbackto">
-            <xsl:attribute name="href">
-              <xsl:value-of select="$siteinfo-feedback-dyn-config/@href"/>
-              <xsl:value-of select="$path"/>
-            </xsl:attribute>
-            <xsl:value-of select="$siteinfo-feedback-dyn-config/@to"/></a>
+          <xsl:when test="$siteinfo-feedback-dyn-config[@href] and $siteinfo-feedback-dyn-config[@href!='']">
+
+            <a id="feedbackto">
+              <xsl:attribute name="href">
+                <xsl:value-of select="$siteinfo-feedback-dyn-config/@href" />
+                <xsl:value-of select="$path" />
+              </xsl:attribute>
+              <xsl:value-of select="$siteinfo-feedback-dyn-config/@to" />
+            </a>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="$siteinfo-feedback-dyn-config/@to"/>
+            <xsl:value-of select="$siteinfo-feedback-dyn-config/@to" />
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback.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,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract name="siteinfo-feedback" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+<forrest:contract name="siteinfo-feedback"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>
-      The feedback element will be used to construct a feedback link in the page
-      appending: &lt;a href="@href">{@to}&lt;/a>
-    </p>
+    <p>The feedback element will be used to construct a feedback link in the
+    page appending: &lt;a href="@href"&gt;{@to}&lt;/a&gt;</p>
     <div class="note">
       <div class="label">Beware the link rewritting !</div>
       <div class="content">
-        <p>
-          Forrest recognise links or e-mail address in the text of the site and
-          automatically converts them into real links or mailto.
-          <br/>
-          if the <em>to</em> attribute is of the following form :
-          <code>\xxx.yyy@zzz.www</code> it is recognised as a mailto link and
-          will be converted too.
-          <br/>
-        </p>
-        <p>
-          To avoid this, you can <em>escape</em> the conversion by prefixing the
-          email adress by the '\' character :
-          <strong>\</strong><code>\xxx.yyy@zzz.www</code> will not be converted.
-          <br/>
-          (Note that none of the previous examples are rewritten because we used
-          the '\' character in the source !).
-        </p>
+        <p>Forrest recognise links or e-mail address in the text of the site
+        and automatically converts them into real links or mailto. 
+        <br />if the 
+        <em>to</em>attribute is of the following form : 
+        <code>\xxx.yyy@zzz.www</code>it is recognised as a mailto link and will
+        be converted too. 
+        <br /></p>
+        <p>To avoid this, you can 
+        <em>escape</em>the conversion by prefixing the email adress by the '\'
+        character : 
+        <strong>\</strong>
+        <code>\xxx.yyy@zzz.www</code>will not be converted. 
+        <br />(Note that none of the previous examples are rewritten because we
+        used the '\' character in the source !).</p>
       </div>
     </div>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-feedback">
+    <![CDATA[<forrest:contract name="siteinfo-feedback">
   <forrest:property name="siteinfo-feedback">
     <feedback to="\webmaster@foo.com"
       href="\mailto:webmaster@foo.com?subject=Feedback&#160;" >
@@ -54,30 +49,33 @@
     </feedback>
   </forrest:property>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    name="siteinfo-feedback" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="siteinfo-feedback"/>
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:variable name="path" select="$defaultVariables/*[@name='path']/@value"/>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="siteinfo-feedback" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="siteinfo-feedback" />
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:variable name="path"
+      select="$defaultVariables/*[@name='path']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <div id="siteinfo-feedback">
-              <xsl:value-of select="$siteinfo-feedback/feedback"/>
+              <xsl:value-of select="$siteinfo-feedback/feedback" />
               <xsl:choose>
-                <xsl:when 
-                  test="$siteinfo-feedback/feedback/@href and not($siteinfo-feedback/feedback/@href='')"><a id="feedbackto">
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="$siteinfo-feedback/feedback/@href"/>
-                    <xsl:value-of select="$path"/>
-                  </xsl:attribute>
-                  <xsl:value-of select="$siteinfo-feedback/feedback/@to"/></a>
+                <xsl:when test="$siteinfo-feedback/feedback/@href and not($siteinfo-feedback/feedback/@href='')">
+
+                  <a id="feedbackto">
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="$siteinfo-feedback/feedback/@href" />
+                      <xsl:value-of select="$path" />
+                    </xsl:attribute>
+                    <xsl:value-of select="$siteinfo-feedback/feedback/@to" />
+                  </a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <xsl:value-of select="$siteinfo-feedback/feedback/@to"/>
+                  <xsl:value-of select="$siteinfo-feedback/feedback/@to" />
                 </xsl:otherwise>
               </xsl:choose>
             </div>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published-net.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published-net.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published-net.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published-net.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,40 +15,36 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  name="siteinfo-last-published-net">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="siteinfo-last-published-net">
   <description>
-    <p>
-      siteinfo-last-published-net
-      <br/>
-      will output the last published date of the site with the help of a
-      timeserver.
-    </p>
+    <p>siteinfo-last-published-net 
+    <br />will output the last published date of the site with the help of a
+    timeserver.</p>
     <div class="warning">
       <div class="label">Warning</div>
-      <div class="content">You need to be able to reach 
-        http://xobjex.com/service/date.xsl!!! If you are not, it will crash 
-        views.</div>
+      <div class="content">You need to be able to reach
+      http://xobjex.com/service/date.xsl!!! If you are not, it will crash
+      views.</div>
     </div>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]>
-  </usage>
-  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
-    xmlns:forrest="http://apache.org/forrest/templates/1.0" name="siteinfo-last-published-net" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="siteinfo-last-published-net-body"/>
+    <![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]>
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="siteinfo-last-published-net" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="siteinfo-last-published-net-body" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-        <xsl:variable 
-        name="date" 
-        select="document('http://xobjex.com/service/date.xsl')/date"/>
-        <xsl:variable name="dt" select="$date/utc/@rfc-822"/>
-        <i18n:text >Last 
-        Published:</i18n:text>&#160; <xsl:value-of select="$dt"/>
-          </forrest:part>
+          <xsl:variable name="date"
+          select="document('http://xobjex.com/service/date.xsl')/date" />
+          <xsl:variable name="dt" select="$date/utc/@rfc-822" />
+          <i18n:text>Last Published:</i18n:text>&#160; 
+          <xsl:value-of select="$dt" /></forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published.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,25 @@
   limitations under the License.
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="siteinfo-last-published">
-  <description>
-    siteinfo-last-published will output the last published date of the site with
-    the help of javascript.
-  </description>
+name="siteinfo-last-published">
+  <description>siteinfo-last-published will output the last published date of
+  the site with the help of javascript.</description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-last-published"/>]]>
-  </usage>
-  <forrest:template 
+    <![CDATA[<forrest:contract name="siteinfo-last-published"/>]]>
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="siteinfo-last-published" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-last-published" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
-<!-- fixme: the jscript does not get written-->
+          <!-- fixme: the jscript does not get written-->
           <forrest:part>
-<script type="text/javascript">document.write("<i18n:text >Last Published:</i18n:text>&#160;" + document.lastModified);</script>
+            <script type="text/javascript">document.write(" 
+            <i18n:text>Last Published:</i18n:text>&#160;" +
+            document.lastModified);</script>
           </forrest:part>
         </forrest:content>
       </xsl:template>



Mime
View raw message