forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527035 [2/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/fo/page-footer-copyright.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-copyright.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-copyright.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-copyright.ft Mon Apr  9 22:26:50 2007
@@ -20,11 +20,13 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="page-footer-copyright">
   <description>
-    <p>page-footer-copyright display the footer of the pdf..</p>
+    <p>
+      page-footer-copyright display the footer of the pdf..
+    </p>
   </description>
-        <!-- The following are used to construct a copyright statement -->
+<!-- The following are used to construct a copyright statement -->
   <usage>
-    <![CDATA[<forrest:contract name="page-footer-copyright">
+<![CDATA[<forrest:contract name="page-footer-copyright">
       <forrest:property name="copyright">
         <year [inception="[true|false]"]>2005</year>
         <vendor>The Acme Software Foundation.</vendor>
@@ -45,14 +47,13 @@
       exclude-result-prefixes="java"
       version="1.0">
       <xsl:param name="copyright"/>
-
       <xsl:variable name="symbol">
         <xsl:choose >
           <xsl:when test = "$copyright/symbol">
             <xsl:value-of select="$copyright/symbol"/>
           </xsl:when>
           <xsl:otherwise>&#169;</xsl:otherwise>
-        </xsl:choose> 
+        </xsl:choose>
       </xsl:variable>
       <xsl:variable name="msg">
         <xsl:choose >
@@ -60,7 +61,7 @@
             <xsl:value-of select="$copyright/msg"/>
           </xsl:when>
           <xsl:otherwise>All rights reserved.</xsl:otherwise>
-        </xsl:choose> 
+        </xsl:choose>
       </xsl:variable>
       <xsl:variable name="property">
         <xsl:choose >
@@ -68,40 +69,33 @@
             <xsl:value-of select="$copyright/property"/>
           </xsl:when>
           <xsl:otherwise>Copyright</xsl:otherwise>
-        </xsl:choose> 
+        </xsl:choose>
       </xsl:variable>
- 
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/static-content">
-
             <fo:static-content flow-name="first-footer">
               <xsl:call-template name="info"/>
             </fo:static-content>
-
             <fo:static-content flow-name="even-footer">
               <xsl:call-template name="info"/>
             </fo:static-content>
-
             <fo:static-content flow-name="odd-footer">
               <xsl:call-template name="info"/>
             </fo:static-content>
-
           </forrest:part>
         </forrest:content>
-        
       </xsl:template>
-
       <xsl:template name="info">
         <xsl:variable name="text">
           <xsl:value-of select="$property"/>&#160;
           <xsl:value-of select="$symbol"/>&#160;
-          <xsl:value-of select="$copyright/year"/><xsl:call-template name="current-year"/>&#160;
+          <xsl:value-of select="$copyright/year"/>
+          <xsl:call-template name="current-year"/>&#160;
           <xsl:value-of select="$copyright/vendor"/>&#160;
           <xsl:value-of select="$msg"/>
         </xsl:variable>
         <xsl:variable name="url" select="$copyright/url"/>
-
         <fo:block-container font-style="italic" absolute-position="absolute"
           left="0pt" top="0pt" right="6.25in" bottom="150pt"
           font-size="10pt">
@@ -126,7 +120,6 @@
           </xsl:if>
         </fo:block-container>
       </xsl:template>
-
 <!-- Displays the current year after the inception year (in the copyright i.e: 2002-2005)
        - 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.
@@ -140,21 +133,21 @@
        Warning 1 : to enable inception year, inception attribute must be set to "true" in skinconfig.xml
        Fix Me ! This template is also defined in site2xhtml.xsl, We may need a stylesheet common to fo and XHTML ...
 -->
-  <xsl:template name="current-year">
-    <xsl:param name="dateformat">yyyy</xsl:param>
-    <xsl:param name="dateseparator">-</xsl:param>
-    <xsl:if test="$copyright/year[@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:if test="$copyright/year != $year">
-        <xsl:value-of select="$dateseparator"/><xsl:value-of select="$year"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
+      <xsl:template name="current-year">
+        <xsl:param name="dateformat">yyyy</xsl:param>
+        <xsl:param name="dateseparator">-</xsl:param>
+        <xsl:if test="$copyright/year[@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:if test="$copyright/year != $year">
+            <xsl:value-of select="$dateseparator"/>
+            <xsl:value-of select="$year"/>
+          </xsl:if>
+        </xsl:if>
+      </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,13 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="page-footer-numbering">
   <description>
-    <p>page-footer-numbering defines the page numbering format of the pdf document..</p>
+    <p>
+      page-footer-numbering defines the page numbering format of the pdf
+      document..
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="page-footer-numbering">
+<![CDATA[<forrest:contract name="page-footer-numbering">
         [<forrest:property name="skip-first-page-numbering">[true|false]</forrest:property>]
         <!-- 
         Pattern of the page numbering in the footer - Default is "Page x".
@@ -49,18 +52,15 @@
       version="1.0">
       <xsl:param name="skip-first-page-numbering" select="'true'"/>
       <xsl:param name="page-numbering-format" select="'Page 1'"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/static-content">
-
             <fo:static-content flow-name="first-footer">
               <fo:block border-top="0.25pt solid"
                 padding-before="6pt" text-align="center">
                 <xsl:apply-templates select="footer"/>
               </fo:block>
-          
-              <!-- don't list page number on first page if it's contents is just the TOC -->
+<!-- don't list page number on first page if it's contents is just the TOC -->
               <xsl:if
                 test="not($skip-first-page-numbering)">
                 <xsl:call-template name="insertPageNumber">
@@ -69,7 +69,6 @@
                 </xsl:call-template>
               </xsl:if>
             </fo:static-content>
-        
             <fo:static-content flow-name="even-footer">
               <fo:block border-top="0.25pt solid"
                 padding-before="6pt" text-align="center">
@@ -80,7 +79,6 @@
                   end</xsl:with-param>
               </xsl:call-template>
             </fo:static-content>
-              
             <fo:static-content flow-name="odd-footer">
               <fo:block border-top="0.25pt solid"
                 padding-before="6pt" text-align="center">
@@ -91,13 +89,10 @@
                   start</xsl:with-param>
               </xsl:call-template>
             </fo:static-content>
-
           </forrest:part>
         </forrest:content>
-        
       </xsl:template>
-
-      <!-- Display the document numerotation -->
+<!-- Display the document numerotation -->
       <xsl:template name="insertPageNumber">
         <xsl:param name="text-align" select="'start'"/>
         <xsl:variable name="prefixe"
@@ -117,13 +112,11 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        
-        <!-- if 'page-numbering-format' contains 1 digits, the page number is displayed in the footer -->
+<!-- if 'page-numbering-format' contains 1 digits, the page number is displayed in the footer -->
         <xsl:if test="contains($page-numbering-format,'1')">
           <fo:block font-size="70%"
             text-align="{$text-align}">
-            
-            <!-- if the separator is not found, the total page number is skipped -->
+<!-- if the separator is not found, the total page number is skipped -->
             <xsl:value-of select="$prefixe"/>
             <fo:page-number/>
             <xsl:if test="$sep != ''">
@@ -134,7 +127,6 @@
           </fo:block>
         </xsl:if>
       </xsl:template>
-
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,12 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="page-header">
   <description>
-    <p>page-header define the header of the pdf.</p>
+    <p>
+      page-header define the header of the pdf.
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="page-header"
+<![CDATA[<forrest:contract name="page-header"
       dataURI="cocoon://#{$getRequest}.title.xml"/>]]>
   </usage>
   <forrest:template
@@ -33,7 +35,6 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/page-sequence">
@@ -52,7 +53,6 @@
           </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/ajax-example.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/ajax-example.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/ajax-example.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/ajax-example.ft Mon Apr  9 22:26:50 2007
@@ -19,7 +19,6 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="ajax-example" type="nugget">
-  
   <description>
     <p>
       This contract is an example how to use ajax in forrest.
@@ -34,13 +33,15 @@
       <div class="content">This example <strong>only</strong> works in <strong>http://localhost:8888/</strong>.</div>
     </div>
   </description>
-  <usage><![CDATA[<forrest:contract name="ajax-example"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="ajax-example"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="html" name="ajax-example" inputFormat="xsl" body="true" head="true">
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:template name="ajax-example-head">
-          <script type="text/javascript">
+      <xsl:template name="ajax-example-head">
+<script type="text/javascript">
              function preview(div){
                $(div).innerHTML="please stand by";
                var url = 'http://localhost:8888/less.contract.project-ajax-example.xml';
@@ -50,18 +51,20 @@
               alert('Sorry. There was an error.');
             }
         </script>
-        </xsl:template>
-        <xsl:template name="ajax-example-body">
-          <div class="warning">
-            <div class="label">Warning</div>
-            <div class="content">This example <strong>only</strong> works in <strong>http://localhost:8888/</strong>.</div>
-          </div>
-           <p>
-            This is an example how to use AJAX in forrest. The <a href="javascript:preview('testDiv')">test</a>
-           will update the testDiv with the output of url = 'http://localhost:8888/less.contract.project-ajax-example.xml';
-           </p>
-           <div id="testDiv">testDiv</div>
-        </xsl:template>
+      </xsl:template>
+      <xsl:template name="ajax-example-body">
+        <div class="warning">
+          <div class="label">Warning</div>
+          <div class="content">This example <strong>only</strong> works in <strong>http://localhost:8888/</strong>.</div>
+        </div>
+        <p>
+          This is an example how to use AJAX in forrest. The
+          <a href="javascript:preview('testDiv')">test</a> will update the
+          testDiv with the output of url =
+          'http://localhost:8888/less.contract.project-ajax-example.xml';
+        </p>
+        <div id="testDiv">testDiv</div>
+      </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/apache-ssi.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft Mon Apr  9 22:26:50 2007
@@ -19,22 +19,23 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="apache-ssi">
-  
   <description>
-    apache-ssi will output a ssi include link for the Apache webserver.
-    You can either use "virtual" or "file" includes. Will output something like:
-    <![CDATA[<!--#include virtual="file.html" -->]]>
+    apache-ssi will output a ssi include link for the Apache webserver. You can
+    either use "virtual" or "file" includes. Will output something like:
+<![CDATA[<!--#include virtual="file.html" -->]]>
   </description>
-  <usage><![CDATA[<forrest:contract name="apache-ssi">
+  <usage>
+<![CDATA[<forrest:contract name="apache-ssi">
   <forrest:property name="includeType">virtual|file</forrest:property>
   <forrest:property name="includePath">index.html</forrest:property>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="apache-ssi" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		<xsl:param name="includeType" select="'virtual|file'"/>
-		<xsl:param name="includePath" select="'../index.html'"/>
+      <xsl:param name="includeType" select="'virtual|file'"/>
+      <xsl:param name="includePath" select="'../index.html'"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -47,7 +48,8 @@
                 <xsl:otherwise> file="
                   <xsl:value-of select="$includePath"/>"
                   </xsl:otherwise>
-              </xsl:choose> </xsl:variable>
+              </xsl:choose>
+            </xsl:variable>
             <xsl:comment>
               <xsl:value-of
                 select="normalize-space($output)"/>
@@ -57,4 +59,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/blank.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/blank.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/blank.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/blank.ft Mon Apr  9 22:26:50 2007
@@ -19,26 +19,27 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="blank">
-  
-  <!--NOTE: 
+<!--NOTE: 
     When using the blank template as c'n p master just search and replace 'blank' by the {contract-name}!-->
-  
   <description>
-    blank will output {contract-funtion}. This is just a blank contract, it will output *nothing*.
+    blank will output {contract-funtion}. This is just a blank contract, it will
+    output *nothing*.
   </description>
-  <usage><![CDATA[<forrest:contract name="blank"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="blank"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="blank" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
-      <!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*/*[@name='skin-img-dir']/@value"/>-->
+<!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
+<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*/*[@name='skin-img-dir']/@value"/>-->
       <xsl:template match="/">
         <forrest:content>
-          <!--<forrest:part/>-->
-          <!--<forrest:part xpath="/html/head"/>-->
+<!--<forrest:part/>-->
+<!--<forrest:part xpath="/html/head"/>-->
         </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/branding-breadcrumbs.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.ft Mon Apr  9 22:26:50 2007
@@ -20,8 +20,8 @@
   <description>
     branding-breadcrumbs will output the breadcrumbs.
   </description>
-
-  <usage><![CDATA[<forrest:contract name="branding-breadcrumbs">
+  <usage>
+<![CDATA[<forrest:contract name="branding-breadcrumbs">
   <forrest:property name="branding-breadcrumbs">
     <trail>
       <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
@@ -29,50 +29,46 @@
       <link3 name="org.apache.forrest.plugin.output.themer" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.themer/"/>
     </trail>
   </forrest:property>
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </usage>
   <forrest:template 
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="branding-breadcrumbs" inputFormat="xsl">
-
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:param name="defaultVariables" select="'test.html'"/>
-        <xsl:param name="branding-breadcrumbs"/>
-        <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-
-        <xsl:template match="/">
-          <forrest:content>
-            <forrest:part>
-  <!--breadcrumbs org location-->
-<xsl:comment>+
+      <xsl:param name="defaultVariables" select="'test.html'"/>
+      <xsl:param name="branding-breadcrumbs"/>
+      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part>
+<!--breadcrumbs org location-->
+            <xsl:comment>+
     | start breadtrail
     +</xsl:comment>
-              <div class="breadtrail">
-                <xsl:if 
-                  test="($branding-breadcrumbs/trail/link1/@name)and($branding-breadcrumbs/trail/link1/@name!='')">
-                  <a href="{$branding-breadcrumbs/trail/link1/@href}">
-                    <xsl:value-of select="$branding-breadcrumbs/trail/link1/@name"/>
-                  </a>
-                </xsl:if>
-                <xsl:if 
+            <div class="breadtrail">
+              <xsl:if 
+                  test="($branding-breadcrumbs/trail/link1/@name)and($branding-breadcrumbs/trail/link1/@name!='')"><a href="{$branding-breadcrumbs/trail/link1/@href}">
+                <xsl:value-of select="$branding-breadcrumbs/trail/link1/@name"/></a>
+              </xsl:if>
+              <xsl:if 
                   test="($branding-breadcrumbs/trail/link2/@name)and($branding-breadcrumbs/trail/link2/@name!='')">
-                   &gt; <a href="{$branding-breadcrumbs/trail/link2/@href}"> 
-                  <xsl:value-of select="$branding-breadcrumbs/trail/link2/@name"/></a> 
-                  </xsl:if>
-                <xsl:if 
+                   &gt; <a href="{$branding-breadcrumbs/trail/link2/@href}">
+                <xsl:value-of select="$branding-breadcrumbs/trail/link2/@name"/></a>
+              </xsl:if>
+              <xsl:if 
                   test="($branding-breadcrumbs/trail/link3/@name)and($branding-breadcrumbs/trail/link3/@name!='')">
-                   &gt; <a href="{$branding-breadcrumbs/trail/link3/@href}"> 
-                  <xsl:value-of select="$branding-breadcrumbs/trail/link3/@name"/></a> 
-                  </xsl:if>
-                <script type="text/javascript" src="{$root}themes/breadcrumbs.js">&#160;</script>
-              </div>
-<xsl:comment>+
+                   &gt; <a href="{$branding-breadcrumbs/trail/link3/@href}">
+                <xsl:value-of select="$branding-breadcrumbs/trail/link3/@name"/></a>
+              </xsl:if>
+<script type="text/javascript" src="{$root}themes/breadcrumbs.js">&#160;</script>
+            </div>
+            <xsl:comment>+
     | end breadtrail
     +</xsl:comment>
-            </forrest:part>
-          </forrest:content>
-        </xsl:template>
+          </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/branding-css-links.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft Mon Apr  9 22:26:50 2007
@@ -19,24 +19,28 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="branding-css-links">
-  
   <description>
-    <p>branding-css-links will output html link elements for css usage. </p>
-    <p>The contract includes css files which are passed in parameter with the following syntax :</p>
-    <source><![CDATA[<css url="layout.]]><em>media</em>.css" [media="screen|print"] [theme="themeName"]<![CDATA[/>]]></source>
+    <p>
+      branding-css-links will output html link elements for css usage.
+    </p>
+
+    <p>
+      The contract includes css files which are passed in parameter with the
+      following syntax :
+    </p>
+    <source>
+<![CDATA[<css url="layout.]]><em>media</em>.css" [media="screen|print"] [theme="themeName"]<![CDATA[/>]]>
+    </source>
     <ul>
       <li><strong>url</strong> attribute indicates the name of the css file, the dispatcher
      searches for this file in the following order :
         <ul>
           <li>Does the css file exists in the following directory - if yes, use this one :
-            <source>$PROJECT_HOME/src/documentation/resources/themes/yourtheme/css/</source>
-          </li>
+            <source>$PROJECT_HOME/src/documentation/resources/themes/yourtheme/css/</source></li>
           <li>Otherwise, does the css file exists in the following directory - if yes, use this one :
-            <source>$FORREST_HOME/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/yourtheme/css/</source>
-          </li>
+            <source>$FORREST_HOME/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/yourtheme/css/</source></li>
           <li>Otherwise, does the css file exists in the following directory - if yes, use this one :
-            <source>$FORREST_HOME/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/common/css/</source>
-          </li>
+            <source>$FORREST_HOME/whiteboard/plugins/org.apache.forrest.themes.core/resources/themes/common/css/</source></li>
         </ul>
      The <strong>url</strong> attribute is required.
       </li>
@@ -48,12 +52,15 @@
           <li>othervalues can also be managed by browsers.cf. <a href="http://www.w3.org/TR/REC-CSS2/media.html#media-types" class="fork">W3C Media Types</a>.</li>
         </ul>
         <div class="note">
-        <div class="label">Firefox has a bug !</div>
-        <div class="content">
-          <p>There is a bug with firefox which does not manage media attribute while printing, the bug is already declared twice in bugzilla, so we are waiting...</p>
-        </div>
-        </div>
-      </li>
+          <div class="label">Firefox has a bug !</div>
+          <div class="content">
+            <p>
+              There is a bug with firefox which does not manage media attribute
+              while printing, the bug is already declared twice in bugzilla, so
+              we are waiting...
+            </p>
+          </div>
+        </div></li>
       <li><strong>theme</strong> attribute indicates to the browser for which theme this
         stylesheet should be used, letting you add several css files
         corresponding to different themes of the same page.<br/>
@@ -61,12 +68,14 @@
       </li>
     </ul>
   </description>
-  <usage><![CDATA[<forrest:contract name="branding-css-links">
+  <usage>
+<![CDATA[<forrest:contract name="branding-css-links">
       <forrest:property name="branding-css-links-input">
         <css url="common.css"/>
         <css .../>
       </forrest:property>
-    </forrest:contract>]]></usage>
+    </forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="branding-css-links" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -76,7 +85,6 @@
       <xsl:param name="branding-css-links-input"/>
       <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
       <xsl:variable name="theme" select="$defaultVariables/*/*[@name='theme']/@value"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
@@ -86,50 +94,52 @@
       </xsl:template>
       <xsl:template 
         match="css[@url]">
-        <xsl:copy-of select="@rel"/>
-        <link type="text/css">
-          <xsl:choose>
-            <xsl:when test="@rel">
-              <xsl:attribute name="rel">
-                <xsl:value-of select="@rel"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="rel">stylesheet</xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
+        <xsl:copy-of select="@rel"/><link type="text/css">
+        <xsl:choose>
+          <xsl:when test="@rel">
+            <xsl:attribute name="rel">
+              <xsl:value-of select="@rel"/>
+            </xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="rel">stylesheet</xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="@theme">
+            <xsl:attribute name="title">
+              <xsl:value-of select="@theme"/>
+            </xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="title">
+              <xsl:value-of select="concat( translate( substring($theme, 1, 1), 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'), substring($theme,2))"/>
+            </xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:variable name="prefix">
           <xsl:choose>
-            <xsl:when test="@theme">
-              <xsl:attribute name="title">
-                <xsl:value-of select="@theme"/>
-              </xsl:attribute>
+            <xsl:when test="@prefix">
+              <xsl:value-of select="@prefix"/>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:attribute name="title">
-                <xsl:value-of select="concat( translate( substring($theme, 1, 1), 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'), substring($theme,2))"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:variable name="prefix">
-            <xsl:choose>
-              <xsl:when test="@prefix">
-                <xsl:value-of select="@prefix"/>
-              </xsl:when>
-              <xsl:otherwise>
                 themes/
               </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-          <xsl:attribute name="href"> <xsl:value-of 
-            select="$root"/><xsl:value-of 
-            select="normalize-space($prefix)"/><xsl:value-of 
-            select="@url"/> </xsl:attribute>
-          <xsl:if test="@media">
-            <xsl:attribute name="media">
-              <xsl:value-of select="@media"/>
-            </xsl:attribute>
-          </xsl:if>
-        </link>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:attribute name="href">
+          <xsl:value-of 
+            select="$root"/>
+          <xsl:value-of 
+            select="normalize-space($prefix)"/>
+          <xsl:value-of 
+            select="@url"/>
+        </xsl:attribute>
+        <xsl:if test="@media">
+          <xsl:attribute name="media">
+            <xsl:value-of select="@media"/>
+          </xsl:attribute>
+        </xsl:if></link>
       </xsl:template>
       <xsl:template match="css[not(@url)]">
         <style type="text/css">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft Mon Apr  9 22:26:50 2007
@@ -21,25 +21,27 @@
   <description>
     branding-fontsize lets users change the size of the font via javascript.
   </description>
-  <usage><![CDATA[<forrest:contract name="branding-fontsize"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="branding-fontsize"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" name="branding-fontsize" inputFormat="xsl">
-<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:param name="defaultVariables"/>
-  <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/fontsize.js">&#160;</script>
-        </forrest:part>
-        <forrest:part>
-          <script type="text/javascript">ndeSetTextSize();</script>
-          <i18n:text >Font size:</i18n:text>
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="defaultVariables"/>
+      <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/fontsize.js">&#160;</script>
+          </forrest:part>
+          <forrest:part>
+<script type="text/javascript">ndeSetTextSize();</script>
+            <i18n:text >Font size:</i18n:text>
           &#160;<input type="button" onclick="ndeSetTextSize('reset'); return false;" title="Reset text" class="resetfont" value="Reset"/>
           &#160;<input type="button" onclick="ndeSetTextSize('decr'); return false;" title="Shrink text" class="smallerfont" value="-a"/>
           &#160;<input type="button" onclick="ndeSetTextSize('incr'); return false;" title="Enlarge text" class="biggerfont" value="+a"/>
-        </forrest:part>
-      </forrest:content>
-    </xsl:template>
-</xsl:stylesheet>
-</forrest:template>
+          </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/branding-logo.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.ft Mon Apr  9 22:26:50 2007
@@ -18,20 +18,22 @@
 <forrest:contract name="branding-logo"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>This contract will output images. You can configure it like follow:</p>
+    <p>
+      This contract will output images. You can configure it like follow:
+    </p>
     <ul>
-          <li>branding-logo-name - will be used for @alt value of the &lt;img&gt; </li>
-          <li>branding-logo-description - will be used for @title value of the &lt;img&gt; </li>
-          <li>branding-logo-url - will be used for the @href location of a surrounding &lt;a&gt;  </li>
-          <li>branding-logo-logo - will be used for @src value of the &lt;img&gt; </li>
-          <li>branding-logo-over - if used then a javascript will be rendered which switches the images.
+      <li>branding-logo-name - will be used for @alt value of the &lt;img&gt; </li>
+      <li>branding-logo-description - will be used for @title value of the &lt;img&gt; </li>
+      <li>branding-logo-url - will be used for the @href location of a surrounding &lt;a&gt;  </li>
+      <li>branding-logo-logo - will be used for @src value of the &lt;img&gt; </li>
+      <li>branding-logo-over - if used then a javascript will be rendered which switches the images.
              Will be used for @onmouseover image @src value of the &lt;img&gt; </li>
-           <li>branding-logo-width - will be used for @width value of the &lt;img&gt; </li>
-           <li>branding-logo-height - will be used for @height value of the &lt;img&gt; </li>
-        </ul>
+      <li>branding-logo-width - will be used for @width value of the &lt;img&gt; </li>
+      <li>branding-logo-height - will be used for @height value of the &lt;img&gt; </li>
+    </ul>
   </description>
-
-  <usage><![CDATA[<forrest:contract name="branding-logo">
+  <usage>
+<![CDATA[<forrest:contract name="branding-logo">
   <forrest:property name="branding-logo-name">Apache Forrest</forrest:property>
   <forrest:property name="branding-logo-description">Apache Forrest</forrest:property>
   <forrest:property name="branding-logo-url">http://forrest.apache.org/</forrest:property>
@@ -39,30 +41,29 @@
   [<forrest:property name="branding-logo-over">images/project-logo_over.gif</forrest:property>]
   [<forrest:property name="branding-logo-width">500</forrest:property>]
   [<forrest:property name="branding-logo-height">490</forrest:property>]
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="branding-logo" inputFormat="xsl">
-
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>
-        <xsl:param name="defaultVariables" select="'test.html'"/>
-        <xsl:param name="branding-logo-name"/>
-        <xsl:param name="branding-logo-description"/>
-        <xsl:param name="branding-logo-url"/>
-        <xsl:param name="branding-logo-logo"/>
-        <xsl:param name="branding-logo-over"/>
-        <xsl:param name="branding-logo-width"/>
-        <xsl:param name="branding-logo-height"/>
-        <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+      <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>
+      <xsl:param name="defaultVariables" select="'test.html'"/>
+      <xsl:param name="branding-logo-name"/>
+      <xsl:param name="branding-logo-description"/>
+      <xsl:param name="branding-logo-url"/>
+      <xsl:param name="branding-logo-logo"/>
+      <xsl:param name="branding-logo-over"/>
+      <xsl:param name="branding-logo-width"/>
+      <xsl:param name="branding-logo-height"/>
+      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-<xsl:comment>+
+            <xsl:comment>+
     |start Logo
-    +</xsl:comment> 
+    +</xsl:comment>
             <xsl:call-template name="renderlogo">
               <xsl:with-param name="name" select="normalize-space($branding-logo-name)"/>
               <xsl:with-param name="url" select="normalize-space($branding-logo-url)"/>
@@ -74,14 +75,12 @@
               <xsl:with-param name="description" 
                 select="normalize-space($branding-logo-description)"/>
             </xsl:call-template>
-<xsl:comment>+
+            <xsl:comment>+
     |end group Logo
-    +</xsl:comment> 
+    +</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/branding-tagline.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.ft Mon Apr  9 22:26:50 2007
@@ -17,13 +17,16 @@
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0" 
   name="branding-tagline">
-  <description> branding-tagline will output the site name and tagline. 
-    </description>
-  <usage><![CDATA[<forrest:contract name="branding-tagline">
+  <description>
+    branding-tagline will output the site name and tagline.
+  </description>
+  <usage>
+<![CDATA[<forrest:contract name="branding-tagline">
   <forrest:property name="branding-tagline-name">new seed</forrest:property>
   <forrest:property name="branding-tagline-tagline">powered by 
       forrest:views</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="branding-tagline" inputFormat="xsl">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.ft Mon Apr  9 22:26:50 2007
@@ -19,17 +19,25 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="branding-theme-switcher">
-  
   <description>
-    <p> <strong>branding-theme-switcher</strong> provides a way to switch the 
-      underlying stylesheets (b). </p>
-    <pre class="code"><![CDATA[A theme is a presentation layer that provides an aggregation of
+    <p>
+      <strong>branding-theme-switcher</strong> provides a way to switch the
+      underlying stylesheets (b).
+    </p>
+    <pre class="code">
+<![CDATA[A theme is a presentation layer that provides an aggregation of
 a) theme structure information (*.fv)
 b) theme style information (*.css & *.png|jpg|gif|...)
-c) theme functionality (*.js & *.ft)]]> </pre>
-    <p> A "real" theme switcher would change a/b/c. </p>
-    <p> A "real" color-theme switcher should also provide a possibility to 
-      change each color with a WEB-GUI. </p>
+c) theme functionality (*.js & *.ft)]]>
+    </pre>
+    <p>
+      A "real" theme switcher would change a/b/c.
+    </p>
+
+    <p>
+      A "real" color-theme switcher should also provide a possibility to change
+      each color with a WEB-GUI.
+    </p>
     <div class="note">
       <div class="label">Note</div>
       <div class="content">
@@ -40,12 +48,14 @@
       </div>
     </div>
     <p>
-      In combination with the branding-theme-profiler this contract provides a quick way to create new themes. The default theme 
-      can have unlimited color derivatives. If you turn on the color profiling this contract will activate the default theme in combination 
-      with the profiling styles.
+      In combination with the branding-theme-profiler this contract provides a
+      quick way to create new themes. The default theme can have unlimited color
+      derivatives. If you turn on the color profiling this contract will
+      activate the default theme in combination with the profiling styles.
     </p>
   </description>
-  <usage><![CDATA[<forrest:contract name="branding-theme-switcher">
+  <usage>
+<![CDATA[<forrest:contract name="branding-theme-switcher">
   <!-- branding-theme-switcher-profiler and branding-theme-switcher-defaultTheme are required -->
   <!-- branding-theme-switcher-profiler {true|false} only works on the defaultTheme -->
   <forrest:property name="branding-theme-switcher-profiler" activated="true"/>
@@ -55,56 +65,56 @@
     in the same position, so uncomment the one you want. -->
   <!--<forrest:property name="branding-theme-switcher-a" seperator="|" caption="Theme switcher: "/>-->
   <!--<forrest:property name="branding-theme-switcher-select" caption="Theme switcher: "/>-->
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="branding-theme-switcher" inputFormat="xsl">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:param name="defaultVariables" select="'test.html'"/>
-        <xsl:param name="branding-theme-switcher-defaultTheme" />
-        <xsl:param name="branding-theme-switcher-profiler" />
-        <xsl:param name="branding-theme-switcher-a" select="'false'"/>
-        <xsl:param name="branding-theme-switcher-select" select="'false'"/>
-        <xsl:variable name="seperator" select="$branding-theme-switcher-a/@seperator"/>
-        <xsl:variable name="caption" select="$branding-theme-switcher-a/@caption"/>
-        <xsl:variable name="captionSelect" select="$branding-theme-switcher-select/@caption"/>
-        <xsl:variable name="defaultTheme" select="$branding-theme-switcher-defaultTheme/@defaultTheme"/>
-        <xsl:variable name="profilerActivated" select="$branding-theme-switcher-profiler/@activated"/>
-        <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-          
-        <xsl:template match="/">
-            <forrest:content>
-            <forrest:part xpath="/html/head">
-                <script type="text/javascript" 
+      <xsl:param name="defaultVariables" select="'test.html'"/>
+      <xsl:param name="branding-theme-switcher-defaultTheme" />
+      <xsl:param name="branding-theme-switcher-profiler" />
+      <xsl:param name="branding-theme-switcher-a" select="'false'"/>
+      <xsl:param name="branding-theme-switcher-select" select="'false'"/>
+      <xsl:variable name="seperator" select="$branding-theme-switcher-a/@seperator"/>
+      <xsl:variable name="caption" select="$branding-theme-switcher-a/@caption"/>
+      <xsl:variable name="captionSelect" select="$branding-theme-switcher-select/@caption"/>
+      <xsl:variable name="defaultTheme" select="$branding-theme-switcher-defaultTheme/@defaultTheme"/>
+      <xsl:variable name="profilerActivated" select="$branding-theme-switcher-profiler/@activated"/>
+      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part xpath="/html/head">
+<script type="text/javascript" 
                     src="{$root}themes/cssStyleSwitcher.js">&#160;</script>
-                <script type="text/javascript"> 
+<script type="text/javascript"> 
                     initBrandingThemeSwitcher('<xsl:value-of 
                     select="$defaultTheme"/>','<xsl:value-of 
                     select="$profilerActivated"/>'); </script>
-            </forrest:part>
-            <forrest:part>
-                <xsl:if test="$branding-theme-switcher-a!='false'">xx
+          </forrest:part>
+          <forrest:part>
+            <xsl:if test="$branding-theme-switcher-a!='false'">xx
             <xsl:value-of select="$caption"/>
-            <span id="theme-switcher-dyn-a">dynamic theme switcher links</span>
-            <script type="text/javascript"> 
+              <span id="theme-switcher-dyn-a">dynamic theme switcher links</span>
+<script type="text/javascript"> 
               initASwitcher('theme-switcher-dyn-a','<xsl:value-of 
               select="$seperator"/>'); </script>
-          </xsl:if>
-          <xsl:if test="$branding-theme-switcher-select!='false'">
-            <div class="theme-switcher-dyn">
-              <form action="">
-                <xsl:value-of select="$captionSelect"/>
-                <select id="themeSwitcherSelect" 
+            </xsl:if>
+            <xsl:if test="$branding-theme-switcher-select!='false'">
+              <div class="theme-switcher-dyn">
+                <form action="">
+                  <xsl:value-of select="$captionSelect"/>
+                  <select id="themeSwitcherSelect" 
                   onchange="switchThemeSelect(this);">
-                  <option value="-1">Select a theme</option>
-                </select>
-              </form>
-              <script type="text/javascript"> 
+                    <option value="-1">Select a theme</option>
+                  </select>
+                </form>
+<script type="text/javascript"> 
                 initSelectSwitcher('themeSwitcherSelect'); </script>
-            </div>
-          </xsl:if>
-            </forrest:part>
-            </forrest:content>
-        </xsl:template>
+              </div>
+            </xsl:if>
+          </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-abstract.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-abstract.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-abstract.ft Mon Apr  9 22:26:50 2007
@@ -20,12 +20,14 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-abstract">
   <description>
-    content-abstract will output the abstract of the content. 
+    content-abstract will output the abstract of the content.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-abstract" inputFormat="xsl" >
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -37,6 +39,6 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-	  </xsl:stylesheet>
+    </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-author.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-author.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-author.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-author.ft Mon Apr  9 22:26:50 2007
@@ -20,21 +20,23 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-author" type="nugget">
   <description>
-    content-author will output the author of the content. 
+    content-author will output the author of the content.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-author"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-author"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="html" name="content-author" inputFormat="xsl" body="true" head="false">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	    <xsl:template name="content-author-body">
-	<xsl:comment>+
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="content-author-body">
+        <xsl:comment>+
 	    |start content-author
 	    +</xsl:comment>
-			  <xsl:copy-of select="div[@id='content']/div[@class='author']"/>
-<xsl:comment>+
+        <xsl:copy-of select="div[@id='content']/div[@class='author']"/>
+        <xsl:comment>+
     |end content-author
     +</xsl:comment>
-		  </xsl:template>
-	  </xsl:stylesheet>
+      </xsl:template>
+    </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-authors.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-authors.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-authors.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-authors.ft Mon Apr  9 22:26:50 2007
@@ -19,13 +19,15 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    content-authors will output the authors of the content. 
+    content-authors will output the authors of the content.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-authors" 
-          dataURI="cocoon://#{$getRequest}.authors.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-authors" 
+          dataURI="cocoon://#{$getRequest}.authors.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-authors" inputFormat="xsl">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -47,7 +49,7 @@
                 <xsl:when test="position()=1">by</xsl:when>
                 <xsl:otherwise>,</xsl:otherwise>
               </xsl:choose>
-              <xsl:text>
+<xsl:text>
               </xsl:text>
               <span class="name">
                 <xsl:value-of select="./div[@class='name']/text()"/>
@@ -56,6 +58,6 @@
           </p>
         </xsl:if>
       </xsl:template>
-	  </xsl:stylesheet>
+    </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-css.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-css.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-css.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-css.ft Mon Apr  9 22:26:50 2007
@@ -19,21 +19,30 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-css">
-  
   <description>
-    <warning>Use at your own risk!!!</warning>
+    <warning>
+      Use at your own risk!!!
+    </warning>
+
     <note>
-      Allowing and activating abitrary styles has its danger. The problem is that Forrest 
-attempts to provide a unified output formats regardless of the input 
-format. If you use this contract and allow arbitrary styles through then forrest loose the ability 
-to do this because user can create "headings" by making text larger and 
-bold, for example. Forrest has no way of knowing this is supposed to be 
-a heading and therefore cannot render it as such.
+      Allowing and activating abitrary styles has its danger. The problem is
+      that Forrest attempts to provide a unified output formats regardless of
+      the input format. If you use this contract and allow arbitrary styles
+      through then forrest loose the ability to do this because user can create
+      "headings" by making text larger and bold, for example. Forrest has no way
+      of knowing this is supposed to be a heading and therefore cannot render it
+      as such.
     </note>
-    <p>This contract picks up the style element of the input and pass it through to the output.</p>
+
+    <p>
+      This contract picks up the style element of the input and pass it through
+      to the output.
+    </p>
   </description>
-  <usage><![CDATA[<forrest:contract name="content-css" 
-  dataURI="cocoon://#{$getRequest}.body.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-css" 
+  dataURI="cocoon://#{$getRequest}.body.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-css" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -52,4 +61,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/content-feeder.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-feeder.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-feeder.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-feeder.ft Mon Apr  9 22:26:50 2007
@@ -15,33 +15,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <forrest:contract name="content-feeder"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    content-feeder will output the html information retrieved by the feeder plugin (needs to be installed!). 
+    content-feeder will output the html information retrieved by the feeder
+    plugin (needs to be installed!).
   </description>
-	<usage><![CDATA[<forrest:contract name="content-feeder" dataUri="/feeds/somefeed.rss.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-feeder" dataUri="/feeds/somefeed.rss.xml"/>]]>
+  </usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-feeder" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:variable name="content-feeder" select="/"/>
-	    <xsl:template match="/" >
+      <xsl:template match="/" >
         <forrest:content>
           <forrest:part>
             <xsl:apply-templates select="$content-feeder/document"/>
           </forrest:part>
         </forrest:content>
-			</xsl:template>
-      
+      </xsl:template>
       <xsl:template match="document">
         <div id="content-feeder">
-		     <xsl:apply-templates select="body/section"/>
-		    </div>
+          <xsl:apply-templates select="body/section"/>
+        </div>
       </xsl:template>
-      
       <xsl:template match="section">
         <div class="channelTitle">
           <xsl:value-of select="title"/>
@@ -50,18 +50,13 @@
           <xsl:apply-templates select="p[@class]"/>
         </div>
       </xsl:template>
-      
-      <xsl:template match="link">
-        <a href="{@href}">...more</a>
+      <xsl:template match="link"><a href="{@href}">...more</a>
       </xsl:template>
-      
       <xsl:template match="p[@class]">
         <div class="{@class}">
           <xsl:apply-templates/>
         </div>
-			</xsl:template>
-    
+      </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/content-include-html.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-include-html.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-include-html.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-include-html.ft Mon Apr  9 22:26:50 2007
@@ -15,15 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <forrest:contract name="content-include-html" type="nugget"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  
   <description>
-    content-include-html retrieves the content from a Forrest generated HTML document and
-    includes the current document.
+    content-include-html retrieves the content from a Forrest generated HTML
+    document and includes the current document.
   </description>
-	
   <usage>
 <![CDATA[<forrest:contract name="content-include-html">
     <forrest:properties contract="content-include-html">
@@ -32,8 +29,7 @@
       </forrest:property>
     </forrest:properties>
 </forrest:contract>]]>
-   </usage>
-  
+  </usage>
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="html" 
@@ -41,16 +37,12 @@
     inputFormat="xsl" 
     body="true" 
     head="false">
-    
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        
-	    <xsl:template name="content-include-html-body" > 
-	      <xsl:param name="content-include-html"/>
+      <xsl:template name="content-include-html-body" >
+        <xsl:param name="content-include-html"/>
         <xsl:copy-of select="$content-include-html//div[@id='content']/*"/>
-			</xsl:template>
-    
+      </xsl:template>
     </xsl:stylesheet>
-    
-	</forrest:template>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-ls-contracts.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-ls-contracts.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-ls-contracts.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-ls-contracts.ft Mon Apr  9 22:26:50 2007
@@ -15,14 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <forrest:contract name="content-ls-contracts" type="nugget"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    content-ls-contracts will output the contracts provided by the 
-    themer plugin (the org.apache.forrest.plugin.input.viewHelper.xhtml.ls needs to be installed!). 
+    content-ls-contracts will output the contracts provided by the themer plugin
+    (the org.apache.forrest.plugin.input.viewHelper.xhtml.ls needs to be
+    installed!).
   </description>
-	<usage><![CDATA[<forrest:contract name="content-ls-contracts">
+  <usage>
+<![CDATA[<forrest:contract name="content-ls-contracts">
   <forrest:properties contract="content-ls-contracts">
     <forrest:property name="content-ls-contracts" 
       nugget="get.nugget.ls.contracts">
@@ -31,22 +32,22 @@
     <forrest:property name="content-ls-contracts-config" file="true" 
       description="false" usage="true" path="false"/>
   </forrest:properties>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="html" name="content-ls-contracts" inputFormat="xsl" body="true" head="false">
-
-   <xsl:stylesheet version="1.1" 
+    <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	   <xsl:template name="content-ls-contracts-body" >
-	      <xsl:param name="content-ls-contracts"/>
+      <xsl:template name="content-ls-contracts-body" >
+        <xsl:param name="content-ls-contracts"/>
         <xsl:param name="content-ls-contracts-config"/>
         <div id="content-ls-contracts">
-					<xsl:apply-templates select="$content-ls-contracts/document">
+          <xsl:apply-templates select="$content-ls-contracts/document">
             <xsl:with-param name="content-ls-contracts-config" select="$content-ls-contracts-config"/>
-					</xsl:apply-templates>
-      	</div>    
-			</xsl:template>
+          </xsl:apply-templates>
+        </div>
+      </xsl:template>
       <xsl:template match="document">
         <xsl:param name="content-ls-contracts-config"/>
         <xsl:if test="normalize-space(header/title)!=''">
@@ -58,52 +59,57 @@
           </xsl:apply-templates>
         </xsl:if>
       </xsl:template>
-      
       <xsl:template match="section">
         <xsl:param name="content-ls-contracts-config"/>
-	    <!-- count the number of section in the ancestor-or-self axis to compute
+<!-- count the number of section in the ancestor-or-self axis to compute
 	         the title element name later on -->
-	    <xsl:variable name="sectiondepth" select="count(ancestor-or-self::section)"/>
-	    <!-- generate a title element, level 1 -> h3, level 2 -> h4 and so on... -->
-	    <xsl:element name="{concat('h',$sectiondepth + 2)}">
-	      <xsl:value-of select="title"/>
-	    </xsl:element>
-	
-	    <xsl:apply-templates select="*[not(self::title)]">
-        <xsl:with-param name="content-ls-contracts-config" select="$content-ls-contracts-config"/>
-	    </xsl:apply-templates>
-	  </xsl:template>
-      
+        <xsl:variable name="sectiondepth" select="count(ancestor-or-self::section)"/>
+<!-- generate a title element, level 1 -> h3, level 2 -> h4 and so on... -->
+        <xsl:element name="{concat('h',$sectiondepth + 2)}">
+          <xsl:value-of select="title"/>
+        </xsl:element>
+        <xsl:apply-templates select="*[not(self::title)]">
+          <xsl:with-param name="content-ls-contracts-config" select="$content-ls-contracts-config"/>
+        </xsl:apply-templates>
+      </xsl:template>
       <xsl:template match="source">
-		    <pre class="code">
-		      <xsl:apply-templates/>
-		    </pre>
-		  </xsl:template>
+        <pre class="code">
+          <xsl:apply-templates/>
+        </pre>
+      </xsl:template>
       <xsl:template match="p[@class='file']">
         <xsl:param name="content-ls-contracts-config"/>
         <xsl:if test="$content-ls-contracts-config[@file='true']">
-          <p class="{@class}"><xsl:apply-templates/></p>
+          <p class="{@class}">
+            <xsl:apply-templates/>
+          </p>
         </xsl:if>
-		  </xsl:template>
+      </xsl:template>
       <xsl:template match="p[@class='description']">
         <xsl:param name="content-ls-contracts-config"/>
         <xsl:if test="$content-ls-contracts-config[@description='true']">
-          <p class="{@class}"><xsl:apply-templates/></p>
+          <p class="{@class}">
+            <xsl:apply-templates/>
+          </p>
         </xsl:if>
-		  </xsl:template>
+      </xsl:template>
       <xsl:template match="p[@class='usage']">
         <xsl:param name="content-ls-contracts-config"/>
         <xsl:if test="$content-ls-contracts-config[@usage='true']">
-          <p class="{@class}"><xsl:apply-templates/></p>
+          <p class="{@class}">
+            <xsl:apply-templates/>
+          </p>
         </xsl:if>
-		  </xsl:template>
+      </xsl:template>
       <xsl:template match="p[@class='realpath']">
         <xsl:param name="content-ls-contracts-config"/>
         <xsl:if test="$content-ls-contracts-config[@realpath='true']">
-          <p class="{@class}"><xsl:apply-templates/></p>
+          <p class="{@class}">
+            <xsl:apply-templates/>
+          </p>
         </xsl:if>
-		  </xsl:template>
+      </xsl:template>
       <xsl:template match="p"/>
     </xsl:stylesheet>
-	</forrest:template>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main-lenya.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main-lenya.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main-lenya.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main-lenya.ft Mon Apr  9 22:26:50 2007
@@ -22,27 +22,29 @@
   <description>
     content-main-lenya - Template will output the content-main-lenya.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main-lenya">
+  <usage>
+<![CDATA[<forrest:contract name="content-main-lenya">
   <forrest:properties contract="content-main-lenya">
     <forrest:property name="content-main-lenya" 
       nugget="get.nugget.lenya.content.main">
       <url>lenya/test.html</url>
     </forrest:property>
   </forrest:properties>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="html" name="content-main-lenya" inputFormat="xsl" body="true" head="false">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	    <xsl:template name="content-main-lenya-body" >
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="content-main-lenya-body" >
         <xsl:param name="content-main-lenya"/>
-	<xsl:comment>+
+        <xsl:comment>+
 	    |start content-main-lenya
-	    +</xsl:comment> 
-			  <xsl:copy-of select="$content-main-lenya//div[@id='body']/*"/>
-<xsl:comment>+
+	    +</xsl:comment>
+        <xsl:copy-of select="$content-main-lenya//div[@id='body']/*"/>
+        <xsl:comment>+
     |end content-main-lenya
     +</xsl:comment>
-		  </xsl:template>
-	  </xsl:stylesheet>
+      </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-main.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main.ft Mon Apr  9 22:26:50 2007
@@ -22,11 +22,13 @@
   <description>
     content-main - Template will output the content-main.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main" 
-            dataURI="cocoon://#{$getRequest}.body.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-main" 
+            dataURI="cocoon://#{$getRequest}.body.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-main" inputFormat="xsl">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -37,6 +39,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/content-minitoc.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-minitoc.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-minitoc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-minitoc.ft Mon Apr  9 22:26:50 2007
@@ -18,18 +18,16 @@
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-minitoc">
   <description>
-    content-minitoc - Configure the TOC, i.e. the Table of Contents.
-  @max-depth - 
-   how many "section" levels need to be included in the
-   generated Table of Contents (TOC). 
-  @min-sections - 
-   Minimum required to create a TOC.
-  @location ("page","menu","page,menu", "none") - 
-   Where to show the TOC.
+    content-minitoc - Configure the TOC, i.e. the Table of Contents. @max-depth
+    - how many "section" levels need to be included in the generated Table of
+    Contents (TOC). @min-sections - Minimum required to create a TOC. @location
+    ("page","menu","page,menu", "none") - Where to show the TOC.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-minitoc" dataURI="cocoon://#{$getRequest}.toc.xml">
+  <usage>
+<![CDATA[<forrest:contract name="content-minitoc" dataURI="cocoon://#{$getRequest}.toc.xml">
   <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1" location="page"/>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     name="content-minitoc" inputFormat="xsl" >
     <xsl:stylesheet version="1.1" 
@@ -61,17 +59,14 @@
           <xsl:if test="contains($content-minitoc-conf/@location,'page')">
             <ul class="minitoc">
               <xsl:for-each select="$tocroot/tocitem">
-                <li>
-                  <a href="{@href}"> 
-                    <xsl:value-of select="@title"/> 
-                  </a>
+                <li><a href="{@href}">
+                  <xsl:value-of select="@title"/></a>
                   <xsl:if 
                     test="@level&#60;$content-minitoc-conf/@max-depth+1">
                     <xsl:call-template name="content-minitoc-processing">
                       <xsl:with-param name="tocroot" select="."/>
                     </xsl:call-template>
-                  </xsl:if>
-                </li>
+                  </xsl:if></li>
               </xsl:for-each>
             </ul>
           </xsl:if>
@@ -79,4 +74,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/content-motd-page.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.ft Mon Apr  9 22:26:50 2007
@@ -19,28 +19,48 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-motd-page">
-
   <description>
-    <p>Message of the day (MOTD). <br/> If the optional &lt;motd&gt; element is 
-      used, then messages will be appended depending on the URI string pattern.
-      </p>
-    <p> motd-option : <br/>Each option will match a pattern and apply its text. 
-      The "pattern" attribute specifies the pattern to be matched. This can be 
-      a specific page, or a general pattern to match a set of pages, e.g. 
-      everything in the "samples" directory. </p>
-    <p>motd-title : <br/>This text will be added in brackets after the 
-      &lt;html>&lt;title> and this can be empty. </p>
-    <p>motd-page : <br/>This text will be added in a panel on the face of the 
-      page, with the "motd-page-url" being the hyperlink "More". </p>
-    <p>Values for the "location" attribute are: </p>
+    <p>
+      Message of the day (MOTD).
+      <br/>
+      If the optional &lt;motd&gt; element is used, then messages will be
+      appended depending on the URI string pattern.
+    </p>
+
+    <p>
+      motd-option :
+      <br/>
+      Each option will match a pattern and apply its text. The "pattern"
+      attribute specifies the pattern to be matched. This can be a specific
+      page, or a general pattern to match a set of pages, e.g. everything in the
+      "samples" directory.
+    </p>
+
+    <p>
+      motd-title :
+      <br/>
+      This text will be added in brackets after the &lt;html>&lt;title> and this
+      can be empty.
+    </p>
+
+    <p>
+      motd-page :
+      <br/>
+      This text will be added in a panel on the face of the page, with the
+      "motd-page-url" being the hyperlink "More".
+    </p>
+
+    <p>
+      Values for the "location" attribute are:
+    </p>
     <ul>
       <li>page : on the face of the page, e.g. in the spare space of </li>
       <li>the toc alt : at the bottom of the left-hand navigation panel</li>
       <li>both : both </li>
     </ul>
   </description>
-
-  <usage><![CDATA[<forrest:contract name="content-motd-page">
+  <usage>
+<![CDATA[<forrest:contract name="content-motd-page">
   <forrest:property name="content-motd-page">
     <motd>
       <motd-option pattern="samples/sample.html">
@@ -59,15 +79,14 @@
       </motd-option>
     </motd>
   </forrest:property>
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-motd-page" inputFormat="xsl">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:param name="content-motd-page"/>
       <xsl:variable name="path" select="$defaultVariables/*/*[@name='path']/@value"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -78,14 +97,12 @@
                   <div class="motd-area">
                     <xsl:value-of select="motd-page"/>
                     <xsl:if test="motd-page-url">
-                      <xsl:text> (</xsl:text>
-                      <a>
-                        <xsl:attribute name="href">
-                          <xsl:value-of select="motd-page-url"/>
-                        </xsl:attribute>
-                          <i18n:text >More</i18n:text>
-                      </a>
-                      <xsl:text>)</xsl:text>
+<xsl:text> (</xsl:text><a>
+                      <xsl:attribute name="href">
+                        <xsl:value-of select="motd-page-url"/>
+                      </xsl:attribute>
+                      <i18n:text >More</i18n:text></a>
+<xsl:text>)</xsl:text>
                     </xsl:if>
                   </div>
                 </xsl:if>
@@ -97,4 +114,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/content-pdf-link.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.ft Mon Apr  9 22:26:50 2007
@@ -20,25 +20,25 @@
   <description>
     content-pdf-link will output the PDF link with image to the content.
   </description>
-	<usage><![CDATA[<forrest:contract name="content-pdf-link"/>]]></usage>
-	<forrest:template
+  <usage>
+<![CDATA[<forrest:contract name="content-pdf-link"/>]]>
+  </usage>
+  <forrest:template
   	xmlns:forrest="http://apache.org/forrest/templates/1.0"
   	name="content-pdf-link" inputFormat="xsl" >
-  	<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:variable name="skin-img-dir" select="$defaultVariables/*/*[@name='skin-img-dir']/@value"/>
       <xsl:variable name="filename-noext" select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
-       <xsl:template match="/">
+      <xsl:template match="/">
         <forrest:content>
-          <forrest:part>
-            <a href="{$filename-noext}.pdf" class="format">
-              <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" 
+          <forrest:part><a href="{$filename-noext}.pdf" class="format">
+            <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" 
                 alt="PDF - icon"/>
-              <span class="caption">PDF</span>
-            </a>
+            <span class="caption">PDF</span></a>
           </forrest:part>
         </forrest:content>
       </xsl:template>
-		</xsl:stylesheet>
-	</forrest:template>
+    </xsl:stylesheet>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.ft Mon Apr  9 22:26:50 2007
@@ -20,16 +20,17 @@
   <description>
     content-pod-link will output the POD link with image to the content.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-pod-link"/>]]></usage>
-	<forrest:template
+  <usage>
+<![CDATA[<forrest:contract name="content-pod-link"/>]]>
+  </usage>
+  <forrest:template
   	xmlns:forrest="http://apache.org/forrest/templates/1.0"
   	format="html" name="content-pod-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-pod-link-body">
-		    <a href="{$filename-noext}.pod" class="format">
-	        <img class="skin" src="{$skin-img-dir}/poddoc.png" alt="POD - icon" />
-	        <span class="caption">POD</span></a>
-		  </xsl:template>
-		</xsl:stylesheet>
+      <xsl:template name="content-pod-link-body"><a href="{$filename-noext}.pod" class="format">
+        <img class="skin" src="{$skin-img-dir}/poddoc.png" alt="POD - icon" />
+        <span class="caption">POD</span></a>
+      </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-source-xml-link.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.ft Mon Apr  9 22:26:50 2007
@@ -15,38 +15,36 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-  <forrest:contract name="content-source-xml-link" type="nugget"
+<forrest:contract name="content-source-xml-link" type="nugget"
     xmlns:forrest="http://apache.org/forrest/templates/1.0">
-    <description>
-      content-source-xml-link will output the XML link with image to the 
-      original source content of the document. Input plugins should provide
-      the ability to retrieve the original source XML by making a request for
-      *.source.xml, this contract provides a link to that file. If you want to
-      provide a link to the XDoc format of the content use the
-      content-xml-link template.
-    </description>
-    <usage><![CDATA[<forrest:contract name="content-source-xml-link"/>]]></usage>
-    <forrest:template
+  <description>
+    content-source-xml-link will output the XML link with image to the original
+    source content of the document. Input plugins should provide the ability to
+    retrieve the original source XML by making a request for *.source.xml, this
+    contract provides a link to that file. If you want to provide a link to the
+    XDoc format of the content use the content-xml-link template.
+  </description>
+  <usage>
+<![CDATA[<forrest:contract name="content-source-xml-link"/>]]>
+  </usage>
+  <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="html" name="content-source-xml-link" inputFormat="xsl" body="true">
-      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:param name="defaultVariables" select="'test.html'"/>
-        <xsl:variable name="skin-img-dir" 
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="defaultVariables" select="'test.html'"/>
+      <xsl:variable name="skin-img-dir" 
           select="$defaultVariables/*/*[@name='skin-img-dir']/@value"/>
-        <xsl:variable name="filename-noext" 
+      <xsl:variable name="filename-noext" 
           select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
-        <xsl:template match="/">
-          <forrest:content>
-            <forrest:part>
-              <a href="{$filename-noext}.source.xml" class="format">
-                <img class="skin" src="{$skin-img-dir}/xmldoc.gif" 
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part><a href="{$filename-noext}.source.xml" class="format">
+            <img class="skin" src="{$skin-img-dir}/xmldoc.gif" 
                   alt="Source XML - icon" />
-                <span class="caption">Source XML</span>
-              </a>
-            </forrest:part>
-          </forrest:content>
-        </xsl:template>
-			
-			</xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+            <span class="caption">Source XML</span></a>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>



Mime
View raw message