forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527035 [4/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/xhtml2-content-toc.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-toc.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-toc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-toc.ft Mon Apr  9 22:26:50 2007
@@ -20,15 +20,17 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="xhtml2-content-toc">
   <description>
-    xhtml2-content-toc - Template will output the abstract of the document. 
+    xhtml2-content-toc - Template will output the abstract of the document.
   </description>
-  <usage><![CDATA[<forrest:contract name="xhtml2-content-toc" dataURI="cocoon://internal.#{$getRequest}.toc">
+  <usage>
+<![CDATA[<forrest:contract name="xhtml2-content-toc" dataURI="cocoon://internal.#{$getRequest}.toc">
   <forrest:property name="xhtml2-content-toc-conf" max-depth="2" min-sections="1" />
 </forrest:contract>
-]]></usage>
+]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="xhtml2-content-toc" 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="xhtml2-content-toc" select="/"/>
       <xsl:param name="xhtml2-content-toc-conf"/>
       <xsl:template match="/">
@@ -51,26 +53,23 @@
         <xsl:param name="tocroot"/>
         <xsl:if 
           test="count($tocroot/*) >= $xhtml2-content-toc-conf/@min-sections">
-            <ul class="minitoc">
-              <xsl:for-each select="$tocroot/*">
-                <li>
-                  <a href="{@href}">
-                    <xsl:if test="not(@title='')">
-                      <xsl:value-of select="@title"/>
-                    </xsl:if>
-                    <xsl:if test="@title=''"> No title </xsl:if>
-                  </a>
-                  <xsl:if 
+          <ul class="minitoc">
+            <xsl:for-each select="$tocroot/*">
+              <li><a href="{@href}">
+                <xsl:if test="not(@title='')">
+                  <xsl:value-of select="@title"/>
+                </xsl:if>
+                <xsl:if test="@title=''"> No title </xsl:if></a>
+                <xsl:if 
                     test="@class&lt;$xhtml2-content-toc-conf/@max-depth+1">
-                    <xsl:call-template name="xhtml2-content-toc-processing">
-                      <xsl:with-param name="tocroot" select="."/>
-                    </xsl:call-template>
-                  </xsl:if>
-                </li>
-              </xsl:for-each>
-            </ul>
+                  <xsl:call-template name="xhtml2-content-toc-processing">
+                    <xsl:with-param name="tocroot" select="."/>
+                  </xsl:call-template>
+                </xsl:if></li>
+            </xsl:for-each>
+          </ul>
         </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/images/corner-imports.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/corner-imports.svg.xslt?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/corner-imports.svg.xslt (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/corner-imports.svg.xslt Mon Apr  9 22:26:50 2007
@@ -16,81 +16,77 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:param name="orientation-tb"/>
-    <xsl:param name="orientation-lr"/>
-    <xsl:param name="size"/>
-    <xsl:param name="bg-color-name"/>
-    <xsl:param name="stroke-color-name"/>
-    <xsl:param name="fg-color-name"/>    
-
-   <!-- if not all colors are present, don't even try to render the corners -->
-    <xsl:variable name="isize"><xsl:choose>
-    	<xsl:when test="$bg-color-name and $stroke-color-name and $fg-color-name"><xsl:value-of select="$size"/></xsl:when>
-    	<xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose></xsl:variable>
-    <xsl:variable name="smallersize" select="number($isize)-1"/>
-    <xsl:variable name="biggersize" select="number($isize)+1"/>     
-    <xsl:variable name="bg"><xsl:if test="skinconfig/colors/color[@name=$bg-color-name]">fill:<xsl:value-of select="skinconfig/colors/color[@name=$bg-color-name]/@value"/>;</xsl:if></xsl:variable>
-    <xsl:variable name="fill"><xsl:if test="skinconfig/colors/color[@name=$stroke-color-name]">fill:<xsl:value-of select="skinconfig/colors/color[@name=$stroke-color-name]/@value"/>;</xsl:if></xsl:variable>
-    <xsl:variable name="stroke"><xsl:if test="skinconfig/colors/color[@name=$fg-color-name]">stroke:<xsl:value-of select="skinconfig/colors/color[@name=$fg-color-name]/@value"/>;</xsl:if></xsl:variable>
-        
-	<xsl:template match="skinconfig">
-
-        	
-
-<svg width="{$isize}" height="{$isize}">
-    <!-- background-->
-    <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}" style="{$bg}stroke-width:0"/>
+  <xsl:param name="orientation-tb"/>
+  <xsl:param name="orientation-lr"/>
+  <xsl:param name="size"/>
+  <xsl:param name="bg-color-name"/>
+  <xsl:param name="stroke-color-name"/>
+  <xsl:param name="fg-color-name"/>
+<!-- if not all colors are present, don't even try to render the corners -->
+  <xsl:variable name="isize">
+    <xsl:choose>
+      <xsl:when test="$bg-color-name and $stroke-color-name and $fg-color-name">
+        <xsl:value-of select="$size"/>
+      </xsl:when>
+      <xsl:otherwise>0</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:variable name="smallersize" select="number($isize)-1"/>
+  <xsl:variable name="biggersize" select="number($isize)+1"/>
+  <xsl:variable name="bg">
+    <xsl:if test="skinconfig/colors/color[@name=$bg-color-name]">fill:<xsl:value-of select="skinconfig/colors/color[@name=$bg-color-name]/@value"/>;</xsl:if>
+  </xsl:variable>
+  <xsl:variable name="fill">
+    <xsl:if test="skinconfig/colors/color[@name=$stroke-color-name]">fill:<xsl:value-of select="skinconfig/colors/color[@name=$stroke-color-name]/@value"/>;</xsl:if>
+  </xsl:variable>
+  <xsl:variable name="stroke">
+    <xsl:if test="skinconfig/colors/color[@name=$fg-color-name]">stroke:<xsl:value-of select="skinconfig/colors/color[@name=$fg-color-name]/@value"/>;</xsl:if>
+  </xsl:variable>
+  <xsl:template match="skinconfig">
+    <svg width="{$isize}" height="{$isize}">
+<!-- background-->
+      <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}" style="{$bg}stroke-width:0"/>
 <!-- 0,0 0,-4 4,0 4,-4-->
-
-    <xsl:variable name="flip-tb-scale">
-      <xsl:choose>
-    	<xsl:when test="$orientation-tb='t'">1</xsl:when>
-    	<xsl:otherwise>-1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="flip-lr-scale">
-      <xsl:choose>
-    	<xsl:when test="$orientation-lr='l'">1</xsl:when>
-    	<xsl:otherwise>-1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    
-    <xsl:variable name="flip-tb-translate">
-      <xsl:choose>
-    	<xsl:when test="$orientation-tb='t'">0</xsl:when>
-    	<xsl:otherwise>-<xsl:value-of select="$isize" /></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="flip-lr-translate">
-      <xsl:choose>
-    	<xsl:when test="$orientation-lr='l'">0</xsl:when>
-    	<xsl:otherwise>-<xsl:value-of select="$isize" /></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>    
-    
-    <!-- flip transform -->
-    <g transform="scale({$flip-lr-scale},{$flip-tb-scale}) translate({$flip-lr-translate}, {$flip-tb-translate})"> 
-      <xsl:call-template name="figure" />
-    </g>
-</svg>
-</xsl:template>
-
-        
+      <xsl:variable name="flip-tb-scale">
+        <xsl:choose>
+          <xsl:when test="$orientation-tb='t'">1</xsl:when>
+          <xsl:otherwise>-1</xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="flip-lr-scale">
+        <xsl:choose>
+          <xsl:when test="$orientation-lr='l'">1</xsl:when>
+          <xsl:otherwise>-1</xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="flip-tb-translate">
+        <xsl:choose>
+          <xsl:when test="$orientation-tb='t'">0</xsl:when>
+          <xsl:otherwise>-<xsl:value-of select="$isize" />
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="flip-lr-translate">
+        <xsl:choose>
+          <xsl:when test="$orientation-lr='l'">0</xsl:when>
+          <xsl:otherwise>-<xsl:value-of select="$isize" />
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+<!-- flip transform -->
+      <g transform="scale({$flip-lr-scale},{$flip-tb-scale}) translate({$flip-lr-translate}, {$flip-tb-translate})">
+        <xsl:call-template name="figure" />
+      </g>
+    </svg>
+  </xsl:template>
   <xsl:template name="figure">
-       <!-- Just change shape here -->     
-		<g transform="translate(0.5 0.5)">
-			<ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
+<!-- Just change shape here -->
+    <g transform="translate(0.5 0.5)">
+      <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
 				 style="{$fill}{$stroke}stroke-width:1"/>
-		</g>
-	   <!-- end -->	
+    </g>
+<!-- end -->
   </xsl:template>
-    
-  
   <xsl:template match="*"></xsl:template>
   <xsl:template match="text()"></xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/dc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/dc.svg.xslt?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/dc.svg.xslt (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/dc.svg.xslt Mon Apr  9 22:26:50 2007
@@ -17,15 +17,12 @@
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="corner-imports.svg.xslt" />
-  
-  <!-- Diagonal 45 degrees corner -->
+<!-- Diagonal 45 degrees corner -->
   <xsl:template name="figure">
-        <xsl:variable name="biggersize" select="number($size)+number($size)"/>     
-		<g transform="translate(0 0.5)">
-           <polygon points="0,{$size} {$size},0 {$biggersize},0 {$biggersize},{$biggersize} 0,{$biggersize}"
+    <xsl:variable name="biggersize" select="number($size)+number($size)"/>
+    <g transform="translate(0 0.5)">
+      <polygon points="0,{$size} {$size},0 {$biggersize},0 {$biggersize},{$biggersize} 0,{$biggersize}"
                     style="{$fill}{$stroke}stroke-width:1"/>
-		</g>
+    </g>
   </xsl:template>
-      
 </xsl:stylesheet>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/poddoc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/poddoc.svg.xslt?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/poddoc.svg.xslt (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/poddoc.svg.xslt Mon Apr  9 22:26:50 2007
@@ -30,13 +30,11 @@
        gradientUnits="objectBoundingBox" spreadMethod="pad" />
     <path d="M 0 0 L 200 0" style="stroke:#000000;stroke-width:1pt;" id="hr"/>
   </defs>
-
   <g transform="scale(0.08)">
     <g transform="translate(40, 0)">
       <rect width="230" height="300" x="0" y="0"
             style="fill:url(#pageshade);fill-rule:evenodd;
             stroke:#000000;stroke-width:1.25;"/>
-
       <g transform="translate(15, 60)">
         <use xlink:href="#hr" x="0" y="0"/>
         <use xlink:href="#hr" x="0" y="60"/>
@@ -44,7 +42,6 @@
         <use xlink:href="#hr" x="0" y="180"/>
       </g>
     </g>
-
     <g transform="translate(0,70),scale(1.1,1.6)">
       <rect width="200" height="100" x="0" y="0"
          style="fill:#ff0000;fill-rule:evenodd;

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/rc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/rc.svg.xslt?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/rc.svg.xslt (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/rc.svg.xslt Mon Apr  9 22:26:50 2007
@@ -17,14 +17,11 @@
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="corner-imports.svg.xslt" />
-
-  <!-- Rounded corner -->
+<!-- Rounded corner -->
   <xsl:template name="figure">
-		<g transform="translate(0.5 0.5)">
-			<ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
+    <g transform="translate(0.5 0.5)">
+      <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
 				 style="{$fill}{$stroke}stroke-width:1"/>
-		</g>
+    </g>
   </xsl:template>
-      
 </xsl:stylesheet>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/txtdoc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/txtdoc.svg.xslt?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/txtdoc.svg.xslt (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/txtdoc.svg.xslt Mon Apr  9 22:26:50 2007
@@ -30,13 +30,11 @@
        gradientUnits="objectBoundingBox" spreadMethod="pad" />
     <path d="M 0 0 L 200 0" style="stroke:#000000;stroke-width:1pt;" id="hr"/>
   </defs>
-
   <g transform="scale(0.08)">
     <g transform="translate(40, 0)">
       <rect width="230" height="300" x="0" y="0"
             style="fill:url(#pageshade);fill-rule:evenodd;
             stroke:#000000;stroke-width:1.25;"/>
-
       <g transform="translate(15, 60)">
         <use xlink:href="#hr" x="0" y="0"/>
         <use xlink:href="#hr" x="0" y="60"/>
@@ -44,7 +42,6 @@
         <use xlink:href="#hr" x="0" y="180"/>
       </g>
     </g>
-
     <g transform="translate(0,70),scale(1.1,1.6)">
       <rect width="200" height="100" x="0" y="0"
          style="fill:#ff0000;fill-rule:evenodd;

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml Mon Apr  9 22:26:50 2007
@@ -17,17 +17,17 @@
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-    <!-- Settings specific to PDF output. -->
-    <forrest:contract name="layout-master-set">
-      <forrest:property name="config">
-        <!-- 
+<!-- Settings specific to PDF output. -->
+  <forrest:contract name="layout-master-set">
+    <forrest:property name="config">
+<!-- 
         Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
         folio, legal, ledger, letter, quarto, tabloid (default letter).
         Supported page orientations are portrait, landscape (default
         portrait).
         -->
-        <page size="a4" orientation="portrait"/>
-        <!--
+      <page size="a4" orientation="portrait"/>
+<!--
         Margins can be specified for top, bottom, inner, and outer
         edges. If double-sided="false", the inner edge is always left
         and the outer is always right. If double-sided="true", the
@@ -35,18 +35,18 @@
         the outer edge vice versa.
         Specified below are the default settings.
         -->
-        <margins double-sided="false">
-          <top>1in</top>
-          <bottom>1in</bottom>
-          <inner>1.25in</inner>
-          <outer>1in</outer>
-        </margins>
-      </forrest:property>
-    </forrest:contract>
-    <forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
-    <forrest:contract name="page-header" dataURI="cocoon://#{$getRequest}.title.xml"/>
-    <forrest:contract name="page-footer-numbering">
-        <!-- 
+      <margins double-sided="false">
+        <top>1in</top>
+        <bottom>1in</bottom>
+        <inner>1.25in</inner>
+        <outer>1in</outer>
+      </margins>
+    </forrest:property>
+  </forrest:contract>
+  <forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
+  <forrest:contract name="page-header" dataURI="cocoon://#{$getRequest}.title.xml"/>
+  <forrest:contract name="page-footer-numbering">
+<!-- 
         Pattern of the page numbering in the footer - Default is "Page x".
         first occurrence of '1' digit represents the current page number,
         second occurrence of '1' digit represents the total page number,
@@ -58,12 +58,12 @@
         <page-numbering-format>Page 1/1</page-numbering-format> Displays "Page x/y"
         <page-numbering-format>(1-1)</page-numbering-format> Displays "(x-y)"
         -->
-      <forrest:property name="skip-first-page-numbering">true</forrest:property>
-      <forrest:property name="page-numbering-format">1/1</forrest:property>
-    </forrest:contract>
-    <forrest:contract name="page-footer-copyright">
-      <forrest:property name="copyright">
-        <!-- The following are used to construct a copyright statement as follows :
+    <forrest:property name="skip-first-page-numbering">true</forrest:property>
+    <forrest:property name="page-numbering-format">1/1</forrest:property>
+  </forrest:contract>
+  <forrest:contract name="page-footer-copyright">
+    <forrest:property name="copyright">
+<!-- The following are used to construct a copyright statement as follows :
         <property> <symbol> <year> <vendor> <msg>
                          <url>
         ie. Copyright c 2002 ACME
@@ -71,19 +71,19 @@
 	inception year option let you create a copyright with a range of date automaticalculated :
 	2002-2007
        -->
-        <year inception='true'>2002</year>
-        <vendor>ACME</vendor>
-        <url>http://ACME.org</url>
-        <msg>Tous droits r&#xe9;serv&#xe9;s.</msg>
-        <symbol></symbol>
-        <property></property>
-      </forrest:property>
-    </forrest:contract>
-    <forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>
-    <forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>
-    <forrest:contract name="content-authors" dataURI="cocoon://#{$getRequest}.authors.xml"/>
-    <forrest:contract name="content-toc" dataURI="cocoon://#{$getRequest}.toc.xml">
-        <!-- Configure the TOC, i.e. the Table of Contents.
+      <year inception='true'>2002</year>
+      <vendor>ACME</vendor>
+      <url>http://ACME.org</url>
+      <msg>Tous droits r&#xe9;serv&#xe9;s.</msg>
+      <symbol></symbol>
+      <property></property>
+    </forrest:property>
+  </forrest:contract>
+  <forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+  <forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>
+  <forrest:contract name="content-authors" dataURI="cocoon://#{$getRequest}.authors.xml"/>
+  <forrest:contract name="content-toc" dataURI="cocoon://#{$getRequest}.toc.xml">
+<!-- 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).
@@ -95,37 +95,33 @@
         Minimum required to create a TOC.
           (FIXME min-section is not managed yet)
         -->
-      <forrest:property name="max-depth">2</forrest:property>
-      <forrest:property name="page-break-after">true</forrest:property>
-    </forrest:contract>
-    <forrest:contract name="content-main-outline" dataURI="cocoon://#{$getRequest}.toc.xml"/>
-    <forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
-      <forrest:property name="config">
-        <!-- 
+    <forrest:property name="max-depth">2</forrest:property>
+    <forrest:property name="page-break-after">true</forrest:property>
+  </forrest:contract>
+  <forrest:contract name="content-main-outline" dataURI="cocoon://#{$getRequest}.toc.xml"/>
+  <forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
+    <forrest:property name="config">
+<!-- 
         Supported text alignments are left, right, justify (default left).
         -->
-        <page text-align="left" background-color="#ffffff"/>
-
-        <!-- Heading types can be clean|underlined|boxed  -->
-        <headings type="underlined" color="#4a6d8c"/>
-
-        <!--
+      <page text-align="left" background-color="#ffffff"/>
+<!-- Heading types can be clean|underlined|boxed  -->
+      <headings type="underlined" color="#4a6d8c"/>
+<!--
         Print the URL text next to all links going outside the file
         -->
-        <show-external-urls>false</show-external-urls>
-
-	<colors>
-          <color name="code" value="#CFDCED"/>
-          <color name="highlight" value="#ffff00"/>
-          <color name="fixme" value="#cc6600"/>
-          <color name="note" value="#006699"/>
-          <color name="warning" value="#990000"/>
-          <color name="table" value="#7099C5"/>
-          <color name="table-cell" value="#f0f0ff"/>
-          <color name="body" value="#ffffff" link="#0F3660"
+      <show-external-urls>false</show-external-urls>
+      <colors>
+        <color name="code" value="#CFDCED"/>
+        <color name="highlight" value="#ffff00"/>
+        <color name="fixme" value="#cc6600"/>
+        <color name="note" value="#006699"/>
+        <color name="warning" value="#990000"/>
+        <color name="table" value="#7099C5"/>
+        <color name="table-cell" value="#f0f0ff"/>
+        <color name="body" value="#ffffff" link="#0F3660"
             vlink="#009999" hlink="#000066"/>
-        </colors>
-
-      </forrest:property>
-    </forrest:contract>
+      </colors>
+    </forrest:property>
+  </forrest:contract>
 </forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-html.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-html.panel.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-html.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-html.panel.xml Mon Apr  9 22:26:50 2007
@@ -17,60 +17,60 @@
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <!-- 
+<!-- 
         @type defines this structurer to html.
         @hooksXpath defines where all hooks will be injected (as prefix).
         -->
-    <forrest:contract name="branding-css-links">
-      <!-- More information around this contract
+  <forrest:contract name="branding-css-links">
+<!-- More information around this contract
         http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
         -->
-      <!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
-      <forrest:property name="branding-css-links-input">
-        <css url="common.css"/>
-      </forrest:property>
-    </forrest:contract>
-    <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
-      <forrest:property name="custom">
-         <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-      </forrest:property>
-      <forrest:property name="theme" value="common"/>
-    </forrest:contract>
-    <!--
+<!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
+    <forrest:property name="branding-css-links-input">
+      <css url="common.css"/>
+    </forrest:property>
+  </forrest:contract>
+  <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
+    <forrest:property name="custom">
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+    </forrest:property>
+    <forrest:property name="theme" value="common"/>
+  </forrest:contract>
+<!--
         nuggets (extra data requested by the contract) are now defined in the contract element. 
         As well the former @nugget is now called @dataURI to reflect better the function of the attribute.
       -->
-    <forrest:hook name="container">
-      <forrest:hook name="header">
-        <forrest:contract name="branding-tagline">
-          <forrest:property name="branding-tagline-name">new 
+  <forrest:hook name="container">
+    <forrest:hook name="header">
+      <forrest:contract name="branding-tagline">
+        <forrest:property name="branding-tagline-name">new 
             seed</forrest:property>
-          <forrest:property name="branding-tagline-tagline">powered by the 
+        <forrest:property name="branding-tagline-tagline">powered by the 
             dispatcher</forrest:property>
-        </forrest:contract>
-        <forrest:hook name="nav-main-hook">
-          <forrest:contract name="nav-main" 
+      </forrest:contract>
+      <forrest:hook name="nav-main-hook">
+        <forrest:contract name="nav-main" 
             dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-          <forrest:contract name="nav-main-sub" 
+        <forrest:contract name="nav-main-sub" 
             dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-        </forrest:hook>
       </forrest:hook>
-      <forrest:hook name="page">
-        <forrest:hook name="leftbar">
-          <forrest:contract name="nav-section" 
+    </forrest:hook>
+    <forrest:hook name="page">
+      <forrest:hook name="leftbar">
+        <forrest:contract name="nav-section" 
             dataURI="cocoon://#{$getRequest}.navigation.xml">
-            <forrest:property name="nav-section-toc" nugget="get.toc">
-              <jx:import uri="cocoon://#{$getRequest}.toc.xml"/>
-            </forrest:property>
-            <forrest:property name="toc" max-depth="2"/>
-          </forrest:contract>
-        </forrest:hook>
-        <forrest:contract name="search-input">
-          <forrest:property name="search-input">
-            <search name="MyProject" domain="mydomain" provider="google"/>
+          <forrest:property name="nav-section-toc" nugget="get.toc">
+            <jx:import uri="cocoon://#{$getRequest}.toc.xml"/>
           </forrest:property>
+          <forrest:property name="toc" max-depth="2"/>
         </forrest:contract>
       </forrest:hook>
+      <forrest:contract name="search-input">
+        <forrest:property name="search-input">
+          <search name="MyProject" domain="mydomain" provider="google"/>
+        </forrest:property>
+      </forrest:contract>
+    </forrest:hook>
 <!--  
     You can group elements (hooks and contracts) to a template 
     and import it from any structurer. 
@@ -90,34 +90,33 @@
     
     FIXME: The above does not work as a result of http://svn.apache.org/viewvc?view=rev&rev=520650 
 -->
-        <forrest:hook name="export-link">
-            <forrest:contract name="content-source-xml-link"/>
-            <forrest:contract name="content-pdf-link"/>
-        </forrest:hook>
-          
-        <forrest:hook name="content">
-          <forrest:contract name="content-title" 
+    <forrest:hook name="export-link">
+      <forrest:contract name="content-source-xml-link"/>
+      <forrest:contract name="content-pdf-link"/>
+    </forrest:hook>
+    <forrest:hook name="content">
+      <forrest:contract name="content-title" 
             dataURI="cocoon://#{$getRequest}.title.xml"/>
-          <forrest:contract name="content-abstract" 
+      <forrest:contract name="content-abstract" 
             dataURI="cocoon://#{$getRequest}.abstract.xml"/>
-          <forrest:contract name="content-minitoc" 
+      <forrest:contract name="content-minitoc" 
             dataURI="cocoon://#{$getRequest}.toc.xml">
-            <forrest:property name="content-minitoc-conf" max-depth="2" 
+        <forrest:property name="content-minitoc-conf" max-depth="2" 
               min-sections="1" location="page"/>
-          </forrest:contract>
-          <forrest:contract name="content-main" 
+      </forrest:contract>
+      <forrest:contract name="content-main" 
               dataURI="cocoon://#{$getRequest}.body.xml"/>
-        </forrest:hook>
     </forrest:hook>
-    <forrest:hook name="footer">
-      <forrest:contract name="siteinfo-feedback">
-          <forrest:property name="siteinfo-feedback">
-            <feedback to="webmaster@foo.com"
+  </forrest:hook>
+  <forrest:hook name="footer">
+    <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>
-      <forrest:contract name="siteinfo-last-published"/>
-    </forrest:hook>
-</forrest:template>
\ No newline at end of file
+      </forrest:property>
+    </forrest:contract>
+    <forrest:contract name="siteinfo-last-published"/>
+  </forrest:hook>
+</forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/export-link.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/export-link.panel.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/export-link.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/export-link.panel.xml Mon Apr  9 22:26:50 2007
@@ -15,17 +15,16 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
 <forrest:template 
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
     xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="export-link">
     <forrest:contract name="content-source-xml-link"/>
     <forrest:contract name="content-pdf-link"/>
-    <!-- You can include other templates from panels as well -->
-    <!--<jx:import uri="cocoon://prepare.structurer-panels.export-link-test"/>-->
-    <!-- FIXME: jxpath -->
-    <!-- Use this when jxpath bug is solved -->
-    <!--<jx:import uri="lm:panels.export-link-test"/>-->
+<!-- You can include other templates from panels as well -->
+<!--<jx:import uri="cocoon://prepare.structurer-panels.export-link-test"/>-->
+<!-- FIXME: jxpath -->
+<!-- Use this when jxpath bug is solved -->
+<!--<jx:import uri="lm:panels.export-link-test"/>-->
   </forrest:hook>
 </forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.ft Mon Apr  9 22:26:50 2007
@@ -20,18 +20,19 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:html="http://www.w3.org/2002/06/xhtml2"
   name="abstract">
-  
   <description>
     abstract will output the documtent abstract.
   </description>
-  <usage><![CDATA[<forrest:contract name="abstract"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="abstract"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="abstract" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
       xmlns:html="http://www.w3.org/2002/06/xhtml2"
       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>
@@ -40,13 +41,13 @@
         </forrest:content>
       </xsl:template>
       <xsl:template match="html:head">
-          <xsl:if test="html:meta [@property='abstract']">
-            <xsl:copy-of select="html:meta[@property='abstract']"/>
-          </xsl:if>
-          <xsl:if test="not(html:meta[@property='abstract'])">
-            <meta property="abstract"/>
-          </xsl:if>
-        </xsl:template>
+        <xsl:if test="html:meta [@property='abstract']">
+          <xsl:copy-of select="html:meta[@property='abstract']"/>
+        </xsl:if>
+        <xsl:if test="not(html:meta[@property='abstract'])">
+          <meta property="abstract"/>
+        </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/xhtml2/body.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/body.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/body.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/body.ft Mon Apr  9 22:26:50 2007
@@ -20,14 +20,15 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:html="http://www.w3.org/2002/06/xhtml2"
   name="body">
-  
-  <!--NOTE: 
+<!--NOTE: 
     When using the body template as c'n p master just search and replace 'body' by the {contract-name}!-->
-  
   <description>
-    body will output {contract-funtion}. This is just a body contract, it will output *nothing*.
+    body will output {contract-funtion}. This is just a body contract, it will
+    output *nothing*.
   </description>
-  <usage><![CDATA[<forrest:contract name="body"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="body"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     name="body" inputFormat="xsl">
     <xsl:stylesheet version="1.1" xmlns:html="http://www.w3.org/2002/06/xhtml2" 
@@ -50,4 +51,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/xhtml2/title.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/title.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/title.ft Mon Apr  9 22:26:50 2007
@@ -21,34 +21,36 @@
    xmlns:html="http://www.w3.org/2002/06/xhtml2"
   name="title">
   <description>
-    title - Templates for "title" mode.  
-    This will generate the title of the document.
+    title - Templates for "title" mode. This will generate the title of the
+    document.
   </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-meta" dataURI="cocoon://#{$getRequest}.title.xml"/>
-]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-meta" dataURI="cocoon://#{$getRequest}.title.xml"/>
+]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="title" inputFormat="xsl">
-      <xsl:stylesheet version="1.1" 
+    <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
         xmlns:html="http://www.w3.org/2002/06/xhtml2">
-        <xsl:param name="title" select="/"/>
-        <xsl:template match="/">
-          <forrest:content>
-            <forrest:part>
-              <xsl:apply-templates select="html:html/html:head"/>
-            </forrest:part>
-          </forrest:content>
-        </xsl:template>
-        <xsl:template match="html:head">
-          <xsl:choose>
-            <xsl:when test="html:title">
-              <xsl:copy-of select="html:title"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <title>*No* title found</title>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-      </xsl:stylesheet>
+      <xsl:param name="title" select="/"/>
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part>
+            <xsl:apply-templates select="html:html/html:head"/>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
+      <xsl:template match="html:head">
+        <xsl:choose>
+          <xsl:when test="html:title">
+            <xsl:copy-of select="html:title"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <title>*No* title found</title>
+          </xsl:otherwise>
+        </xsl:choose>
+      </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/xhtml2/toc.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/toc.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/toc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/toc.ft Mon Apr  9 22:26:50 2007
@@ -20,11 +20,12 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:html="http://www.w3.org/2002/06/xhtml2"
   name="toc">
-  
   <description>
     toc will output the documtent toc.
   </description>
-  <usage><![CDATA[<forrest:contract name="toc" dataURI="cocoon://#{$getRequest}.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="toc" dataURI="cocoon://#{$getRequest}.xml"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="toc" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -49,7 +50,8 @@
         <xsl:param name="level"/>
         <div class="{$level}">
           <xsl:attribute name="href">#<xsl:call-template 
-            name="generate-id"/></xsl:attribute>
+            name="generate-id"/>
+          </xsl:attribute>
           <xsl:attribute name="title">
             <xsl:value-of select="@title"/>
           </xsl:attribute>
@@ -61,4 +63,4 @@
       <xsl:template match="node()|@*" mode="toc"/>
     </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/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv Mon Apr  9 22:26:50 2007
@@ -17,18 +17,18 @@
 -->
 <forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0" 
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <!-- The following variables are used to contact data models and/or contracts. -->
+<!-- The following variables are used to contact data models and/or contracts. -->
   <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
   <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
   <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
   <forrest:view type="fo" hooksXpath="/">
     <jx:import uri="cocoon://prepare.panels.common-fo"/>
   </forrest:view>
-  <!-- CSS View of the request e.g. index.dispatcher.css -->
+<!-- CSS View of the request e.g. index.dispatcher.css -->
   <forrest:view type="css" hooksXpath="/">
     <jx:import uri="cocoon://prepare.panels.pelt-css"/>
   </forrest:view>
-  <!-- HTML View of the request (e.g. index.html)-->
+<!-- HTML View of the request (e.g. index.html)-->
   <forrest:view type="html" hooksXpath="/html/body">
     <jx:import uri="cocoon://prepare.panels.pelt-html"/>
   </forrest:view>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft Mon Apr  9 22:26:50 2007
@@ -19,26 +19,32 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-main">
-
   <description>
-    <p>content-main <br/>Template will output the content-main.</p>
-    <p> properties:<br/> &lt;headings type="boxed"/> - Heading types can be
-      clean|underlined|boxed</p>
+    <p>
+      content-main
+      <br/>
+      Template will output the content-main.
+    </p>
+
+    <p>
+      properties:
+      <br/>
+      &lt;headings type="boxed"/> - Heading types can be clean|underlined|boxed
+    </p>
   </description>
-
-  <usage><![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.body.xml"/>
+  <usage>
+<![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.body.xml"/>
   </forrest:property>
   <!-- Heading types can be clean|underlined|boxed  -->
   <forrest:property name="content-main-conf">
     <headings type="boxed"/>
   </forrest:property>
-</forrest:contract>]]></usage>
-
+</forrest:contract>]]>
+  </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:param name="content-main-conf" select='boxed'/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -49,42 +55,50 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-
-      <!--headings-->
+<!--headings-->
       <xsl:template match="div[@class = 'skinconf-heading-1']">
         <xsl:choose>
           <xsl:when test="$content-main-conf/headings/@type='underlined'">
-            <h2 class="underlined_10"><xsl:value-of select="h1"/></h2>
+            <h2 class="underlined_10">
+              <xsl:value-of select="h1"/>
+            </h2>
           </xsl:when>
           <xsl:when test="$content-main-conf/headings/@type='boxed'">
-            <h2 class="boxed"><xsl:value-of select="h1"/></h2>
+            <h2 class="boxed">
+              <xsl:value-of select="h1"/>
+            </h2>
           </xsl:when>
           <xsl:otherwise>
-            <h2 class="h3"><xsl:value-of select="h1"/></h2>
+            <h2 class="h3">
+              <xsl:value-of select="h1"/>
+            </h2>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
-
       <xsl:template match="div[@class = 'section']">
         <div class="section">
           <xsl:apply-templates select="*|processing-instruction()"/>
         </div>
       </xsl:template>
-
       <xsl:template match="div[@class = 'skinconf-heading-2']">
         <xsl:choose>
           <xsl:when test="$content-main-conf/headings/@type='underlined'">
-            <h3 class="underlined_5"><xsl:value-of select="h2"/></h3>
+            <h3 class="underlined_5">
+              <xsl:value-of select="h2"/>
+            </h3>
           </xsl:when>
           <xsl:when test="$content-main-conf/headings/@type='boxed'">
-            <h3 class="boxed"><xsl:value-of select="h2"/></h3>
+            <h3 class="boxed">
+              <xsl:value-of select="h2"/>
+            </h3>
           </xsl:when>
           <xsl:otherwise>
-            <h3 class="h3"><xsl:value-of select="h2"/></h3>
+            <h3 class="h3">
+              <xsl:value-of select="h2"/>
+            </h3>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
-
       <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
         <xsl:copy>
           <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-main-sub.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-main-sub.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-main-sub.ft Mon Apr  9 22:26:50 2007
@@ -20,33 +20,33 @@
   <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>+
+            <xsl:comment>+
     |start nav-main-sub
     +</xsl:comment>
-            <!-- FIXME - Suppress the following test when empty div problem is solved -->
-            <!-- FIXME - With a little css work, we should use the common contract and suppress this one (no need of level2tabs) -->
+<!-- FIXME - Suppress the following test when empty div problem is solved -->
+<!-- FIXME - With a little css work, we should use the common contract and suppress this one (no need of level2tabs) -->
             <xsl:if test="navigation/tab/div[@id='nav-main-sub']/*">
               <div id="level2tabs">
                 <xsl:copy-of
                   select="navigation/tab/div[@id='nav-main-sub']/*"/>
               </div>
             </xsl:if>
-<xsl:comment>+
+            <xsl:comment>+
     |end Endtabs
     +</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/pelt/html/nav-section-round-bottom.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.ft Mon Apr  9 22:26:50 2007
@@ -18,25 +18,26 @@
 <forrest:contract name="nav-section-round-bottom"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    nav-section-round-bottom will output the round bottom of the navigation menues
+    nav-section-round-bottom will output the round bottom of the navigation
+    menues
   </description>
-
-  <usage><![CDATA[<forrest:contract name="nav-section-round-bottom"/>]]></usage>
-
+  <usage>
+<![CDATA[<forrest:contract name="nav-section-round-bottom"/>]]>
+  </usage>
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="nav-section-round-bottom" 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:template match="/">
         <forrest:content>
           <forrest:part>
-  <div id="roundbottom">
-    <div id="roundbottomLeft"><img  src="{$skin-img-dir}/spacer.gif" alt="spacer" /></div>
-  </div>
+            <div id="roundbottom">
+              <div id="roundbottomLeft">
+                <img  src="{$skin-img-dir}/spacer.gif" alt="spacer" />
+              </div>
+            </div>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.ft Mon Apr  9 22:26:50 2007
@@ -18,56 +18,62 @@
 <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>
     <div class="warning">
       <div class="label">Warning</div>
       <div class="content">You need to include <![CDATA[<forrest:contract name="helper-form-blank"/>]]>
         in your view!!! If you are not, the contract will not work correctly.</div>
     </div>
   </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="input-size">25</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="input-size"/>
       <xsl:param name="search-input"/>
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-<xsl:comment>+
+            <xsl:comment>+
   |start Search
   +</xsl:comment>
             <div class="searchbox">
               <div class="round-top-left-small">
                 <div class="round-top-right-small">
                   <div class="search-input">
-                    <!-- Form prompt -->
+<!-- Form prompt -->
                     <xsl:variable name="search-prompt">
-                     <i18n:translate>
-                       <i18n:text i18n:key="Search the site with">Search the site with {0}</i18n:text>
-                       <i18n:param><xsl:value-of select="$search-input/search/@provider"/></i18n:param>
-                     </i18n:translate>
+                      <i18n:translate>
+                        <i18n:text i18n:key="Search the site with">Search the site with {0}</i18n:text>
+                        <i18n:param>
+                          <xsl:value-of select="$search-input/search/@provider"/>
+                        </i18n:param>
+                      </i18n:translate>
                     </xsl:variable>
-                    <!-- Form action -->
+<!-- Form action -->
                     <xsl:variable name="search-action">
                       <xsl:choose>
                         <xsl:when test="$search-input/search/@provider = 'lucene'">
@@ -77,7 +83,7 @@
                         <xsl:otherwise>http://www.google.com/search</xsl:otherwise>
                       </xsl:choose>
                     </xsl:variable>
-                    <!-- Form query field -->
+<!-- Form query field -->
                     <xsl:variable name="search-query">
                       <xsl:choose>
                         <xsl:when test="$search-input/search/@provider = 'lucene'">
@@ -85,7 +91,7 @@
                         <xsl:otherwise>q</xsl:otherwise>
                       </xsl:choose>
                     </xsl:variable>
-                    <!-- Search form generation -->
+<!-- Search form generation -->
                     <form method="get" action="{$search-action}">
                       <div class="search-hidden">
                         <input type="hidden" name="sitesearch"

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft Mon Apr  9 22:26:50 2007
@@ -17,10 +17,12 @@
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-credits">
-  <description> siteinfo-credits - Template will output the siteinfo-credits
-    with pelt look'n feel. </description>
-
-  <usage><![CDATA[<forrest:contract name="siteinfo-credits">
+  <description>
+    siteinfo-credits - Template will output the siteinfo-credits with pelt
+    look'n feel.
+  </description>
+  <usage>
+<![CDATA[<forrest:contract name="siteinfo-credits">
     [<forrest:property name="box-location"></forrest:property>
      <forrest:property name="top-separator">[true|<strong>false</strong>]</forrest:property>
      <forrest:property name="use-role-as-prefix">[true|<strong>false</strong>]</forrest:property>
@@ -35,21 +37,20 @@
         </credit>
       </credits>
     </forrest:property>]
-  </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"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:param name="defaultVariables" select="'test.html'"/>
-        <xsl:param name="siteinfo-credits"/>
-        <xsl:param name="box-location"></xsl:param>
-        <xsl:param name="top-separator">false</xsl:param>
-        <xsl:param name="use-role-as-prefix">false</xsl:param>
-        <xsl:param name="use-br">false</xsl:param>
-        <xsl:variable name="filename" select="$defaultVariables/*/*[@name='filename']/@value"/>
-        <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-
+      <xsl:param name="defaultVariables" select="'test.html'"/>
+      <xsl:param name="siteinfo-credits"/>
+      <xsl:param name="box-location"></xsl:param>
+      <xsl:param name="top-separator">false</xsl:param>
+      <xsl:param name="use-role-as-prefix">false</xsl:param>
+      <xsl:param name="use-br">false</xsl:param>
+      <xsl:variable name="filename" select="$defaultVariables/*/*[@name='filename']/@value"/>
+      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
@@ -70,23 +71,21 @@
                     <xsl:variable name="url" select="normalize-space(url)"/>
                     <xsl:variable name="image" select="normalize-space(image)"/>
                     <xsl:variable name="width" select="normalize-space(width)"/>
-                    <xsl:variable name="height" select="normalize-space(height)"/>
-                    <a href="{$url}">
-                      <img alt="{$name} - logo" title="{$name}">
-                        <xsl:attribute name="src">
-                          <xsl:if test="not(starts-with($image, 'http://'))">
-                            <xsl:value-of select="$root"/>
-                          </xsl:if>
-                          <xsl:value-of select="$image"/>
-                        </xsl:attribute>
-                        <xsl:attribute name="style">
-                          <xsl:if test="$width">width: <xsl:value-of 
+                    <xsl:variable name="height" select="normalize-space(height)"/><a href="{$url}">
+                    <img alt="{$name} - logo" title="{$name}">
+                      <xsl:attribute name="src">
+                        <xsl:if test="not(starts-with($image, 'http://'))">
+                          <xsl:value-of select="$root"/>
+                        </xsl:if>
+                        <xsl:value-of select="$image"/>
+                      </xsl:attribute>
+                      <xsl:attribute name="style">
+                        <xsl:if test="$width">width: <xsl:value-of 
                             select="$width"/>px;</xsl:if>
-                          <xsl:if test="$height">height: <xsl:value-of 
+                        <xsl:if test="$height">height: <xsl:value-of 
                             select="$height"/>px;</xsl:if>
-                        </xsl:attribute>
-                      </img>
-                    </a>
+                      </xsl:attribute>
+                    </img></a>
                   </xsl:for-each>
                 </div>
                 <xsl:comment>+ |end siteinfo-credits +</xsl:comment>
@@ -98,4 +97,3 @@
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-css.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-css.panel.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-css.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-css.panel.xml Mon Apr  9 22:26:50 2007
@@ -15,7 +15,6 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:contract name="branding-theme-profiler">
@@ -23,7 +22,7 @@
       <forrest:property name="branding-theme-profiler-theme">
         Pelt</forrest:property>
       <forrest:property name="branding-theme-profiler">
-        <!-- These values are used for the generated CSS files.
+<!-- These values are used for the generated CSS files.
         They essentially "override" the default colors defined in the chosen theme.
         There are four duplicate "groups" of colors below, denoted by comments:
         Color group: Forrest, Krysalis, Collabnet, and Lenya using Pelt.
@@ -33,7 +32,7 @@
         Note that by default, all color groups are commented-out which means that
         the default colors provided by the theme are being used.
         -->
-        <!-- Color group: Forrest: example colors similar to forrest.apache.org
+<!-- Color group: Forrest: example colors similar to forrest.apache.org
         Some of the element names are obscure, so comments are added to show how
         the "pelt" theme uses them, other themes might use these elements in a different way.
         Tip: temporarily change the value of an element to red (#ff0000) and see the effect.
@@ -49,9 +48,8 @@
         pelt: footer: the second from bottom strip containing credit logos and published date
         pelt: feedback: the optional bottom strip containing feedback link
         -->
-        
-        <!-- Color group: pelt -->
-        <!--
+<!-- Color group: pelt -->
+<!--
         <color name="breadtrail" value="#CFDCED" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
         <color name="header" value="#294563"/>
         <color name="tab-selected" value="#4A6D8C" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
@@ -78,8 +76,8 @@
         <color name="code" value="#CFDCED"/>
         <color name="footer" value="#CEDFEF"/>
         -->
-        <!-- Color group: Krysalis -->
-        <!--
+<!-- Color group: Krysalis -->
+<!--
         <color name="header"    value="#FFFFFF"/>
         
         <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
@@ -109,8 +107,8 @@
         
         <color name="footer" value="#a5b6c6"/>
         -->
-        <!-- Color group: Collabnet -->
-        <!--
+<!-- Color group: Collabnet -->
+<!--
         <color name="header"    value="#003366"/>
         
         <color name="tab-selected" value="#dddddd" link="#555555" vlink="#555555" hlink="#555555"/>
@@ -140,8 +138,8 @@
         
         <color name="footer" value="#ffffff"/>
         -->
-        <!-- Color group: Lenya using pelt-->
-        <!--<color name="header" value="#ffffff"/>
+<!-- Color group: Lenya using pelt-->
+<!--<color name="header" value="#ffffff"/>
         
         <color name="tab-selected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
         <color name="tab-unselected" value="#F5F4E9" link="#000000" vlink="#000000" hlink="#000000"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.panel.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.panel.xml Mon Apr  9 22:26:50 2007
@@ -17,107 +17,107 @@
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <!-- 
+<!-- 
         @type defines this structurer to html.
         @hooksXpath defines where all hooks will be injected (as prefix).
         -->
-    <forrest:contract name="branding-css-links">
-      <!-- More information around this contract
+  <forrest:contract name="branding-css-links">
+<!-- More information around this contract
         http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
         -->
-      <!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
-      <forrest:property name="branding-css-links-input">
-        <css url="common.css" media="screen" rel="alternate stylesheet" 
+<!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
+    <forrest:property name="branding-css-links-input">
+      <css url="common.css" media="screen" rel="alternate stylesheet" 
           theme="common"/>
-        <css url="leather-dev.css" media="screen" rel="alternate stylesheet" 
+      <css url="leather-dev.css" media="screen" rel="alternate stylesheet" 
           theme="common"/>
-        <css url="pelt.screen.css" media="screen" theme="Pelt"/>
-        <!-- You can request url specific css as defined above, 
+      <css url="pelt.screen.css" media="screen" theme="Pelt"/>
+<!-- You can request url specific css as defined above, 
           but beware that you need to use the *.dispatcher.css extension!!!-->
-        <css prefix="" url="#{$getRequest}.dispatcher.css" media="screen" theme="Pelt"/>
-        <css url="pelt.print.css" media="print"/>
-        <css>/* Extra css */ 
+      <css prefix="" url="#{$getRequest}.dispatcher.css" media="screen" theme="Pelt"/>
+      <css url="pelt.print.css" media="print"/>
+      <css>/* Extra css */ 
 p.quote {
  margin-left: 2em; 
  padding: .5em; 
  background-color: #f0f0f0; 
  font-family: monospace; 
 }</css>
-      </forrest:property>
-    </forrest:contract>
-    <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
-      <forrest:property name="custom">
-         <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-      </forrest:property>
-      <forrest:property name="theme" value="pelt"/>
-    </forrest:contract>
-    <forrest:contract name="siteinfo-meta-navigation" 
+    </forrest:property>
+  </forrest:contract>
+  <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
+    <forrest:property name="custom">
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+    </forrest:property>
+    <forrest:property name="theme" value="pelt"/>
+  </forrest:contract>
+  <forrest:contract name="siteinfo-meta-navigation" 
       dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-    <forrest:contract name="siteinfo-meta-icon">
-      <forrest:property name="siteinfo-meta-icon">
-        <favicon-url>favicon.ico</favicon-url>
+  <forrest:contract name="siteinfo-meta-icon">
+    <forrest:property name="siteinfo-meta-icon">
+      <favicon-url>favicon.ico</favicon-url>
+    </forrest:property>
+  </forrest:contract>
+  <forrest:hook name="container">
+    <forrest:contract name="branding-breadcrumbs">
+      <forrest:property name="branding-breadcrumbs">
+        <trail>
+          <link1 name="MyGroup" href="http://www.apache.org/"/>
+          <link2 name="MyProject" href="http://forrest.apache.org/"/>
+        </trail>
       </forrest:property>
     </forrest:contract>
-    <forrest:hook name="container">
-      <forrest:contract name="branding-breadcrumbs">
-        <forrest:property name="branding-breadcrumbs">
-          <trail>
-            <link1 name="MyGroup" href="http://www.apache.org/"/>
-            <link2 name="MyProject" href="http://forrest.apache.org/"/>
-          </trail>
-        </forrest:property>
-      </forrest:contract>
-      <forrest:hook name="header">
-        <forrest:contract name="branding-tagline">
-          <forrest:property name="branding-tagline-name">new 
+    <forrest:hook name="header">
+      <forrest:contract name="branding-tagline">
+        <forrest:property name="branding-tagline-name">new 
             seed</forrest:property>
-          <forrest:property name="branding-tagline-tagline">powered by the 
+        <forrest:property name="branding-tagline-tagline">powered by the 
             dispatcher</forrest:property>
-        </forrest:contract>
-        <forrest:hook class="logo">
-          <forrest:contract name="branding-logo">
-            <forrest:property name="branding-logo-name">
+      </forrest:contract>
+      <forrest:hook class="logo">
+        <forrest:contract name="branding-logo">
+          <forrest:property name="branding-logo-name">
               MyGroup</forrest:property>
-            <forrest:property name="branding-logo-description">MyGroup 
+          <forrest:property name="branding-logo-description">MyGroup 
               Description</forrest:property>
-            <forrest:property name="branding-logo-url">
+          <forrest:property name="branding-logo-url">
               http://mygroup.org/</forrest:property>
-            <forrest:property name="branding-logo-logo">
+          <forrest:property name="branding-logo-logo">
               images/group.png</forrest:property>
-          </forrest:contract>
-        </forrest:hook>
-        <forrest:hook class="logo">
-          <forrest:contract name="branding-logo">
-            <forrest:property name="branding-logo-name">
+        </forrest:contract>
+      </forrest:hook>
+      <forrest:hook class="logo">
+        <forrest:contract name="branding-logo">
+          <forrest:property name="branding-logo-name">
               MyProject</forrest:property>
-            <forrest:property name="branding-logo-description">MyProject 
+          <forrest:property name="branding-logo-description">MyProject 
               Description</forrest:property>
-            <forrest:property name="branding-logo-url">
+          <forrest:property name="branding-logo-url">
               http://myproj.mygroup.org/</forrest:property>
-            <forrest:property name="branding-logo-logo">
+          <forrest:property name="branding-logo-logo">
               images/project.png</forrest:property>
-          </forrest:contract>
-        </forrest:hook>
-        <forrest:contract name="helper-form-blank"/>
-        <forrest:contract name="search-input">
-          <forrest:property name="input-size">25</forrest:property>
-          <forrest:property name="search-input">
-            <search name="MyProject" domain="mydomain" provider="google"/>
-          </forrest:property>
         </forrest:contract>
-        <forrest:hook name="nav-main-hook">
-          <forrest:contract name="nav-main" 
+      </forrest:hook>
+      <forrest:contract name="helper-form-blank"/>
+      <forrest:contract name="search-input">
+        <forrest:property name="input-size">25</forrest:property>
+        <forrest:property name="search-input">
+          <search name="MyProject" domain="mydomain" provider="google"/>
+        </forrest:property>
+      </forrest:contract>
+      <forrest:hook name="nav-main-hook">
+        <forrest:contract name="nav-main" 
             dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-          <forrest:hook name="publishedStrip" nbsp="true">
-            <forrest:contract name="nav-main-sub" 
+        <forrest:hook name="publishedStrip" nbsp="true">
+          <forrest:contract name="nav-main-sub" 
               dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-            <forrest:contract name="siteinfo-last-published"/>
-          </forrest:hook>
+          <forrest:contract name="siteinfo-last-published"/>
         </forrest:hook>
       </forrest:hook>
-      <forrest:hook name="page">
-        <forrest:hook class="breadtrail" nbsp="true" />
-        <!--<forrest:contract name="branding-breadcrumbs">
+    </forrest:hook>
+    <forrest:hook name="page">
+      <forrest:hook class="breadtrail" nbsp="true" />
+<!--<forrest:contract name="branding-breadcrumbs">
           <forrest:property name="branding-breadcrumbs">
             <trail>
               <link1 name="myGroup" href="http://www.apache.org/"/>
@@ -126,31 +126,31 @@
             </trail>
           </forrest:property>
         </forrest:contract>-->
-        <forrest:hook name="leftbar">
-          <forrest:contract name="nav-section" 
+      <forrest:hook name="leftbar">
+        <forrest:contract name="nav-section" 
             dataURI="cocoon://#{$getRequest}.navigation.xml">
-            <forrest:property name="nav-section-toc" nugget="get.tov">
-              <jx:import 
+          <forrest:property name="nav-section-toc" nugget="get.tov">
+            <jx:import 
                 uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
-            </forrest:property>
-            <forrest:property name="expanding">true</forrest:property>
-            <!--<forrest:property name="toc" max-depth="2"/>-->
-          </forrest:contract>
-          <!-- <forrest:contract name="genericMarkup">
+          </forrest:property>
+          <forrest:property name="expanding">true</forrest:property>
+<!--<forrest:property name="toc" max-depth="2"/>-->
+        </forrest:contract>
+<!-- <forrest:contract name="genericMarkup">
             <forrest:property name="genericMarkup">
               <hr/>
             </forrest:property>
     </forrest:contract>-->
-          <!-- <forrest:contract name="search-input">
+<!-- <forrest:contract name="search-input">
             <forrest:property name="input-size">18</forrest:property>
             <forrest:property name="search-input">
               <search name="MyProject" domain="mydomain" provider="google"/>
             </forrest:property>
     </forrest:contract>-->
-          <forrest:contract name="siteinfo-credits">
-            <forrest:property name="box-location">credit</forrest:property>
-            <forrest:property name="top-separator">true</forrest:property>
-            <!--<forrest:property name="siteinfo-credits">
+        <forrest:contract name="siteinfo-credits">
+          <forrest:property name="box-location">credit</forrest:property>
+          <forrest:property name="top-separator">true</forrest:property>
+<!--<forrest:property name="siteinfo-credits">
               <credits>
                 <credit>
                   <name>Built with Apache Forrest</name>
@@ -161,36 +161,36 @@
                 </credit>
               </credits>
       </forrest:property>-->
-          </forrest:contract>
-          <!-- <forrest:contract name="genericMarkup">
+        </forrest:contract>
+<!-- <forrest:contract name="genericMarkup">
             <forrest:property name="genericMarkup">
               <hr/>
             </forrest:property>
     </forrest:contract>-->
-          <forrest:contract name="content-motd-page">
-            <forrest:property name="content-motd-page">
-              <motd>
-                <!--FIXME: motd-page location needs removing
+        <forrest:contract name="content-motd-page">
+          <forrest:property name="content-motd-page">
+            <motd>
+<!--FIXME: motd-page location needs removing
 These options are not effective anymore in dispatcher
  Need to be removed in Structurer and contracts usage/decription-->
-                <!--<motd-option pattern="index.html">
+<!--<motd-option pattern="index.html">
                   <motd-title>sample</motd-title>
                   <motd-page location="page">
                     This is an example of a Message of the day (MOTD).
                   </motd-page>
                   <motd-page-url>index.html</motd-page-url>
 	  </motd-option>-->
-                <motd-option pattern="samples/faq.html">
-                  <motd-title></motd-title>
-                  <motd-page location="both"> How to enable this MOTD is on 
+              <motd-option pattern="samples/faq.html">
+                <motd-title></motd-title>
+                <motd-page location="both"> How to enable this MOTD is on 
                     this page. </motd-page>
-                  <motd-page-url>#motd</motd-page-url>
-                </motd-option>
-              </motd>
-            </forrest:property>
-          </forrest:contract>
-          <forrest:contract name="nav-section-round-bottom"/>
-          <!-- This content displays below the navigation. the below example displays
+                <motd-page-url>#motd</motd-page-url>
+              </motd-option>
+            </motd>
+          </forrest:property>
+        </forrest:contract>
+        <forrest:contract name="nav-section-round-bottom"/>
+<!-- This content displays below the navigation. the below example displays
           ApacheCon logos and links, but can be used for whatever, or commented out 
           <forrest:hook name="below-nav">
           <forrest:contract name="siteinfo-credits">
@@ -218,77 +218,77 @@
         </forrest:contract>
 </forrest:hook>-->
 <!-- end of below-nav content -->
-        </forrest:hook>
-        <forrest:hook name="content">
- <forrest:hook name="export-link">
+      </forrest:hook>
+      <forrest:hook name="content">
+        <forrest:hook name="export-link">
           <forrest:contract name="content-pdf-link"/>
         </forrest:hook>
-          <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
-          <forrest:hook class="trail">
-            <forrest:contract name="branding-fontsize"/>
-    </forrest:hook>
-          <forrest:contract name="content-title" 
+<!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
+        <forrest:hook class="trail">
+          <forrest:contract name="branding-fontsize"/>
+        </forrest:hook>
+        <forrest:contract name="content-title" 
             dataURI="cocoon://#{$getRequest}.title.xml"/>
-          <forrest:contract name="content-abstract" 
+        <forrest:contract name="content-abstract" 
             dataURI="cocoon://#{$getRequest}.abstract.xml"/>
-          <forrest:contract name="content-minitoc" 
+        <forrest:contract name="content-minitoc" 
             dataURI="cocoon://#{$getRequest}.toc.xml">
-            <forrest:property name="content-minitoc-conf" max-depth="2" 
+          <forrest:property name="content-minitoc-conf" max-depth="2" 
               min-sections="1" location="page"/>
-          </forrest:contract>
-          <forrest:contract name="content-main" 
+        </forrest:contract>
+        <forrest:contract name="content-main" 
             dataURI="cocoon://#{$getRequest}.body.xml">
-            <forrest:property name="content-main-conf">
-              <headings type="underlined"/>
-            </forrest:property>
-          </forrest:contract>
-          <!--
+          <forrest:property name="content-main-conf">
+            <headings type="underlined"/>
+          </forrest:property>
+        </forrest:contract>
+<!--
           <forrest:contract name="content-authors">
               <forrest:property name="content-authors" nugget="get.authors">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/>
               </forrest:property>
           </forrest:contract>
           -->
-        </forrest:hook>
       </forrest:hook>
-      <forrest:hook name="footer">
-        <forrest:hook class="lastmodified">
-          <forrest:contract name="siteinfo-last-published"/>
-        </forrest:hook>
-        <forrest:hook class="copyright">
-          <forrest:contract name="siteinfo-copyright">
-            <forrest:property name="siteinfo-copyright">
-              <copyright>
-                <year inception="true">2002</year>
-                <vendor>The Example Organisation.</vendor>
-                <copyright-link>http://example.org</copyright-link>
-              </copyright>
-            </forrest:property>
-          </forrest:contract>
-        </forrest:hook>
-        <forrest:contract name="siteinfo-compliance-links"/>
-        <forrest:contract name="siteinfo-credits">
-          <forrest:property name="box-location">credit</forrest:property>
-          <forrest:property name="top-separator">false</forrest:property>
-          <forrest:property name="use-br">false</forrest:property>
-          <forrest:property name="siteinfo-credits">
-            <credits>
-              <credit>
-                <name>Built with Apache Forrest</name>
-                <url>http://forrest.apache.org/</url>
-                <image>images/built-with-forrest-button.png</image>
-                <width>88</width>
-                <height>31</height>
-              </credit>
-              <credit role="accueil">
-                <name>Built with Cocoon</name>
-                <url>http://cocoon.apache.org/</url>
-                <image>http://forrest.apache.org/images/built-with-cocoon.gif</image>
-              </credit>
-            </credits>
+    </forrest:hook>
+    <forrest:hook name="footer">
+      <forrest:hook class="lastmodified">
+        <forrest:contract name="siteinfo-last-published"/>
+      </forrest:hook>
+      <forrest:hook class="copyright">
+        <forrest:contract name="siteinfo-copyright">
+          <forrest:property name="siteinfo-copyright">
+            <copyright>
+              <year inception="true">2002</year>
+              <vendor>The Example Organisation.</vendor>
+              <copyright-link>http://example.org</copyright-link>
+            </copyright>
           </forrest:property>
         </forrest:contract>
-        <!-- <forrest:contract name="siteinfo-feedback">
+      </forrest:hook>
+      <forrest:contract name="siteinfo-compliance-links"/>
+      <forrest:contract name="siteinfo-credits">
+        <forrest:property name="box-location">credit</forrest:property>
+        <forrest:property name="top-separator">false</forrest:property>
+        <forrest:property name="use-br">false</forrest:property>
+        <forrest:property name="siteinfo-credits">
+          <credits>
+            <credit>
+              <name>Built with Apache Forrest</name>
+              <url>http://forrest.apache.org/</url>
+              <image>images/built-with-forrest-button.png</image>
+              <width>88</width>
+              <height>31</height>
+            </credit>
+            <credit role="accueil">
+              <name>Built with Cocoon</name>
+              <url>http://cocoon.apache.org/</url>
+              <image>http://forrest.apache.org/images/built-with-cocoon.gif</image>
+            </credit>
+          </credits>
+        </forrest:property>
+      </forrest:contract>
+<!-- <forrest:contract name="siteinfo-feedback">
           <forrest:properties contract="siteinfo-feedback">
             <forrest:property name="siteinfo-feedback">
               <feedback to="the Webmaster"
@@ -298,6 +298,6 @@
             </forrest:property>
           </forrest:properties>
   </forrest:contract>-->
-      </forrest:hook>
     </forrest:hook>
+  </forrest:hook>
 </forrest:template>



Mime
View raw message