forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [13/14] - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher: ./ resources/stylesheets/ resources/stylesheets/fo/ resources/stylesheets/helper/ resources/stylesheets/html/ resources/stylesh...
Date Thu, 27 Aug 2009 12:07:47 GMT
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/content-main.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/content-main.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/content-main.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/content-main.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,93 +15,85 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-main">
+<forrest:contract 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"/&gt; - Heading types can be
+    clean|underlined|boxed</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.body.xml"/>
+    <![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>
+</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'/>
+  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>
             <xsl:comment>+ |start content-main +</xsl:comment>
-            <xsl:apply-templates
-              select="//div[@id='content']/div[@id='content-main']/*|//div[@id='content']/div[@id='content-main']/processing-instruction()"/>
+            <xsl:apply-templates select="//div[@id='content']/div[@id='content-main']/*|//div[@id='content']/div[@id='content-main']/processing-instruction()" />
             <xsl:comment>+ |end content-main +</xsl:comment>
           </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"/>
+              <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"/>
+              <xsl:value-of select="h1" />
             </h2>
           </xsl:when>
           <xsl:otherwise>
             <h2 class="h3">
-              <xsl:value-of select="h1"/>
+              <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()"/>
+          <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"/>
+              <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"/>
+              <xsl:value-of select="h2" />
             </h3>
           </xsl:when>
           <xsl:otherwise>
             <h3 class="h3">
-              <xsl:value-of select="h2"/>
+              <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()"/>
+          <xsl:apply-templates select="@*|*|text()|processing-instruction()" />
         </xsl:copy>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-main-sub.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-main-sub.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-main-sub.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-main-sub.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,34 +16,28 @@
   limitations under the License.
 -->
 <forrest:contract name="nav-main-sub"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    nav-main-sub will output the secondary navigation AKA level2.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-main-sub will output the secondary navigation AKA
+  level2.</description>
   <usage>
-<![CDATA[<forrest:contract name="nav-main-sub" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    <![CDATA[<forrest:contract name="nav-main-sub" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="nav-main-sub" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template match="/" >
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:comment>+
-    |start 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) -->
+            <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) -->
             <xsl:if test="navigation/tab/div[@id='nav-main-sub']/*">
               <div id="level2tabs">
-                <xsl:copy-of
-                  select="navigation/tab/div[@id='nav-main-sub']/*"/>
+                <xsl:copy-of select="navigation/tab/div[@id='nav-main-sub']/*" />
               </div>
             </xsl:if>
-            <xsl:comment>+
-    |end Endtabs
-    +</xsl:comment>
+            <xsl:comment>+ |end Endtabs +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-section-round-bottom.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-section-round-bottom.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-section-round-bottom.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-section-round-bottom.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,26 +16,26 @@
   limitations under the License.
 -->
 <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
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-section-round-bottom will output the round bottom of the
+  navigation menues</description>
   <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"/>
+    <![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 class="corner" src="{$skin-img-dir}/spacer.gif" alt="spacer" />
+                <img class="corner" src="{$skin-img-dir}/spacer.gif"
+                alt="spacer" />
               </div>
             </div>
           </forrest:part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/search-input.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/search-input.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/search-input.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/search-input.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,96 +16,95 @@
   limitations under the License.
 -->
 <forrest:contract name="search-input"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>
-      search-input will output the default search form.
-    </p>
-
-    <p>
-      To enable lucene search add provider="lucene" (default is google). @domain
-      will enable sitesearch for the specific domain with google. In other words
-      google will search the @domain for the query string.
-    </p>
+    <p>search-input will output the default search form.</p>
+    <p>To enable lucene search add provider="lucene" (default is google).
+    @domain will enable sitesearch for the specific domain with google. In
+    other words google will search the @domain for the query string.</p>
     <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 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">
+    <![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="example.org" provider="google"/>
     </forrest:property>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="search-input" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!--FIXME: IMO each search provider should provide a form. This form should be refactored into
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="search-input"
+  inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <!--FIXME: IMO each search provider should provide a form. This form should be refactored into
         a meta-search from-->
-      <xsl:param name="search-lucene" select="'lucene-search.html'"/>
-      <xsl:param name="input-size"/>
-      <xsl:param name="search-input"/>
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+      <xsl:param name="search-lucene" select="'lucene-search.html'" />
+      <xsl:param name="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>+
-  |start Search
-  +</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:text i18n:key="Search the site with">Search the
+                        site with {0}</i18n:text>
                         <i18n:param>
-                          <xsl:value-of select="$search-input/search/@provider"/>
+                          <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'">
-                          <xsl:value-of select="$root"/>
-                          <xsl:value-of select="$search-lucene"/>
+
+                          <xsl:value-of select="$root" />
+                          <xsl:value-of select="$search-lucene" />
                         </xsl:when>
-                        <xsl:otherwise>http://www.google.com/search</xsl:otherwise>
+                        <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'">
-                          queryString</xsl:when>
+                        queryString</xsl:when>
                         <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"
-                          value="{$search-input/search/@domain}"/>
+                        value="{$search-input/search/@domain}" />
                       </div>
                       <div class="search-submit">
                         <input type="submit" value="Search" name="Search"
-                          i18n:attr="value"/>
+                        i18n:attr="value" />
                       </div>
                       <div class="search-field">
                         <input type="text" name="{$search-query}"
-                          size="{$input-size}" value="{normalize-space($search-prompt)}"
-                          onfocus="getBlank(this, '{normalize-space($search-prompt)}');"
-                          onblur="getPrompt(this, '{normalize-space($search-prompt)}');"/>
+                        size="{$input-size}"
+                        value="{normalize-space($search-prompt)}"
+                        onfocus="getBlank(this, '{normalize-space($search-prompt)}');"
+                        onblur="getPrompt(this, '{normalize-space($search-prompt)}');" />
                       </div>
                     </form>
                   </div>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-credits.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-credits.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-credits.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-credits.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <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>
+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">
+    <![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>
@@ -38,54 +36,61 @@
       </credits>
     </forrest:property>]
   </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-credits" inputFormat="xsl">
+  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"/>
+    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:variable name="filename"
+      select="$defaultVariables/*[@name='filename']/@value" />
+      <xsl:variable name="root"
+      select="$defaultVariables/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:if test="$siteinfo-credits">
-              <xsl:variable name="credit" 
-                select="$siteinfo-credits/credits/credit[($use-role-as-prefix = 'true' and starts-with( $filename, concat( @role, '.') ) ) or starts-with( $filename, 'index') ]"/>
+              <xsl:variable name="credit"
+              select="$siteinfo-credits/credits/credit[($use-role-as-prefix = 'true' and starts-with( $filename, concat( @role, '.') ) ) or starts-with( $filename, 'index') ]" />
               <xsl:if test="$credit">
-                <xsl:comment> |start siteinfo-credits </xsl:comment>
+                <xsl:comment>|start siteinfo-credits</xsl:comment>
                 <div id="{$box-location}">
                   <xsl:if test="$top-separator = 'true'">
-                    <hr/>
+                    <hr />
                   </xsl:if>
                   <xsl:for-each select="$credit">
                     <xsl:if test="not( position()=1 ) and $use-br='true'">
-                      <br/>
+                      <br />
                     </xsl:if>
-                    <xsl:variable name="name" select="normalize-space(name)"/>
-                    <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 
-                            select="$width"/>px;</xsl:if>
-                        <xsl:if test="$height">height: <xsl:value-of 
-                            select="$height"/>px;</xsl:if>
-                      </xsl:attribute>
-                    </img></a>
+                    <xsl:variable name="name" select="normalize-space(name)" />
+                    <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 select="$width" />px;</xsl:if>
+                          <xsl:if test="$height">height: 
+                          <xsl:value-of select="$height" />px;</xsl:if>
+                        </xsl:attribute>
+                      </img>
+                    </a>
                   </xsl:for-each>
                 </div>
                 <xsl:comment>+ |end siteinfo-credits +</xsl:comment>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-last-published.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-last-published.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-last-published.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-last-published.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,26 +16,25 @@
   limitations under the License.
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="siteinfo-last-published">
-  <description>
-    siteinfo-last-published will output the last published date of the site with
-    the help of javascript.
-  </description>
+name="siteinfo-last-published">
+  <description>siteinfo-last-published will output the last published date of
+  the site with the help of javascript.</description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-last-published"/>]]>
-  </usage>
-  <forrest:template 
+    <![CDATA[<forrest:contract name="siteinfo-last-published"/>]]>
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="siteinfo-last-published" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-last-published" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
-<!-- fixme: the jscript does not get written-->
+          <!-- fixme: the jscript does not get written-->
           <forrest:part>
-<script type="text/javascript">document.write("<i18n:text >Last Published:</i18n:text>&#160;" + document.lastModified);</script>
+            <script type="text/javascript">document.write(" 
+            <i18n:text>Last Published:</i18n:text>&#160;" +
+            document.lastModified);</script>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-css.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-css.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-css.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-css.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,13 +16,12 @@
 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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:contract name="branding-theme-profiler">
     <forrest:properties contract="branding-theme-profiler">
       <forrest:property name="branding-theme-profiler-theme">
-        Maven</forrest:property>
-      <forrest:property name="branding-theme-profiler">
-      </forrest:property>
+      Maven</forrest:property>
+      <forrest:property name="branding-theme-profiler"></forrest:property>
     </forrest:properties>
   </forrest:contract>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.content.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.content.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.content.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.content.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,29 +16,28 @@
   limitations under the License.
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="content">
     <forrest:hook name="export-link">
-      <forrest:contract name="content-pdf-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:contract name="branding-fontsize" />
     </forrest:hook>
     <forrest:contract name="content-title"
-      dataURI="cocoon://#{$getRequest}.title.xml"/>
+    dataURI="cocoon://#{$getRequest}.title.xml" />
     <forrest:contract name="content-abstract"
-      dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+    dataURI="cocoon://#{$getRequest}.abstract.xml" />
     <forrest:contract name="content-minitoc"
-      dataURI="cocoon://#{$getRequest}.toc.xml">
-      <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1"
-        location="page"/>
+    dataURI="cocoon://#{$getRequest}.toc.xml">
+      <forrest:property name="content-minitoc-conf" max-depth="2"
+      min-sections="1" location="page" />
     </forrest:contract>
     <forrest:contract name="content-main"
-      dataURI="cocoon://#{$getRequest}.body.xml">
+    dataURI="cocoon://#{$getRequest}.body.xml">
       <forrest:property name="content-main-conf">
-        <headings type="underlined"/>
+        <headings type="underlined" />
       </forrest:property>
     </forrest:contract>
     <!--

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.footer.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.footer.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.footer.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.footer.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,9 +16,9 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="footer">
-          <!--  <forrest:hook class="lastmodified">
+    <!--  <forrest:hook class="lastmodified">
       <forrest:contract name="siteinfo-last-published"/>
     </forrest:hook>-->
     <forrest:hook class="copyright">

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.head.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.head.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.head.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.head.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,46 +16,42 @@
   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">
+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
+    <!-- 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 
+    <!--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" 
-          theme="common"/>
-      <css url="maven.screen.css" media="screen" theme="Maven"/>
+      <css url="common.css" media="screen" rel="alternate stylesheet"
+      theme="common" />
+      <css url="leather-dev.css" media="screen" rel="alternate stylesheet"
+      theme="common" />
+      <css url="maven.screen.css" media="screen" theme="Maven" />
       <!-- 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="Maven"/>
-      <css url="maven.print.css" media="print"/>
-      <css>/* Extra css */ 
-p.quote {
- margin-left: 2em; 
- padding: .5em; 
- background-color: #f0f0f0; 
- font-family: monospace; 
-}</css>
+      <css prefix="" url="#{$getRequest}.dispatcher.css" media="screen"
+      theme="Maven" />
+      <css url="maven.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"/>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     </forrest:property>
-    <forrest:property name="theme" value="maven"/>
+    <forrest:property name="theme" value="maven" />
   </forrest:contract>
-  <forrest:contract name="siteinfo-meta-navigation" 
-      dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+  <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>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.header.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.header.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.header.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.header.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,7 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <!-- <forrest:contract name="branding-breadcrumbs">
     <forrest:property name="branding-breadcrumbs">
       <trail>
@@ -27,19 +27,20 @@
   </forrest:contract>-->
   <forrest:hook name="header">
     <forrest:contract name="branding-tagline">
-      <forrest:property name="branding-tagline-name">new seed</forrest:property>
+      <forrest:property name="branding-tagline-name">new
+      seed</forrest:property>
       <forrest:property name="branding-tagline-tagline">powered by the
-        dispatcher</forrest:property>
+      dispatcher</forrest:property>
     </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-name">MyGroup</forrest:property>
         <forrest:property name="branding-logo-description">MyGroup
-          Description</forrest:property>
+        Description</forrest:property>
         <forrest:property name="branding-logo-url">
-          http://example.org/</forrest:property>
-        <forrest:property name="branding-logo-logo"> images/group.png
-          </forrest:property>
+        http://example.org/</forrest:property>
+        <forrest:property name="branding-logo-logo">
+        images/group.png</forrest:property>
       </forrest:contract>
     </forrest:hook>
     <!--<forrest:hook class="logo">
@@ -53,6 +54,6 @@
           </forrest:property>
       </forrest:contract>
     </forrest:hook>-->
-    <jx:import uri="cocoon://prepare.panels.maven-html.nav-main"/>
+    <jx:import uri="cocoon://prepare.panels.maven-html.nav-main" />
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.leftbar.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.leftbar.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.leftbar.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.leftbar.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,12 +16,12 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="leftbar">
-    <forrest:contract name="nav-section" 
-                      dataURI="cocoon://#{$getRequest}.navigation.xml">
+    <forrest:contract name="nav-section"
+    dataURI="cocoon://#{$getRequest}.navigation.xml">
       <forrest:property name="nav-section-toc" nugget="get.tov">
-        <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
+        <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml" />
       </forrest:property>
       <forrest:property name="expanding">false</forrest:property>
       <!--<forrest:property name="toc" max-depth="2"/>-->
@@ -44,17 +44,17 @@
     <forrest:contract name="siteinfo-credits">
       <forrest:property name="box-location">credit</forrest:property>
       <forrest:property name="top-separator">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>
-          </credits>
-        </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>
+        </credits>
+      </forrest:property>
     </forrest:contract>
     <!-- 
       <forrest:contract name="genericMarkup">
@@ -66,12 +66,12 @@
     <forrest:contract name="content-motd-page">
       <forrest:property name="content-motd-page">
         <motd>
-        <!--FIXME: 
-	  motd-page location needs removing
+          <!--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-title>sample</motd-title>
           <motd-page location="page">
@@ -80,20 +80,19 @@
           <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 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-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
   ApacheCon logos and links, but can be used for whatever, or commented out-->
-  <!--<forrest:hook name="below-nav">
+    <!--<forrest:hook name="below-nav">
     <forrest:contract name="siteinfo-credits">
       <forrest:property name="box-location">credit2</forrest:property>
       <forrest:property name="top-separator">false</forrest:property>
@@ -119,6 +118,6 @@
     </forrest:contract>
   </forrest:hook>
   -->
-  <!-- end of below-nav content -->
+    <!-- end of below-nav content -->
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.nav-main.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.nav-main.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.nav-main.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/panels/maven-html.nav-main.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +16,7 @@
   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">
-  
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <!--<forrest:contract name="helper-form-blank"/>
   <forrest:contract name="search-input">
     <forrest:property name="input-size">25</forrest:property>
@@ -27,11 +26,11 @@
   </forrest:contract>-->
   <forrest:hook name="nav-main-hook">
     <forrest:contract name="nav-main"
-      dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-<forrest:contract name="nav-main-sub"
-        dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+    dataURI="cocoon://#{$getRequest}.navigation.xml" />
+    <forrest:contract name="nav-main-sub"
+    dataURI="cocoon://#{$getRequest}.navigation.xml" />
     <forrest:hook name="publishedStrip" nbsp="true">
-            <forrest:contract name="siteinfo-last-published"/>
+      <forrest:contract name="siteinfo-last-published" />
     </forrest:hook>
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt.structurer.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt.structurer.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt.structurer.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,32 +15,34 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
-  jx:cache-key="#{$cocoon/parameters/getRequest}" 
-  jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
-<!-- 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}" />
-<!-- FO View of the request (e.g. index.fo, usually further processed to pdf)-->
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+jx:cache-key="#{$cocoon/parameters/getRequest}"
+jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
+
+  <!-- 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}" />
+  <!-- FO View of the request (e.g. index.fo, usually further processed to pdf)-->
   <forrest:structure type="fo" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.common-fo"/>
+    <jx:import uri="cocoon://prepare.panels.common-fo" />
   </forrest:structure>
-<!-- CSS View of the request e.g. index.dispatcher.css -->
+  <!-- CSS View of the request e.g. index.dispatcher.css -->
   <forrest:structure type="css" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.pelt-css"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-css" />
   </forrest:structure>
-<!-- HTML View of the request (e.g. index.html)-->
+  <!-- HTML View of the request (e.g. index.html)-->
   <forrest:structure type="html" hooksXpath="/html/body">
-    <jx:import uri="cocoon://prepare.panels.pelt-html.head"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html.head" />
     <forrest:hook name="container">
-      <jx:import uri="cocoon://prepare.panels.pelt-html.header"/>
+      <jx:import uri="cocoon://prepare.panels.pelt-html.header" />
       <forrest:hook name="page">
-        <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar"/>
-        <jx:import uri="cocoon://prepare.panels.pelt-html.content"/>
+        <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar" />
+        <jx:import uri="cocoon://prepare.panels.pelt-html.content" />
       </forrest:hook>
-      <jx:import uri="cocoon://prepare.panels.pelt-html.footer"/>
+      <jx:import uri="cocoon://prepare.panels.pelt-html.footer" />
     </forrest:hook>
   </forrest:structure>
 </forrest:structurer>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/content-main.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/content-main.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/content-main.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/content-main.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,93 +15,85 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-main">
+<forrest:contract 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"/&gt; - Heading types can be
+    clean|underlined|boxed</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.body.xml"/>
+    <![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>
+</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'/>
+  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>
             <xsl:comment>+ |start content-main +</xsl:comment>
-            <xsl:apply-templates
-              select="//div[@id='content']/div[@id='content-main']/*|//div[@id='content']/div[@id='content-main']/processing-instruction()"/>
+            <xsl:apply-templates select="//div[@id='content']/div[@id='content-main']/*|//div[@id='content']/div[@id='content-main']/processing-instruction()" />
             <xsl:comment>+ |end content-main +</xsl:comment>
           </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"/>
+              <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"/>
+              <xsl:value-of select="h1" />
             </h2>
           </xsl:when>
           <xsl:otherwise>
             <h2 class="h3">
-              <xsl:value-of select="h1"/>
+              <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()"/>
+          <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"/>
+              <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"/>
+              <xsl:value-of select="h2" />
             </h3>
           </xsl:when>
           <xsl:otherwise>
             <h3 class="h3">
-              <xsl:value-of select="h2"/>
+              <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()"/>
+          <xsl:apply-templates select="@*|*|text()|processing-instruction()" />
         </xsl:copy>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-main-sub.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-main-sub.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-main-sub.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-main-sub.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,34 +16,28 @@
   limitations under the License.
 -->
 <forrest:contract name="nav-main-sub"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
-  <description>
-    nav-main-sub will output the secondary navigation AKA level2.
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-main-sub will output the secondary navigation AKA
+  level2.</description>
   <usage>
-<![CDATA[<forrest:contract name="nav-main-sub" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    <![CDATA[<forrest:contract name="nav-main-sub" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="nav-main-sub" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template match="/" >
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:comment>+
-    |start 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) -->
+            <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) -->
             <xsl:if test="navigation/tab/div[@id='nav-main-sub']/*">
               <div id="level2tabs">
-                <xsl:copy-of
-                  select="navigation/tab/div[@id='nav-main-sub']/*"/>
+                <xsl:copy-of select="navigation/tab/div[@id='nav-main-sub']/*" />
               </div>
             </xsl:if>
-            <xsl:comment>+
-    |end Endtabs
-    +</xsl:comment>
+            <xsl:comment>+ |end Endtabs +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,26 +16,26 @@
   limitations under the License.
 -->
 <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
-  </description>
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <description>nav-section-round-bottom will output the round bottom of the
+  navigation menues</description>
   <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"/>
+    <![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 class="corner" src="{$skin-img-dir}/spacer.gif" alt="spacer" />
+                <img class="corner" src="{$skin-img-dir}/spacer.gif"
+                alt="spacer" />
               </div>
             </div>
           </forrest:part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/search-input.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/search-input.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/search-input.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/search-input.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,96 +16,95 @@
   limitations under the License.
 -->
 <forrest:contract name="search-input"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>
-      search-input will output the default search form.
-    </p>
-
-    <p>
-      To enable lucene search add provider="lucene" (default is google). @domain
-      will enable sitesearch for the specific domain with google. In other words
-      google will search the @domain for the query string.
-    </p>
+    <p>search-input will output the default search form.</p>
+    <p>To enable lucene search add provider="lucene" (default is google).
+    @domain will enable sitesearch for the specific domain with google. In
+    other words google will search the @domain for the query string.</p>
     <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 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">
+    <![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="example.org" provider="google"/>
     </forrest:property>
 </forrest:contract>]]>
-  </usage>
-  <forrest:template
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="search-input" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!--FIXME: IMO each search provider should provide a form. This form should be refactored into
+</usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="search-input"
+  inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <!--FIXME: IMO each search provider should provide a form. This form should be refactored into
         a meta-search from-->
-      <xsl:param name="search-lucene" select="'lucene-search.html'"/>
-      <xsl:param name="input-size"/>
-      <xsl:param name="search-input"/>
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+      <xsl:param name="search-lucene" select="'lucene-search.html'" />
+      <xsl:param name="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>+
-  |start Search
-  +</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:text i18n:key="Search the site with">Search the
+                        site with {0}</i18n:text>
                         <i18n:param>
-                          <xsl:value-of select="$search-input/search/@provider"/>
+                          <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'">
-                          <xsl:value-of select="$root"/>
-                          <xsl:value-of select="$search-lucene"/>
+
+                          <xsl:value-of select="$root" />
+                          <xsl:value-of select="$search-lucene" />
                         </xsl:when>
-                        <xsl:otherwise>http://www.google.com/search</xsl:otherwise>
+                        <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'">
-                          queryString</xsl:when>
+                        queryString</xsl:when>
                         <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"
-                          value="{$search-input/search/@domain}"/>
+                        value="{$search-input/search/@domain}" />
                       </div>
                       <div class="search-field">
                         <input type="text" name="{$search-query}"
-                          size="{$input-size}" value="{normalize-space($search-prompt)}"
-                          onfocus="getBlank(this, '{normalize-space($search-prompt)}');"
-                          onblur="getPrompt(this, '{normalize-space($search-prompt)}');"/>
+                        size="{$input-size}"
+                        value="{normalize-space($search-prompt)}"
+                        onfocus="getBlank(this, '{normalize-space($search-prompt)}');"
+                        onblur="getPrompt(this, '{normalize-space($search-prompt)}');" />
                       </div>
                       <div class="search-submit">
                         <input type="submit" value="Search" name="Search"
-                          i18n:attr="value"/>
+                        i18n:attr="value" />
                       </div>
                     </form>
                   </div>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/siteinfo-credits.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/siteinfo-credits.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/siteinfo-credits.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/siteinfo-credits.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <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>
+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">
+    <![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>
@@ -38,54 +36,61 @@
       </credits>
     </forrest:property>]
   </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-credits" inputFormat="xsl">
+  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"/>
+    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:variable name="filename"
+      select="$defaultVariables/*[@name='filename']/@value" />
+      <xsl:variable name="root"
+      select="$defaultVariables/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:if test="$siteinfo-credits">
-              <xsl:variable name="credit" 
-                select="$siteinfo-credits/credits/credit[($use-role-as-prefix = 'true' and starts-with( $filename, concat( @role, '.') ) ) or starts-with( $filename, 'index') ]"/>
+              <xsl:variable name="credit"
+              select="$siteinfo-credits/credits/credit[($use-role-as-prefix = 'true' and starts-with( $filename, concat( @role, '.') ) ) or starts-with( $filename, 'index') ]" />
               <xsl:if test="$credit">
-                <xsl:comment> |start siteinfo-credits </xsl:comment>
+                <xsl:comment>|start siteinfo-credits</xsl:comment>
                 <div id="{$box-location}">
                   <xsl:if test="$top-separator = 'true'">
-                    <hr/>
+                    <hr />
                   </xsl:if>
                   <xsl:for-each select="$credit">
                     <xsl:if test="not( position()=1 ) and $use-br='true'">
-                      <br/>
+                      <br />
                     </xsl:if>
-                    <xsl:variable name="name" select="normalize-space(name)"/>
-                    <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 
-                            select="$width"/>px;</xsl:if>
-                        <xsl:if test="$height">height: <xsl:value-of 
-                            select="$height"/>px;</xsl:if>
-                      </xsl:attribute>
-                    </img></a>
+                    <xsl:variable name="name" select="normalize-space(name)" />
+                    <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 select="$width" />px;</xsl:if>
+                          <xsl:if test="$height">height: 
+                          <xsl:value-of select="$height" />px;</xsl:if>
+                        </xsl:attribute>
+                      </img>
+                    </a>
                   </xsl:for-each>
                 </div>
                 <xsl:comment>+ |end siteinfo-credits +</xsl:comment>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-css.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-css.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-css.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-css.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,13 +16,13 @@
 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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:contract name="branding-theme-profiler">
     <forrest:properties contract="branding-theme-profiler">
       <forrest:property name="branding-theme-profiler-theme">
-        Pelt</forrest:property>
+      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.
@@ -32,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.
@@ -48,8 +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"/>
@@ -76,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"/>
@@ -107,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"/>
@@ -138,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/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.content.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.content.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.content.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.content.panel.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,29 +16,28 @@
   limitations under the License.
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="content">
     <forrest:hook name="export-link">
-      <forrest:contract name="content-pdf-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:contract name="branding-fontsize" />
     </forrest:hook>
     <forrest:contract name="content-title"
-      dataURI="cocoon://#{$getRequest}.title.xml"/>
+    dataURI="cocoon://#{$getRequest}.title.xml" />
     <forrest:contract name="content-abstract"
-      dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+    dataURI="cocoon://#{$getRequest}.abstract.xml" />
     <forrest:contract name="content-minitoc"
-      dataURI="cocoon://#{$getRequest}.toc.xml">
-      <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1"
-        location="page"/>
+    dataURI="cocoon://#{$getRequest}.toc.xml">
+      <forrest:property name="content-minitoc-conf" max-depth="2"
+      min-sections="1" location="page" />
     </forrest:contract>
     <forrest:contract name="content-main"
-      dataURI="cocoon://#{$getRequest}.body.xml">
+    dataURI="cocoon://#{$getRequest}.body.xml">
       <forrest:property name="content-main-conf">
-        <headings type="underlined"/>
+        <headings type="underlined" />
       </forrest:property>
     </forrest:contract>
     <!--



Mime
View raw message