forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527035 [3/4] - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core: ./ content/xdocs/ themes/ themes/common/css/ themes/common/fo/ themes/common/html/ themes/common/images/ themes/common/panels/ themes/common/xhtml2/ themes...
Date Tue, 10 Apr 2007 05:26:54 GMT
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-title.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-title.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-title.ft Mon Apr  9 22:26:50 2007
@@ -20,14 +20,17 @@
   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). 
+    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"/>
-]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
+]]>
+  </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="/"/>
+    <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>
@@ -39,11 +42,11 @@
           </forrest:part>
           <forrest:part xpath="/html/head">
             <xsl:comment>+ |start content-title +</xsl:comment>
-        <xsl:copy-of select="$content-title/*"/>
-        <xsl:comment>+ |end content-title +</xsl:comment>
+            <xsl:copy-of select="$content-title/*"/>
+            <xsl:comment>+ |end content-title +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.ft Mon Apr  9 22:26:50 2007
@@ -20,15 +20,17 @@
   <description>
     content-txt-link will output the TXT link with image to the content.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-txt-link"/>]]></usage>
-  
+  <usage>
+<![CDATA[<forrest:contract name="content-txt-link"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     format="html" name="content-txt-link" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-txt-link-body">
-        <a href="{$filename-noext}.txt" class="format"> <img class="skin" 
-          src="{$skin-img-dir}/txtdoc.png" alt="TXT - icon" /><span
+      <xsl:template name="content-txt-link-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>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.ft Mon Apr  9 22:26:50 2007
@@ -15,35 +15,35 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-  <forrest:contract name="content-xml-link"
+<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>
-    <usage><![CDATA[<forrest:contract name="content-xml-link"/>]]></usage>
-    <forrest:template
+  <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"
   name="content-xml-link" inputFormat="xsl">
-      <xsl:stylesheet version="1.1" 
+    <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" 
+      <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" 
+      <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" 
+      <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>
-          </forrest:content>
-        </xsl:template>
-      </xsl:stylesheet>
-    </forrest:template>
+            <span class="caption">XML</span></a>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericMarkup.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericMarkup.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericMarkup.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericMarkup.ft Mon Apr  9 22:26:50 2007
@@ -19,19 +19,21 @@
   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">
+  <usage>
+<![CDATA[<forrest:contract name="genericMarkup">
   <forrest:property name="genericMarkup">
     <hr/>
   </forrest:property>
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </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"/>
+    <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>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericXhtml.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericXhtml.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericXhtml.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericXhtml.ft Mon Apr  9 22:26:50 2007
@@ -18,10 +18,14 @@
 <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"
-  dataURI="cocoon://#{$getRequest}.xml"/>]]></usage>
+  <usage>
+<![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" 
@@ -38,4 +42,4 @@
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.ft Mon Apr  9 22:26:50 2007
@@ -19,17 +19,18 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="helper-form-blank">
-  
-  <!--NOTE: 
+<!--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.
+      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>
+  <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" 
@@ -39,7 +40,7 @@
       <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>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.ft Mon Apr  9 22:26:50 2007
@@ -19,16 +19,19 @@
   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: 
+      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>
+  <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" 
@@ -39,11 +42,11 @@
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
-            <script type="text/javascript" src="{$root}themes/prototype.js"> 
+<script type="text/javascript" src="{$root}themes/prototype.js"> 
               &#160;</script>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-render-image.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-render-image.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-render-image.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-render-image.ft Mon Apr  9 22:26:50 2007
@@ -19,13 +19,16 @@
   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!!!
+  <usage>
+<![CDATA[internal only!!!
   
   <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>]]>
-    </usage>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     name="helper-render-image" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -52,54 +55,52 @@
           <xsl:value-of select="$rollover"/>
         </xsl:variable>
         <xsl:if test="$rollover">
-          <script type="text/javascript" > function 
+<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 
+<!--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 
+          <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: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"/>
                 </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"/>
-                  </xsl:attribute>
-                </xsl:if>
-              </img>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$name"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </a>
+              </xsl:if>
+            </img>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$name"/>
+          </xsl:otherwise>
+        </xsl:choose></a>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/master.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/master.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/master.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/master.ft Mon Apr  9 22:26:50 2007
@@ -19,53 +19,54 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="master">
-  
-  <!--NOTE: 
+<!--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>
+  <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 lm://transform.xml.variable.helper 
+<!-- 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 lm://transform.xml.variable.helper 
         
           FIXME: This property xsl is in early stage and aims to be connected to the new established input module based one.
           We need to write a custom generator for this. The generator will contact the prop-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
+<!--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: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/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-sub.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-sub.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-sub.ft Mon Apr  9 22:26:50 2007
@@ -20,23 +20,23 @@
   <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>
+  <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"
   name="nav-main-sub" 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 Subtabs new   +</xsl:comment> 
-             <xsl:copy-of 
-              select="navigation/tab/div[@id='nav-main-sub']"/> 
-              <xsl:comment>+ |end Subtabs +</xsl:comment>
+            <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>
       </xsl:template>
-		</xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+    </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.ft Mon Apr  9 22:26:50 2007
@@ -20,25 +20,27 @@
   <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>
+  <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: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/>
+            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>
+<!--copy-of -->
+          </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing.ft Mon Apr  9 22:26:50 2007
@@ -20,12 +20,12 @@
   <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>
+  <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="/"/>
@@ -34,10 +34,12 @@
         <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>
+            <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"
@@ -45,5 +47,5 @@
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main.ft Mon Apr  9 22:26:50 2007
@@ -20,24 +20,24 @@
   <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>
+  <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="/" >
         <forrest:content>
           <forrest:part>
-            <xsl:comment>+ |start Tabs new +</xsl:comment> 
-             <xsl:copy-of 
-              select="navigation/tab/ul[@id='nav-main']"/> 
-              <xsl:comment>+ |end Tabs +</xsl:comment>
+            <xsl:comment>+ |start Tabs new +</xsl:comment>
+            <xsl:copy-of 
+              select="navigation/tab/ul[@id='nav-main']"/>
+            <xsl:comment>+ |end Tabs +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.ft Mon Apr  9 22:26:50 2007
@@ -19,25 +19,32 @@
   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.
+      <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 -->
-  <usage><![CDATA[<forrest:contract name="nav-section" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml">
+<!--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">
   [<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:contract>]]>
+  </usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="nav-section" inputFormat="xsl">
@@ -72,7 +79,7 @@
           </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>
@@ -82,7 +89,7 @@
         <xsl:comment>+ |start Menu +</xsl:comment>
         <div id="nav-section">
           <ul>
-            <!--menu - inner-->
+<!--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())"/>
@@ -110,8 +117,7 @@
             <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>
@@ -122,44 +128,34 @@
             <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 = 
+                        <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 
+                                  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>
-                                <xsl:otherwise>
-                                  <a href="{@href}" 
+                                <xsl:otherwise><a href="{@href}" 
                                     title="{normalize-space(@title)}">
-                                    <xsl:value-of select="@title" />
-                                  </a>
+                                  <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">
@@ -169,8 +165,7 @@
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:for-each>
-          </ul>
-        </li>
+          </ul></li>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/noFt.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/noFt.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/noFt.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/noFt.ft Mon Apr  9 22:26:50 2007
@@ -17,22 +17,28 @@
 -->
 <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>
+  <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>
   </description>
-  <usage><![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]></usage>
+  <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">
-     <xsl:template name="/"> 
+      <xsl:template name="/">
         <forrest:content>
           <forrest:part>
             Error 440 - Template not found. 
           </forrest:part>
         </forrest:content>
-        </xsl:template>
+      </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.ft Mon Apr  9 22:26:50 2007
@@ -18,25 +18,31 @@
 <forrest:contract name="search-input"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>search-input will output the default search form.</p>
-    <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">
+  <usage>
+<![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="mydomain" provider="google"/>
   </forrest:property>
-</forrest:contract>]]></usage>
-  
+</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
+<!--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"/>
@@ -49,9 +55,10 @@
             <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" 
+                    <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}:');"/> 
@@ -84,5 +91,5 @@
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-compliance-links.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-compliance-links.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-compliance-links.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-compliance-links.ft Mon Apr  9 22:26:50 2007
@@ -17,26 +17,22 @@
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-compliance-links">
-
-  <description>Displays valid XHTML and CSS compliance links</description>
-
-  <usage><![CDATA[<forrest:contract name="siteinfo-compliance-links"/>]]></usage>
-
+  <description>
+    Displays valid XHTML and CSS compliance links
+  </description>
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-compliance-links"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
       name="siteinfo-compliance-links" inputFormat="xsl">
-      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
+    <xsl: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/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft Mon Apr  9 22:26:50 2007
@@ -17,13 +17,15 @@
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-copyright">
-
   <description>
-    <p><strong>siteinfo-copyright</strong> <br/>The following properties are
-      used to construct a copyright statement.</p>
+    <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">
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-copyright">
   <forrest:property name="siteinfo-copyright">
     <copyright>
       <year [inception="[true|false]"]>2005</year>
@@ -32,8 +34,8 @@
       [<msg>All rights reserved.</msg>]
     </copyright>
   </forrest:property>
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="siteinfo-copyright" inputFormat="xsl">
     <xsl:stylesheet version="1.1"
@@ -41,7 +43,6 @@
       xmlns:java="http://xml.apache.org/xslt/java"
       exclude-result-prefixes="java">
       <xsl:param name="siteinfo-copyright"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -51,28 +52,25 @@
             <xsl:call-template name="current-year">
               <xsl:with-param name="copyrightyear" select="$siteinfo-copyright/copyright/year"/>
             </xsl:call-template>
-            <xsl:text> </xsl:text>
+<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:attribute>
-                  <xsl:value-of select="$siteinfo-copyright/copyright/vendor"/>
-                </a>
+              <xsl:when test="$siteinfo-copyright/copyright/copyright-link"><a>
+                <xsl:attribute name="href">
+                  <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: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.
@@ -95,12 +93,12 @@
           <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>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.ft Mon Apr  9 22:26:50 2007
@@ -19,10 +19,15 @@
   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">
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-credits">
   <forrest:properties contract="siteinfo-credits">
     <forrest:property name="siteinfo-credits">
       <credits>
@@ -36,7 +41,8 @@
       </credits>
     </forrest:property>
   </forrest:properties>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     name="siteinfo-credits" inputFormat="xsl" >
     <xsl:stylesheet version="1.1" 
@@ -70,4 +76,4 @@
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-current-time.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-current-time.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-current-time.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-current-time.ft Mon Apr  9 22:26:50 2007
@@ -19,9 +19,12 @@
   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.
+    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>
+  <usage>
+<![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"
@@ -29,10 +32,10 @@
     <xsl:stylesheet version="1.1" 
 		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:template match="/">
+      <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/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback-dyn.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback-dyn.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback-dyn.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback-dyn.ft Mon Apr  9 22:26:50 2007
@@ -15,44 +15,41 @@
   See the License for the specific language governing permissions and
   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>
-  <usage><![CDATA[<forrest:contract name="siteinfo-feedback-dyn">
+  <usage>
+<![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: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" 
+    <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: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>
-	        <xsl:otherwise>
-	          <xsl:value-of select="$siteinfo-feedback-dyn-config/@to"/>
-	        </xsl:otherwise>
-	      </xsl:choose>
-			</xsl:template>
+      <xsl:template name="siteinfo-feedback-dyn-body">
+        <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>
+          <xsl:otherwise>
+            <xsl:value-of select="$siteinfo-feedback-dyn-config/@to"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.ft Mon Apr  9 22:26:50 2007
@@ -15,31 +15,46 @@
   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">
   <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">{@to}&lt;/a>
+    </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>
+          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>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">
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-feedback">
   <forrest:property name="siteinfo-feedback">
     <feedback to="\webmaster@foo.com"
       href="\mailto:webmaster@foo.com?subject=Feedback&#160;" >
       Send feedback about the website to:
     </feedback>
   </forrest:property>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     name="siteinfo-feedback" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -54,14 +69,12 @@
               <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>
+                  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"/>
@@ -73,4 +86,4 @@
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published-net.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published-net.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published-net.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published-net.ft Mon Apr  9 22:26:50 2007
@@ -18,8 +18,12 @@
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0" 
   name="siteinfo-last-published-net" type="nugget">
   <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 
@@ -27,20 +31,23 @@
         views.</div>
     </div>
   </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]>
-    </usage>
+  <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" format="html" 
     name="siteinfo-last-published-net" inputFormat="xsl" body="true" 
     head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="siteinfo-last-published-net-body"> <xsl:variable 
+      <xsl:template name="siteinfo-last-published-net-body">
+        <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"/> 
-        </xsl:template>
+        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"/>
+      </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published.ft Mon Apr  9 22:26:50 2007
@@ -18,9 +18,12 @@
 <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.
+    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>
+  <usage>
+<![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"
@@ -28,11 +31,11 @@
     <xsl:stylesheet version="1.1" 
 		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:template match="/">
+      <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>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.ft Mon Apr  9 22:26:50 2007
@@ -18,37 +18,39 @@
 <forrest:contract
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-meta-icon">
-
   <description>
-    <p><strong>siteinfo-meta-icon</strong> <br/>will output the html
-      additional shortcut icon in head element. This icon is generally
-      displayed by browser at the beginning of the URL. </p>
-    <p>This icon is directly searched in the <code>xdoc</code> directory.</p>
-  </description>
+    <p>
+      <strong>siteinfo-meta-icon</strong>
+      <br/>
+      will output the html additional shortcut icon in head element. This icon
+      is generally displayed by browser at the beginning of the URL.
+    </p>
 
-  <usage><![CDATA[<forrest:contract name="siteinfo-meta-icon">
+    <p>
+      This icon is directly searched in the <code>xdoc</code> directory.
+    </p>
+  </description>
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-meta-icon">
   <forrest:property name="siteinfo-meta-icon">
     <favicon-url>favico.ico</favicon-url>
   </forrest:property>
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="siteinfo-meta-icon" inputFormat="xsl">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:param name="defaultVariables" select="'test.html'"/>
-        <xsl:param name="siteinfo-meta-icon"/>
-        <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-
+      <xsl:param name="defaultVariables" select="'test.html'"/>
+      <xsl:param name="siteinfo-meta-icon"/>
+      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
             <xsl:comment>+|start favicon +</xsl:comment>
-            <xsl:if test="$siteinfo-meta-icon/favicon-url">
-              <link rel="shortcut icon">
-                <xsl:attribute name="href">
-                  <xsl:value-of select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
-                </xsl:attribute>
-              </link>
+            <xsl:if test="$siteinfo-meta-icon/favicon-url"><link rel="shortcut icon">
+              <xsl:attribute name="href">
+                <xsl:value-of select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
+              </xsl:attribute></link>
             </xsl:if>
             <xsl:comment>+|start favicon +</xsl:comment>
           </forrest:part>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.ft Mon Apr  9 22:26:50 2007
@@ -17,99 +17,88 @@
 -->
 <forrest:contract name="siteinfo-meta-navigation"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
-
   <description>
     <p>
-      <strong>siteinfo-meta-navigation</strong> will output the html additional navigation targets in head element.
-      Implemented forrest 0.8/common. </p>
-      <div class="note">
+      <strong>siteinfo-meta-navigation</strong> will output the html additional
+      navigation targets in head element. Implemented forrest 0.8/common.
+    </p>
+    <div class="note">
       <div class="label">And why ?</div>
       <div class="content">
-        <p>This contract insert <code>&lt;link&gt;</code> HTML elements defined by <a href="http://www.w3.org/TR/1999/REC-html401-19991224/types.html#type-links" class="fork">W3C</a>
-        which can be interpreted by browsers to navigate between page.<br/>
-        At the moment, the contract implements NEXT, PREVIOUS, LAST, FIRST, Index and CONTENT pages.
+        <p>
+          This contract insert <code>&lt;link&gt;</code> HTML elements defined
+          by
+          <a href="http://www.w3.org/TR/1999/REC-html401-19991224/types.html#type-links" class="fork">W3C</a>
+          which can be interpreted by browsers to navigate between page.
+          <br/>
+          At the moment, the contract implements NEXT, PREVIOUS, LAST, FIRST,
+          Index and CONTENT pages.
         </p>
       </div>
     </div>
   </description>
-
-  <usage><![CDATA[<forrest:contract name="siteinfo-meta-navigation" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]></usage>
-
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-meta-navigation" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="siteinfo-meta-navigation" inputFormat="xsl">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:param name="nav-main" select="/"/>
       <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-
-      <!-- ********************************** -->
-      <!-- Creates navigation links in header -->
-      <!-- ********************************** -->
+<!-- ********************************** -->
+<!-- Creates navigation links in header -->
+<!-- ********************************** -->
       <xsl:template match="/">
         <forrest:content>
           <forrest:part  xpath="/html/head">
             <xsl:comment>+ |start navigation links +</xsl:comment>
-
-            <!-- Index and Table of Contents -->
+<!-- Index and Table of Contents -->
             <xsl:call-template name="navigation-link-index-content"/>
-
-            <!-- NEXT, PREVIOUS... -->
+<!-- NEXT, PREVIOUS... -->
             <xsl:for-each select="$nav-main/navigation/menu/div[@id='menu']//div[@class='current']">
-              <!-- NEXT -->
-              <xsl:if test="ancestor::node()/following-sibling::*[1]//a">
-                <link rel="NEXT"
+<!-- NEXT -->
+              <xsl:if test="ancestor::node()/following-sibling::*[1]//a"><link rel="NEXT"
                   href="{ancestor::node()/following-sibling::*[1]//a/@href}"
-                  title="{ancestor::node()/following-sibling::*[1]//a}">
-                </link>
+                  title="{ancestor::node()/following-sibling::*[1]//a}"></link>
               </xsl:if>
-              <!-- PREVIOUS -->
+<!-- PREVIOUS -->
               <xsl:for-each
                 select="ancestor::node()/preceding-sibling::*[1]//a[not( starts-with( @class, 'base' ) )]">
-                <xsl:if test="position()=last()">
-                  <link rel="PREVIOUS" href="{./@href}">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="."/>
-                    </xsl:attribute>
-                  </link>
+                <xsl:if test="position()=last()"><link rel="PREVIOUS" href="{./@href}">
+                  <xsl:attribute name="title">
+                    <xsl:value-of select="."/>
+                  </xsl:attribute></link>
                 </xsl:if>
               </xsl:for-each>
-              <!-- LAST -->
-              <xsl:if test="parent::node()/following-sibling::*[last()]/a">
-                <link rel="LAST"
+<!-- LAST -->
+              <xsl:if test="parent::node()/following-sibling::*[last()]/a"><link rel="LAST"
                   href="{parent::node()/following-sibling::*[last()]/a/@href}">
-                  <xsl:attribute name="title">
-                    <xsl:value-of
+                <xsl:attribute name="title">
+                  <xsl:value-of
                       select="parent::node()/following-sibling::*[last()]/a" />
-                  </xsl:attribute>
-                </link>
+                </xsl:attribute></link>
               </xsl:if>
-              <!-- FIRST -->
-              <xsl:if test="parent::node()/preceding-sibling::*[last()]/a">
-                <link rel="FIRST"
+<!-- FIRST -->
+              <xsl:if test="parent::node()/preceding-sibling::*[last()]/a"><link rel="FIRST"
                   href="{parent::node()/preceding-sibling::*[last()]/a/@href}">
-                  <xsl:attribute name="title">
-                    <xsl:value-of
+                <xsl:attribute name="title">
+                  <xsl:value-of
                       select="parent::node()/preceding-sibling::*[last()]/a"/>
-                  </xsl:attribute>
-                </link>
+                </xsl:attribute></link>
               </xsl:if>
             </xsl:for-each>
             <xsl:comment>+ |end navigation links +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>
-
-      <!-- extraction of the Index and the table of content in order to, possibly, overide them in skins... -->
+<!-- extraction of the Index and the table of content in order to, possibly, overide them in skins... -->
       <xsl:template name="navigation-link-index-content">
-        <!-- Index ... -->
-        <link rel="Index" href="{$root}index.html">
-          <xsl:attribute name="title">Index...</xsl:attribute>
-        </link>
-        <!-- Site map ... -->
-        <link rel="CONTENTS" href="{$root}linkmap.html">
-          <xsl:attribute name="title">Site map...</xsl:attribute>
-        </link>
+<!-- Index ... --><link rel="Index" href="{$root}index.html">
+        <xsl:attribute name="title">Index...</xsl:attribute></link>
+<!-- Site map ... --><link rel="CONTENTS" href="{$root}linkmap.html">
+        <xsl:attribute name="title">Site map...</xsl:attribute></link>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft Mon Apr  9 22:26:50 2007
@@ -18,21 +18,29 @@
 <forrest:contract name="siteinfo-meta"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>This functions will output html meta information. On the one hand it 
-      will add the default forrest specific meta (generator, version and theme) 
-      and on the other hand you can add custom meta data via the structurer.</p>
-      <note>Standard output:
-        <source><![CDATA[<meta content="Apache Forrest" name="Generator" />
+    <p>
+      This functions will output html meta information. On the one hand it will
+      add the default forrest specific meta (generator, version and theme) and
+      on the other hand you can add custom meta data via the structurer.
+    </p>
+
+    <note>
+      Standard output:
+      <source>
+<![CDATA[<meta content="Apache Forrest" name="Generator" />
 <meta content="${forrest.version}" name="Forrest-version" />
-<meta content="${theme}" name="Forrest-theme-name" />]]></source>
-      </note>
+<meta content="${theme}" name="Forrest-theme-name" />]]>
+      </source>
+    </note>
   </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
   [<forrest:property name="custom">
     <meta name="Description" content="This page was created to help myself, may it help you now!"/>
   </forrest:property>
   <forrest:property name="theme" value="common"/>]
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-meta" inputFormat="xsl">
@@ -50,12 +58,12 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-		  <xsl:template match="info">
-		    <meta name="Forrest-version">
-		      <xsl:attribute name="content">
-		        <xsl:value-of select="forrest-version"/>
-		      </xsl:attribute>
-		    </meta>
+      <xsl:template match="info">
+        <meta name="Forrest-version">
+          <xsl:attribute name="content">
+            <xsl:value-of select="forrest-version"/>
+          </xsl:attribute>
+        </meta>
         <xsl:if test="$theme">
           <meta name="Forrest-theme-name">
             <xsl:attribute name="content">
@@ -63,7 +71,7 @@
             </xsl:attribute>
           </meta>
         </xsl:if>
-		  </xsl:template>
-		</xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+      </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-abstract.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-abstract.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-abstract.ft Mon Apr  9 22:26:50 2007
@@ -20,14 +20,16 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="xhtml2-content-abstract">
   <description>
-    xhtml2-content-abstract - Template will output the abstract of the document. 
+    xhtml2-content-abstract - Template will output the abstract of the document.
   </description>
-  <usage><![CDATA[<forrest:contract name="xhtml2-content-abstract" dataURI="cocoon://internal.#{$getRequest}.abstract"/>
-]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="xhtml2-content-abstract" dataURI="cocoon://internal.#{$getRequest}.abstract"/>
+]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="xhtml2-content-abstract" inputFormat="xsl">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-       <xsl:param name="xhtml2-content-abstract" select="/"/>
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="xhtml2-content-abstract" select="/"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -41,4 +43,4 @@
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-body.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-body.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-body.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-body.ft Mon Apr  9 22:26:50 2007
@@ -23,15 +23,17 @@
   <description>
     xhtml2-content-body - Template will output the xhtml2-content-body.
   </description>
-  <usage><![CDATA[<forrest:contract name="xhtml2-content-body" 
-            dataURI="cocoon://#{$getRequest}.body.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="xhtml2-content-body" 
+            dataURI="cocoon://#{$getRequest}.body.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="xhtml2-content-body" inputFormat="xsl">
-     <xsl:stylesheet version="1.1" 
+    <xsl:stylesheet version="1.1" 
       xmlns:html="http://www.w3.org/2002/06/xhtml2"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       exclude-result-prefixes="html xsl">
-      <!--<xsl:include href="lm://transform.xhtml2.html.structurer"/>-->
+<!--<xsl:include href="lm://transform.xhtml2.html.structurer"/>-->
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
@@ -46,6 +48,6 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-	  </xsl:stylesheet>
+    </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-title.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-title.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-title.ft Mon Apr  9 22:26:50 2007
@@ -20,14 +20,16 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="xhtml2-content-title">
   <description>
-    xhtml2-content-title - Template will output the title of the document. 
+    xhtml2-content-title - Template will output the title of the document.
   </description>
-  <usage><![CDATA[<forrest:contract name="xhtml2-content-title" dataURI="cocoon://internal.#{$getRequest}.title"/>
-]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="xhtml2-content-title" dataURI="cocoon://internal.#{$getRequest}.title"/>
+]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="xhtml2-content-title" inputFormat="xsl">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-       <xsl:param name="xhtml2-content-title" select="/"/>
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="xhtml2-content-title" select="/"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -39,11 +41,11 @@
           </forrest:part>
           <forrest:part xpath="/html/head">
             <xsl:comment>+ |start xhtml2-content-title +</xsl:comment>
-        <xsl:copy-of select="$xhtml2-content-title/*"/>
-        <xsl:comment>+ |end xhtml2-content-title +</xsl:comment>
+            <xsl:copy-of select="$xhtml2-content-title/*"/>
+            <xsl:comment>+ |end xhtml2-content-title +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>



Mime
View raw message