forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r292707 [1/2] - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml: ./ resources/skin/css/pelt/ resources/skin/images/ resources/templates/ resources/templates/pelt/
Date Fri, 30 Sep 2005 11:10:27 GMT
Author: thorsten
Date: Fri Sep 30 04:09:55 2005
New Revision: 292707

URL: http://svn.apache.org/viewcvs?rev=292707&view=rev
Log:
Roll back of both view plugins internal.view and output.viewHelper to -r280939

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-grouplogo.ft   (props changed)
      - copied unchanged from r280939, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-grouplogo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-projectlogo.ft   (props changed)
      - copied unchanged from r280939, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-projectlogo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-motd-page.ft   (props changed)
      - copied unchanged from r280939, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-motd-page.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-motd-page.ft   (props changed)
      - copied unchanged from r280939, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-motd-page.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/hr.ft   (props changed)
      - copied unchanged from r280939, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/hr.ft
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/images/instruction_arrow.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-logo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-authors.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/genericMarkup.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-copyright.ft
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.basic.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.screen.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-breadcrumbs.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-minitoc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/noFt.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-feedback.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-navigation.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap Fri Sep 30 04:09:55 2005
@@ -2,13 +2,13 @@
 <!--
   Copyright 1999-2004 The Apache Software Foundation or its licensors,
   as applicable.
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,289 +16,270 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:components>
+	<map:components>
     <map:pipes default="caching">
-      <map:pipe name="caching"
-        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
-      <map:pipe name="noncaching"
-        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
-    </map:pipes>
-    <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists"
-        src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+	   <map:pipe name="caching"
+	    src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+	   <map:pipe name="noncaching"
+	    src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+	  </map:pipes>
+		<map:selectors>
+      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </map:selectors>
     <map:generators default="file">
-      <map:generator name="html"
-        src="org.apache.cocoon.generation.HTMLGenerator">
+      <map:generator name="html"      
+                     src="org.apache.cocoon.generation.HTMLGenerator">
         <jtidy-config>jtidy.properties</jtidy-config>
       </map:generator>
-      <map:generator name="directory"
-        src="org.apache.cocoon.generation.DirectoryGenerator" />
+      <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
     </map:generators>
     <map:transformers default="xslt">
       <map:transformer name="cinclude"
-        src="org.apache.cocoon.transformation.CIncludeTransformer" />
+        src="org.apache.cocoon.transformation.CIncludeTransformer"/>
       <map:transformer name="xinclude"
-        src="org.apache.cocoon.transformation.XIncludeTransformer" />
-      <map:transformer name="i18n"
-        src="org.apache.cocoon.transformation.I18nTransformer">
-        <catalogues default="contracts">
-          <catalogue id="other" name="OtherMessages"
-            location="messages" />
-          <catalogue id="contracts" name="ContractsMessages"
-            location="messages" />
-        </catalogues>
-        <cache-at-startup>true</cache-at-startup>
-      </map:transformer>
+        src="org.apache.cocoon.transformation.XIncludeTransformer"/>
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+	      <catalogues default="contracts">
+	        <catalogue id="other" name="OtherMessages" location="messages"/>
+	        <catalogue id="contracts" name="ContractsMessages" location="messages"/>
+	      </catalogues>
+	      <cache-at-startup>true</cache-at-startup>
+	    </map:transformer>
     </map:transformers>
     <map:serializers>
-      <map:serializer logger="sitemap.serializer.xhtml"
-        mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64"
-        pool-min="2"
-        src="org.apache.cocoon.serialization.XMLSerializer">
-        <!--+
-          | You can choose from Strict, Transitional, or Frameset XHTML.
-          | For Strict XHTML set doctype to:
-          |   <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
-          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
-          | For Transitional XHTML set doctype to:
-          |   <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
-          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
-          | For Frameset XHTML set doctype to:
-          |   <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
-          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
-          |
-          | Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
-          | XHTML DTD simultaneously, you can define several XHTML serializers.
-          +-->
-        <doctype-public>
-          -//W3C//DTD XHTML 1.0 Strict//EN
-        </doctype-public>
-        <doctype-system>
-          http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
-        </doctype-system>
-        <encoding>UTF-8</encoding>
+	   <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
+	      <!--+
+	          | You can choose from Strict, Transitional, or Frameset XHTML.
+	          | For Strict XHTML set doctype to:
+	          |   <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+	          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+	          | For Transitional XHTML set doctype to:
+	          |   <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+	          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+	          | For Frameset XHTML set doctype to:
+	          |   <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
+	          |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
+	          |
+	          | Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
+	          | XHTML DTD simultaneously, you can define several XHTML serializers.
+	          +-->
+	      <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+	      <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+	      <encoding>UTF-8</encoding>
         <indent>yes</indent>
-      </map:serializer>
-      <map:serializer name="txt"
-        src="org.apache.cocoon.serialization.TextSerializer"
-        mime-type="text/plain" logger="sitemap.serializer.text" />
+	    </map:serializer>
+      <map:serializer name="txt" 
+			   src="org.apache.cocoon.serialization.TextSerializer"
+			   mime-type="text/plain" 
+			   logger="sitemap.serializer.text" 
+			 />
     </map:serializers>
   </map:components>
-  <map:pipelines>
-    <!--
-      This plugin provides a theme implementation based on views
-    -->
-    <!--
-      common skining
-      This is the template producing factory.
-    -->
-    <map:pipeline type="noncaching">
-      <!--
-        FIXME:
-        The next pipes have to be refactored and then to go into the view-interface (internal plugin)
-        e.g. resources/templates/{1}.ft -> should become 
-        first {project:view-skin}/templates/{1}.ft 
-        then {project:skin}/templates/{1}.ft
-      -->
-      <!--FIXME:START-->
-      <!--
-        Resolving factory
-        Project implementation of templates have priority before default ones.
-        If no implementation can be found we use the noFt (~ - no forrest:template) implementation.
-        {1} name of the contract-->
-      <map:match pattern="resolve.contract.xhtml.*">
-        <map:select type="exists">
-          <map:when
-            test="{project:resources}/templates/{project:theme}/{1}.ft">
-            <map:generate
-              src="{project:resources}/templates/{project:theme}/{1}.ft" />
-          </map:when>
-          <map:when test="{project:resources}/templates/{1}.ft">
-            <map:generate src="{project:resources}/templates/{1}.ft" />
-          </map:when>
-          <map:when test="{forrest:plugins}/templates/{1}.ft">
-            <map:generate src="{forrest:plugins}/templates/{1}.ft" />
-          </map:when>
-          <map:when test="resources/templates/{project:theme}/{1}.ft">
-            <map:generate
-              src="resources/templates/{project:theme}/{1}.ft" />
-          </map:when>
-          <map:when test="resources/templates/{1}.ft">
-            <map:generate src="resources/templates/{1}.ft" />
-          </map:when>
-          <map:otherwise>
-            <map:generate src="resources/templates/noFt.ft" />
-          </map:otherwise>
-        </map:select>
-        <map:serialize type="xml" />
-      </map:match>
-      <!--This activates forrest:call-templates includes into the view.-->
-      <map:match pattern="prepare.view-templates.**">
-        <map:select type="exists">
-          <map:when
-            test="{project:resources}/templates/{project:theme}/{1}.vt.xml">
-            <map:generate
-              src="{project:resources}/templates/{project:theme}/{1}.vt.xml" />
-          </map:when>
-          <map:when test="{project:resources}/templates/{1}.vt.xml">
-            <map:generate
-              src="{project:resources}/templates/{1}.vt.xml" />
-          </map:when>
-          <map:when
-            test="resources/templates/{project:theme}/{1}.vt.xml">
-            <map:generate
-              src="resources/templates/{project:theme}/{1}.vt.xml" />
-          </map:when>
-          <map:when test="resources/templates/{1}.vt.xml">
-            <map:generate src="resources/templates/{1}.vt.xml" />
-          </map:when>
-          <!-- otherwiser no view Tiles not found -->
-        </map:select>
-        <map:transform
-          src="{defaults:view-internal}/resources/stylesheets/prepare.include.templates.xsl" />
-        <map:transform type="xinclude" />
-        <map:serialize type="xml" />
-      </map:match>
-      <!-- <!-#-INTERFACE
-        Get the xsl:templates of the requested contract.
-        {1} format to deliver
-        {2} contract name-#->
-        <map:match pattern="get.contract.*.*">
-        <map:generate src="cocoon:/resolve.contract.{2}"/>
-        <map:transform src="resources/stylesheets/contract.xsl">
-        <!-#-Which output format?-#->
-        <map:parameter name="format" value="{1}"/>
-        </map:transform>
-        <map:serialize type="xml"/>
-        </map:match>-->
-      <!--IMPLEMENTATION
-        Get the xsl:templates of the requested contract.
-        {html} format to deliver
-        {2} contract name-->
-      <map:match pattern="get.contract.*.xhtml">
-        <map:generate src="cocoon:/resolve.contract.xhtml.{1}" />
-        <map:transform src="resources/stylesheets/contract.xsl">
-          <!--Which output format?-->
-          <map:parameter name="format" value="xhtml" />
-        </map:transform>
-        <map:transform type="i18n">
-          <map:parameter name="locale" value="{request:locale}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-      <!--
-        Get the forrest:properties of the requested contract. 
-        This will determine which templates (css, head, body) we have to call later on
-        {1} format to deliver
-        {2} contract name
-      -->
-      <map:match pattern="get.contract-property.*.xhtml">
-        <map:generate src="cocoon:/resolve.contract.xhtml.{1}" />
-        <map:transform
-          src="resources/stylesheets/contract.property.xsl">
-          <!--Which output format?-->
-          <map:parameter name="format" value="xhtml" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-    <!--
-      Get the css of the requested contract {1}. 
+<map:pipelines>
+
+<!--
+  This plugin provides a skin implementation based on views
+  -->
+  
+<!--
+  common skining
+  This is the template producing factory.
+  -->
+ <map:pipeline type="noncaching">
+  <!--
+    FIXME:
+    The next pipes have to be refactored and then to go into the view-interface (internal plugin)
+    e.g. resources/templates/{1}.ft -> should become 
+    first {project:view-skin}/templates/{1}.ft 
+    then {project:skin}/templates/{1}.ft
     -->
-    <!--   <map:match pattern="get.contract-css.*">
-      <map:generate src="cocoon:/resolve.contract.xhtml.{1}"/>
-      <map:transform src="resources/stylesheets/contract.css.xsl"/>
-      <map:serialize type="txt"/>
-      </map:match>-->
-    <!--FIXME:END-->
-    <!--
-      FIXME:
-      The next pipes have to be refactored and then to go into an input plugin
-      e.g. resources/templates -> should become 
-      first {project:view-skin}/templates 
-      then {project:skin}/templates
+  <!--FIXME:START-->
+  <!--
+    Resolving factory
+    Project implementation of templates have priority before default ones.
+    If no implementation can be found we use the noFt (~ - no forrest:template) implementation.
+    {1} name of the contract-->
+  <map:match pattern="resolve.contract.xhtml.*">
+    <map:select type="exists">
+      <map:when test="{project:resources}/templates/{project:theme}/{1}.ft">
+        <map:generate src="{project:resources}/templates/{project:theme}/{1}.ft"/>
+      </map:when>
+      <map:when test="{project:resources}/templates/{1}.ft">
+        <map:generate src="{project:resources}/templates/{1}.ft"/>
+      </map:when>
+      <map:when test="{forrest:plugins}/templates/{1}.ft">
+        <map:generate src="{forrest:plugins}/templates/{1}.ft"/>
+      </map:when>
+      <map:when test="resources/templates/{project:theme}/{1}.ft">
+        <map:generate src="resources/templates/{project:theme}/{1}.ft"/>
+      </map:when>
+      <map:when test="resources/templates/{1}.ft">
+        <map:generate src="resources/templates/{1}.ft"/>
+      </map:when>
+      <map:otherwise>
+        <map:generate src="resources/templates/noFt.ft"/>
+      </map:otherwise>
+    </map:select>
+    <map:serialize type="xml"/>
+  </map:match>
+  
+  <!--This activates forrest:call-templates includes into the view.-->
+    <map:match pattern="prepare.view-templates.**">
+      <map:select type="exists">
+      <map:when test="{project:resources}/templates/{project:theme}/{1}.vt.xml">
+        <map:generate src="{project:resources}/templates/{project:theme}/{1}.vt.xml"/>
+      </map:when>
+      <map:when test="{project:resources}/templates/{1}.vt.xml">
+        <map:generate src="{project:resources}/templates/{1}.vt.xml"/>
+      </map:when>
+      <map:when test="resources/templates/{project:theme}/{1}.vt.xml">
+        <map:generate src="resources/templates/{project:theme}/{1}.vt.xml"/>
+      </map:when>
+      <map:when test="resources/templates/{1}.vt.xml">
+        <map:generate src="resources/templates/{1}.vt.xml"/>
+      </map:when>
+      <!-- otherwiser no view Tiles not found -->
+      </map:select>
+      <map:transform src="{defaults:view-internal}/resources/stylesheets/prepare.include.templates.xsl"/>
+      <map:transform type="xinclude"/>
+      <map:serialize type="xml"/>
+    </map:match>
+  
+   <!-- <!-#-INTERFACE
+    Get the xsl:templates of the requested contract.
+  {1} format to deliver
+  {2} contract name-#->
+   <map:match pattern="get.contract.*.*">
+     <map:generate src="cocoon:/resolve.contract.{2}"/>
+     <map:transform src="resources/stylesheets/contract.xsl">
+      <!-#-Which output format?-#->
+      <map:parameter name="format" value="{1}"/>
+     </map:transform>
+     <map:serialize type="xml"/>
+   </map:match>-->
+  
+  <!--IMPLEMENTATION
+    Get the xsl:templates of the requested contract.
+  {html} format to deliver
+  {2} contract name-->
+   <map:match pattern="get.contract.*.xhtml">
+     <map:generate src="cocoon:/resolve.contract.xhtml.{1}"/>
+     <map:transform src="resources/stylesheets/contract.xsl">
+      <!--Which output format?-->
+      <map:parameter name="format" value="xhtml"/>
+     </map:transform>
+     <map:transform type="i18n">
+       <map:parameter name="locale" value="{request:locale}"/>
+     </map:transform>
+     <map:serialize type="xml"/>
+   </map:match>
+  <!--
+  Get the forrest:properties of the requested contract. 
+  This will determine which templates (css, head, body) we have to call later on
+  {1} format to deliver
+  {2} contract name
+  -->
+   <map:match pattern="get.contract-property.*.xhtml">
+     <map:generate src="cocoon:/resolve.contract.xhtml.{1}"/>
+     <map:transform src="resources/stylesheets/contract.property.xsl">
+      <!--Which output format?-->
+      <map:parameter name="format" value="xhtml"/>
+     </map:transform>
+     <map:serialize type="xml"/>
+   </map:match>
+   </map:pipeline>
+  <!--
+  Get the css of the requested contract {1}. 
+  -->
+<!--   <map:match pattern="get.contract-css.*">
+     <map:generate src="cocoon:/resolve.contract.xhtml.{1}"/>
+     <map:transform src="resources/stylesheets/contract.css.xsl"/>
+     <map:serialize type="txt"/>
+   </map:match>-->
+<!--FIXME:END-->
+<!--
+    FIXME:
+    The next pipes have to be refactored and then to go into an input plugin
+    e.g. resources/templates -> should become 
+    first {project:view-skin}/templates 
+    then {project:skin}/templates
     -->
-    <!--FIXME:START-->
-    <!-- ls.fbits 
-      list the default fbits-->
-    <map:pipeline>
-      <map:match pattern="ls.contracts">
-        <map:generate type="directory" src="resources/templates">
-          <map:parameter name="depth" value="1" />
-          <!-- sorted alphabetically -->
-          <map:parameter name="reverse" value="false" />
-        </map:generate>
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-    <!-- ls.fbits 
-      list the project fbits-->
-    <map:pipeline>
-      <map:match pattern="ls.contracts.project">
-        <map:generate type="directory"
-          src="{project:resources}/templates/">
-          <map:parameter name="depth" value="1" />
-          <!-- sorted alphabetically -->
-          <map:parameter name="reverse" value="false" />
-        </map:generate>
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
+  <!--FIXME:START-->
+<!-- ls.fbits 
+  list the default fbits-->
+  <map:pipeline>
+    <map:match pattern="ls.contracts">
+		  <map:generate type="directory" src="resources/templates">
+        <map:parameter name="depth" value="1"/>
+        <!-- sorted alphabetically -->
+      	<map:parameter name="reverse" value="false"/>
+      </map:generate>
+      <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
+<!-- ls.fbits 
+  list the project fbits-->
+  <map:pipeline>
+    <map:match pattern="ls.contracts.project">
+		  <map:generate type="directory" src="{project:resources}/templates/">
+        <map:parameter name="depth" value="1"/>
+        <!-- sorted alphabetically -->
+      	<map:parameter name="reverse" value="false"/>
+      </map:generate>
+      <map:serialize type="xml"/>
+    </map:match>
+  </map:pipeline>
 
-    <map:pipeline>
-      <!--
-        Debug pipes - JTidy output
-      -->
-      <map:match pattern="*.tidy">
-        <map:generate type="html" src="cocoon:/{1}.html" />
-        <map:serialize type="xhtml" />
-      </map:match>
-      <map:match pattern="**/*.tidy">
-        <map:generate type="html" src="cocoon:/{1}/{2}.html" />
-        <map:serialize type="xhtml" />
-      </map:match>
-      <!--
-        Last processing step. 
-        Here we are overriding the default skin generation.
-      -->
-      <map:match pattern="*.html">
-        <map:generate src="cocoon://prepare.view-nugget.{1}" />
-        <map:transform src="cocoon://getStylesheet.xhtml.{1}">
-          <map:parameter name="path" value="{0}" />
-        </map:transform>
-        <map:transform src="resources/stylesheets/strip_namespaces.xsl"/>
-        <map:serialize type="xhtml" />
-      </map:match>
-      <map:match pattern="**/*.html">
-        <map:generate src="cocoon://prepare.view-nugget.{1}/{2}" />
-        <map:transform src="cocoon://getStylesheet.xhtml.{1}/{2}">
-          <map:parameter name="path" value="{0}" />
-        </map:transform>
-        <map:transform src="resources/stylesheets/strip_namespaces.xsl" />
-        <map:serialize type="xhtml" />
-      </map:match>
-      <!-- -->
-      <map:match pattern="**.js">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+  <map:pipeline>
+<!--
+  Debug pipes - JTidy output
+  -->
+		<map:match pattern="*.tidy">
+      <map:generate type="html" src="cocoon:/{1}.html"/>
+     	<map:serialize type="xhtml"/>
+    </map:match>
+    <map:match pattern="**/*.tidy">
+      <map:generate type="html" src="cocoon:/{1}/{2}.html"/>
+     	<map:serialize type="xhtml"/>
+    </map:match>
+  <!--
+  Last processing step. 
+  Here we are overriding the default skin generation.
+  -->   
+    <map:match pattern="*.html">
+      <map:generate src="cocoon://{1}.page"/>
+      <map:transform src="cocoon://getStylesheet.xhtml.{1}">
+        <map:parameter name="path" value="{0}"/>
+      </map:transform>
+      <map:transform src="resources/stylesheets/strip_namespaces.xsl"/>
+     	<map:serialize type="xhtml"/>
+    </map:match>
+    <map:match pattern="**/*.html">
+      <map:generate src="cocoon://{1}/{2}.page"/>
+      <map:transform src="cocoon://getStylesheet.xhtml.{1}/{2}">
+        <map:parameter name="path" value="{0}"/>
+      </map:transform>
+      <map:transform src="resources/stylesheets/strip_namespaces.xsl"/>
+     	<map:serialize type="xhtml"/>
+    </map:match>
+  
+  <map:match pattern="**.js">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**.css">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**images**">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**.png">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
-      <map:match pattern="**.ico">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+     <map:match pattern="**.ico">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
-    </map:pipeline>
-  </map:pipelines>
+  </map:pipeline>
+  
+</map:pipelines>
+
 </map:sitemap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.basic.css?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.basic.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.basic.css Fri Sep 30 04:09:55 2005
@@ -67,24 +67,7 @@
 .fixme .label {
   background: #C6C600;
 }
-note, .warning, .fixme {
-  border: solid black 1px;
-  margin: 1em 3em;
-}
 
-.note .label {
-  background: #369;
-  color: white;
-  font-weight: bold;
-  padding: 5px 10px;
-}
-.note .content {
-  background: #F0F0FF;
-  color: black;
-  line-height: 120%;
-  font-size: 90%;
-  padding: 5px 10px;
-}
 /**
  * Typography
  */

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.screen.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.screen.css?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.screen.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.screen.css Fri Sep 30 04:09:55 2005
@@ -609,7 +609,7 @@
 
 p.instruction {
   display: list-item;
-  list-style-image: url('images/instruction_arrow.png');
+  list-style-image: url('../images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
 } 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-breadcrumbs.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-breadcrumbs.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-breadcrumbs.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-breadcrumbs.ft Fri Sep 30 04:09:55 2005
@@ -22,17 +22,7 @@
   <description>
     branding-breadcrumbs will output the breadcrumbs.
   </description>
-  <usage><![CDATA[<forrest:contract name="branding-breadcrumbs">
-  <forrest:properties contract="branding-breadcrumbs">
-    <forrest:property name="branding-breadcrumbs">
-      <trail>
-        <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
-        <link2 name="Plugins" href="http://forrest.apache.org/docs/plugins/"/>
-        <link3 name="org.apache.forrest.plugin.output.viewHelper" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.viewHelper/"/>
-      </trail>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="branding-breadcrumbs"/>]]></usage>
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -41,28 +31,14 @@
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
         <xsl:template name="branding-breadcrumbs-body">
-          <xsl:param name="branding-breadcrumbs"/>
   <!--breadcrumbs org location-->
 <xsl:comment>+
     |breadtrail
     +</xsl:comment>
       <div class="breadtrail">
-        <xsl:if 
-          test="($branding-breadcrumbs/trail/link1/@name)and($branding-breadcrumbs/trail/link1/@name!='')">
-          <a href="{$branding-breadcrumbs/trail/link1/@href}">
-            <xsl:value-of select="$branding-breadcrumbs/trail/link1/@name"/>
-          </a>
-        </xsl:if>
-        <xsl:if 
-          test="($branding-breadcrumbs/trail/link2/@name)and($branding-breadcrumbs/trail/link2/@name!='')">
-           &gt; <a href="{$branding-breadcrumbs/trail/link2/@href}"> 
-          <xsl:value-of select="$branding-breadcrumbs/trail/link2/@name"/></a> 
-          </xsl:if>
-        <xsl:if 
-          test="($branding-breadcrumbs/trail/link3/@name)and($branding-breadcrumbs/trail/link3/@name!='')">
-           &gt; <a href="{$branding-breadcrumbs/trail/link3/@href}"> 
-          <xsl:value-of select="$branding-breadcrumbs/trail/link3/@name"/></a> 
-          </xsl:if>
+        <xsl:if test="(//skinconfig/trail/link1/@name)and(//skinconfig/trail/link1/@name!='')"><a href="{//skinconfig/trail/link1/@href}"><xsl:value-of select="//skinconfig/trail/link1/@name"/></a></xsl:if>
+        <xsl:if test="(//skinconfig/trail/link2/@name)and(//skinconfig/trail/link2/@name!='')"> &gt; <a href="{//skinconfig/trail/link2/@href}">  <xsl:value-of select="//skinconfig/trail/link2/@name"/></a> </xsl:if>
+        <xsl:if test="(//skinconfig/trail/link3/@name)and(//skinconfig/trail/link3/@name!='')"> &gt; <a href="{//skinconfig/trail/link3/@href}">  <xsl:value-of select="//skinconfig/trail/link3/@name"/></a> </xsl:if>
         <script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js">&#160;</script>
       </div>
         </xsl:template>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-grouplogo.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/branding-projectlogo.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft Fri Sep 30 04:09:55 2005
@@ -22,23 +22,19 @@
   <description>
     content-abstract will output the abstract of the content. 
   </description>
-  <usage><![CDATA[<forrest:contract name="content-abstract">
-  <forrest:properties contract="content-abstract">
-    <forrest:property name="content-abstract" nugget="get.body">
-      <url>#{$cocoon/parameters/getRequest}.abstract.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="content-abstract"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-abstract-body">
-        <xsl:param name="content-abstract"/>
-        <xsl:comment>+ |start content-abstract +</xsl:comment>
-        <xsl:copy-of 
-          select="$content-abstract/div[@class='abstract']"/>
-        <xsl:comment>+ |end content-abstract +</xsl:comment>
-      </xsl:template>
+	    <xsl:template name="content-abstract-body">
+	<xsl:comment>+
+	    |start content-abstract
+	    +</xsl:comment>
+			  <xsl:copy-of select="div[@id='content']/div[@class='abstract']"/>
+<xsl:comment>+
+    |end content-abstract
+    +</xsl:comment>
+		  </xsl:template>
 	  </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft Fri Sep 30 04:09:55 2005
@@ -22,23 +22,19 @@
   <description>
     content-main - Template will output the content-main.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main">
-  <forrest:properties contract="content-main">
-    <forrest:property name="content-main" nugget="get.body">
-      <url>#{$cocoon/parameters/getRequest}.body.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="content-main"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-main-body" >
-        <xsl:param name="content-main"/>
-        <xsl:comment>+ |start content-main +</xsl:comment>
-        <xsl:copy-of 
-          select="$content-main/div[@id='content']/div[@id='content-main']/*"/>
-        <xsl:comment>+ |end content-main +</xsl:comment>
-      </xsl:template>
+	    <xsl:template name="content-main-body" >
+	<xsl:comment>+
+	    |start content-main
+	    +</xsl:comment>
+			  <xsl:copy-of select="div[@id='content']/div[@id='content-main']/*"/>
+<xsl:comment>+
+    |end content-main
+    +</xsl:comment>
+		  </xsl:template>
 	  </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-minitoc.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-minitoc.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-minitoc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-minitoc.ft Fri Sep 30 04:09:55 2005
@@ -18,75 +18,54 @@
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-minitoc" type="nugget">
   <description>
-    content-minitoc - Configure the TOC, i.e. the Table of Contents.
-  @max-depth - 
-   how many "section" levels need to be included in the
-   generated Table of Contents (TOC). 
-  @min-sections - 
-   Minimum required to create a TOC.
-  @location ("page","menu","page,menu", "none") - 
-   Where to show the TOC.
+    content-minitoc - Template will output the mini-toc (toc-table of content). 
   </description>
-  <usage><![CDATA[<forrest:contract name="content-minitoc">
-  <forrest:properties contract="content-minitoc">
-    <forrest:property name="content-minitoc-toc" nugget="get.toc">
-      <url>#{$cocoon/parameters/getRequest}.toc.xml</url>
-    </forrest:property>
-    <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1" location="page"/>
-  </forrest:properties>
-</forrest:contract>]]></usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="content-minitoc" inputFormat="xsl" body="true" 
-    head="false">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <!--FIXME: that need come from the content-main-->
-      <xsl:template name="content-minitoc-body" 
-        match="div[@id='content']/div[@id='skinconf-toc-page']">
-        <xsl:param name="content-minitoc-toc"/>
-        <xsl:param name="content-minitoc-conf"/>
-        <xsl:comment>+ |start content-minitoc +</xsl:comment>
-        <xsl:if test="contains($content-minitoc-conf/toc/@location,'page')">
-          <xsl:if 
-            test="count($content-minitoc-toc/tocitems/tocitem) >= $content-minitoc-conf/toc/@min-sections">
-            <div id="content-minitoc-area">
-              <xsl:call-template name="content-minitoc-processing">
-                <xsl:with-param name="tocroot" 
-                  select="$content-minitoc-toc/tocitems"/>
-                <xsl:with-param name="content-minitoc-conf" 
-                  select="$content-minitoc-conf"/>
-              </xsl:call-template>
-            </div>
-          </xsl:if>
-        </xsl:if>
-        <xsl:comment>+ |end minitoc +</xsl:comment>
-      </xsl:template>
-      <xsl:template name="content-minitoc-processing">
-        <xsl:param name="tocroot"/>
-        <xsl:param name="content-minitoc-conf"/>
-        <xsl:if 
-          test="count($tocroot/tocitem) >= $content-minitoc-conf/toc/@min-sections">
-          <xsl:if test="contains($content-minitoc-conf/toc/@location,'page')">
-            <ul class="minitoc">
-              <xsl:for-each select="$tocroot/tocitem">
-                <li>
-                  <a href="{@href}"> 
-                    <xsl:value-of select="@title"/> 
-                  </a>
-                  <xsl:if 
-                    test="@level&#60;$content-minitoc-conf/toc/@max-depth+1">
-                    <xsl:call-template name="content-minitoc-processing">
-                      <xsl:with-param name="tocroot" select="."/>
-                      <xsl:with-param name="content-minitoc-conf" 
-                        select="$content-minitoc-conf"/>
-                    </xsl:call-template>
-                  </xsl:if>
-                </li>
-              </xsl:for-each>
-            </ul>
-          </xsl:if>
-        </xsl:if>
-      </xsl:template>
-    </xsl:stylesheet>
+  <usage><![CDATA[<forrest:contract name="content-minitoc"/>]]></usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="content-minitoc" inputFormat="xsl" body="true" head="false">
+     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	    <xsl:template name="content-minitoc-body" match="div[@id='content']/div[@id='skinconf-toc-page']">
+	<xsl:comment>+
+	    |start content-minitoc
+	    +</xsl:comment>
+		
+		    <xsl:if test="$config/toc">
+		      <xsl:if test="contains($minitoc-location,'page')">
+		        <xsl:if test="count(//tocitems/tocitem) >= $config/toc/@min-sections">
+					<div id="content-minitoc-area">
+		    			<xsl:call-template name="minitoc">
+		        		    <xsl:with-param name="tocroot" select="//tocitems"/>
+			          	</xsl:call-template>
+					</div>
+			    </xsl:if>
+		      </xsl:if>
+		    </xsl:if>
+ 
+<xsl:comment>+
+    |end minitoc
+    +</xsl:comment>
+		  </xsl:template>
+      <xsl:template name="minitoc">
+		    <xsl:param name="tocroot"/>
+		    <xsl:if test="count($tocroot/tocitem) >= $config/toc/@min-sections">
+		    <xsl:if test="contains($config/toc/@location,'page')">
+		      <ul class="minitoc">
+		        <xsl:for-each select="$tocroot/tocitem">
+		          <li>
+		            <a href="{@href}">
+		              <xsl:value-of select="@title"/>
+		            </a>
+		            <xsl:if test="@level&lt;//skinconfig/toc/@max-depth+1">
+		              <xsl:call-template name="minitoc">
+		                <xsl:with-param name="tocroot" select="."/>
+		              </xsl:call-template>
+		            </xsl:if>
+		          </li>
+		        </xsl:for-each>
+		      </ul>
+		    </xsl:if>
+		    </xsl:if>
+		  </xsl:template>
+	  </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-motd-page.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft Fri Sep 30 04:09:55 2005
@@ -22,24 +22,19 @@
   <description>
     content-title - Template will output the title (first h1 of the content). 
   </description>
-  <usage><![CDATA[<forrest:contract name="content-title">
-  <forrest:properties contract="content-title">
-    <forrest:property name="content-title" nugget="get.body">
-      <url>#{$cocoon/parameters/getRequest}.body.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="content-title"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="xhtml" name="content-title" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-title-body" 
-        match="div[@id='content']/h1[position()=1]">
-        <xsl:param name="content-title"/>
-        <xsl:comment>+ |start content-title +</xsl:comment>
-        <xsl:copy-of 
-          select="$content-title/div[@id='content']/h1[position()=1]"/>
-        <xsl:comment>+ |end content-title +</xsl:comment>
-      </xsl:template>
+	    <xsl:template name="content-title-body" match="div[@id='content']/h1[position()=1]">
+	<xsl:comment>+
+	    |start content-title
+	    +</xsl:comment>
+			  <xsl:copy-of select="div[@id='content']/h1[position()=1]"/>
+<xsl:comment>+
+    |end content-title
+    +</xsl:comment>
+		  </xsl:template>
 	  </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft Fri Sep 30 04:09:55 2005
@@ -20,21 +20,14 @@
   <description>
     nav-main-sub will output the secondary navigation AKA level2.
   </description>
-  <usage><![CDATA[<forrest:contract name="nav-main-sub">
-  <forrest:properties contract="nav-main-sub">
-    <forrest:property name="nav-main-sub" nugget="get.navigation">
-      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="nav-main-sub"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="xhtml" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-sub-body">
-        <xsl:param name="nav-main-sub" select="'test'"/>
-		     <xsl:apply-templates select="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*"/>
+		     <xsl:apply-templates select="div[@id='nav-main-sub']/*"/>
 		  </xsl:template>
 		</xsl:stylesheet>
 	</forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft Fri Sep 30 04:09:55 2005
@@ -20,25 +20,18 @@
   <description>
     nav-main will output the main or primary navigation AKA tabs.
   </description>
-  <usage><![CDATA[<forrest:contract name="nav-main">
-  <forrest:properties contract="nav-main">
-    <forrest:property name="nav-main" nugget="get.navigation">
-      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="nav-main"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="xhtml" name="nav-main" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-body">
-        <xsl:param name="nav-main" select="'test'"/>
-		    <div id="tabs">
+		     <div id="tabs">
 <xsl:comment>+
     |start Tabs
     +</xsl:comment>
-                <xsl:apply-templates select="$nav-main/navigation/tab/ul[@id='nav-main']"/>       
+                <xsl:apply-templates select="ul[@id='nav-main']"/>       
 <xsl:comment>+
     |end Tabs
     +</xsl:comment>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-section.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-section.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-section.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-section.ft Fri Sep 30 04:09:55 2005
@@ -20,13 +20,7 @@
   <description>
     nav-section will output the navigation to pages within the current site section AKA menu
   </description>
-  <usage><![CDATA[<forrest:contract name="nav-section">
-  <forrest:properties contract="nav-section">
-    <forrest:property name="nav-section" nugget="get.navigation">
-      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="nav-section"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="xhtml" name="nav-section" inputFormat="xsl" body="true" head="false">
@@ -34,28 +28,24 @@
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  
 		  <xsl:template name="nav-section-body">
-        <xsl:param name="nav-section" select="'test'"/>
 <xsl:comment>+
     |start menu
     +</xsl:comment>
-            <xsl:if test="$nav-section/navigation/menu/div[@id='menu']/ul/li">
-              <xsl:call-template name="menu">
-                <xsl:with-param name="root" select="$nav-section/navigation/menu"/>
-              </xsl:call-template>
+            <xsl:if test="div[@id='menu']/ul/li">
+              <xsl:call-template name="menu"/>
             </xsl:if>
 <xsl:comment>+
     |end menu
     +</xsl:comment>
 		  </xsl:template>
       <xsl:template name="menu">
-        <xsl:param name="root" value="'test'"/>
 <xsl:comment>+
     |start Menu
     +</xsl:comment>
    	<div id="nav-section">
 			<ul>
 <!--menu - inner-->	
-        <xsl:for-each select = "$root/div[@id='menu']/ul/li">
+        <xsl:for-each select = "div[@id='menu']/ul/li">
           <xsl:call-template name = "innermenuli" >
               <xsl:with-param name="id" select="concat('1.', position())"/>
           </xsl:call-template>
@@ -96,10 +86,10 @@
                         <div class="menupageitem">
                           <xsl:choose>
                             <xsl:when test="string-length(@title)>15">
-                              <a href="{@href}" title="{normalize-space(@title)}"><xsl:value-of select="substring(normalize-space(@title),0,20)" />...</a>
+                              <a href="{@href}" title="{@title}"><xsl:value-of select="substring(@title,0,20)" />...</a>
                             </xsl:when>
                             <xsl:otherwise>
-                              <a href="{@href}" title="{normalize-space(@title)}"><xsl:value-of select="normalize-space(@title)" /></a>
+                              <a href="{@href}"><xsl:value-of select="@title" /></a>
                             </xsl:otherwise>
                           </xsl:choose>
                         </div>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/noFt.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/noFt.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/noFt.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/noFt.ft Fri Sep 30 04:09:55 2005
@@ -15,22 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0" 
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="noFt" type="nugget">
-  <description> 
-    <p>Error 440<br/> Template not found. This functions is a fallback 
-    when no ft is found. This is just a dummy, it will output *nothing*.</p>
+  <description>
+    Error 440 - Template not found. This functions is a fallback when no ft is found. 
+    This is just a dummy, it will output *nothing*.
   </description>
   <usage><![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]></usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="noFt" inputFormat="xsl" body="true" head="true" 
-    css="false">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="noFt-head"> Error 440 - Template not found. 
-        </xsl:template>
-      <xsl:template name="noFt-body"> Error 440 - Template not found. 
-        </xsl:template>
-    </xsl:stylesheet>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="noFt" inputFormat="xsl" body="false" head="false" css="false">
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-abstract.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-abstract.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-abstract.ft Fri Sep 30 04:09:55 2005
@@ -22,31 +22,22 @@
   <description>
     content-abstract will output the abstract of the content. 
   </description>
-  <usage><![CDATA[<forrest:contract name="content-abstract">
-  <forrest:properties contract="content-abstract">
-    <forrest:property name="content-abstract" nugget="get.abstract">
-      <url>#{$cocoon/parameters/getRequest}.abstract.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="content-abstract"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-abstract-body">
-        <xsl:param name="content-abstract"/>
+	    <xsl:template name="content-abstract-body">
 <xsl:comment>+
-      |start content-abstract
-      +</xsl:comment>
+	    |start content-abstract
+	    +</xsl:comment>
             <!-- FIXME - Suppress the following test when empty div problem is solved -->
-        <xsl:if 
-          test="normalize-space($content-abstract/div[@class='abstract'])">
-          <xsl:copy-of 
-            select="$content-abstract/div[@class='abstract']"/>
-        </xsl:if>
+		    <xsl:if test="normalize-space(div[@id='content']/div[@class='abstract'])">
+		      <xsl:copy-of select="div[@id='content']/div[@class='abstract']"/>
+	      </xsl:if>
 <xsl:comment>+
     |end content-abstract
     +</xsl:comment>
-      </xsl:template>
-    </xsl:stylesheet>
+		  </xsl:template>
+	  </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-main.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-main.ft Fri Sep 30 04:09:55 2005
@@ -20,42 +20,28 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-main" type="nugget">
   <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>
+    content-main - Template will output the content-main.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main">
-  <forrest:properties contract="content-main">
-    <forrest:property name="content-main" nugget="get.body">
-      <url>#{$cocoon/parameters/getRequest}.body.xml</url>
-    </forrest:property>
-    <forrest:property name="content-main-conf">
-      <headings type="boxed"/>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="content-main"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="content-main-body" >
-        <xsl:param name="content-main"/>
-        <xsl:param name="content-main-conf"/>
-        <xsl:comment>+ |start content-main +</xsl:comment>
-        <xsl:apply-templates 
-          select="$content-main/div[@id='content']/div[@id='content-main']/*">
-          <xsl:with-param name="content-main-conf" 
-                  select="$content-main-conf"/>
-        </xsl:apply-templates>
-        <xsl:comment>+ |end content-main +</xsl:comment>
-      </xsl:template>
+	    <xsl:template name="content-main-body" >
+	<xsl:comment>+
+	    |start content-main
+	    +</xsl:comment>
+      <xsl:apply-templates select="div[@id='content']/div[@id='content-main']/*"/>
+<xsl:comment>+
+    |end content-main
+    +</xsl:comment>
+		  </xsl:template>
 		  <!--headings-->
       <xsl:template match="div[@class = 'skinconf-heading-1']">
-        <xsl:param name="content-main-conf"/>
        <xsl:choose>
-         <xsl:when test="$content-main-conf/headings/@type='underlined'">
+         <xsl:when test="//skinconfig/headings/@type='underlined'">
          	<h2 class="underlined_10"><xsl:value-of select="h1"/></h2>
          </xsl:when>
-         <xsl:when test="$content-main-conf/headings/@type='boxed'">
+         <xsl:when test="//skinconfig/headings/@type='boxed'">
    	       <h2 class="boxed"><xsl:value-of select="h1"/></h2>
          </xsl:when>
          <xsl:otherwise>
@@ -63,6 +49,7 @@
          </xsl:otherwise>
        </xsl:choose>
      </xsl:template>
+     <xsl:template match="div[@id = 'skinconf-toc-page']"/>
 	  </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-motd-page.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/content-motd-page.ft
------------------------------------------------------------------------------
    svn:keywords = Id svn:eol-style=native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/hr.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/hr.ft
------------------------------------------------------------------------------
    svn:keywords = Id svn:eol-style=native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-main-sub.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-main-sub.ft Fri Sep 30 04:09:55 2005
@@ -20,28 +20,20 @@
   <description>
     nav-main-sub will output the secondary navigation AKA level2.
   </description>
-  <usage><![CDATA[<forrest:contract name="nav-main-sub">
-  <forrest:properties contract="nav-main-sub">
-    <forrest:property name="nav-main-sub" nugget="get.navigation">
-      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="nav-main-sub"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="xhtml" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-sub-body">
-        <xsl:param name="nav-main-sub" select="'test'"/>
         <xsl:comment>+
     |start nav-main-sub
     +</xsl:comment>
     <!-- FIXME - Suppress the following test when empty div problem is solved -->
-  <xsl:if test="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*">
+  <xsl:if test="div[@id='nav-main-sub']/*">
     <div id="level2tabs">
-      <xsl:apply-templates 
-        select="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*"/>
+    <xsl:apply-templates select="div[@id='nav-main-sub']/*"/>
     </div>
   </xsl:if>
   <xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-section.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-section.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-section.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-section.ft Fri Sep 30 04:09:55 2005
@@ -20,13 +20,7 @@
   <description>
     nav-section will output the navigation to pages within the current site section AKA menu
   </description>
-  <usage><![CDATA[<forrest:contract name="nav-section">
-  <forrest:properties contract="nav-section">
-    <forrest:property name="nav-section" nugget="get.navigation">
-      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="nav-section"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="xhtml" name="nav-section" inputFormat="xsl" body="true" head="true">
@@ -38,28 +32,24 @@
 		  </xsl:template>
       
 		  <xsl:template name="nav-section-body">
-        <xsl:param name="nav-section" select="'test'"/>
 <xsl:comment>+
     |start menu
     +</xsl:comment>
-            <xsl:if test="$nav-section/navigation/menu/div[@id='menu']/ul/li">
-              <xsl:call-template name="menu">
-                <xsl:with-param name="root" select="$nav-section/navigation/menu"/>
-              </xsl:call-template>
+            <xsl:if test="div[@id='menu']/ul/li">
+              <xsl:call-template name="menu"/>
             </xsl:if>
 <xsl:comment>+
     |end menu
     +</xsl:comment>
 		  </xsl:template>
       <xsl:template name="menu">
-        <xsl:param name="root" value="'test'"/>
 <xsl:comment>+
     |start Menu
     +</xsl:comment>
    	<div id="nav-section">
 			<ul>
 <!--menu - inner-->	
-        <xsl:for-each select = "$root/div[@id='menu']/ul/li">
+        <xsl:for-each select = "div[@id='menu']/ul/li">
           <xsl:call-template name = "innermenuli" >
               <xsl:with-param name="id" select="concat('1.', position())"/>
           </xsl:call-template>
@@ -99,12 +89,12 @@
                       <xsl:for-each select = "//tocitems/tocitem">
                         <div class="menupageitem">
                           <xsl:choose>
-                            <xsl:when test="string-length(normalize-space(@title))>15">
-                              <a href="{@href}" title="{normalize-space(@title)}"><xsl:value-of 
+                            <xsl:when test="string-length(@title)>15">
+                              <a href="{@href}" title="{@title}"><xsl:value-of 
                                 select="substring(@title,0,20)" />...</a>
                             </xsl:when>
                             <xsl:otherwise>
-                              <a href="{@href}" title="{normalize-space(@title)}">
+                              <a href="{@href}">
                                 <xsl:value-of select="@title" />
                               </a>
                             </xsl:otherwise>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/search-input.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/search-input.ft Fri Sep 30 04:09:55 2005
@@ -23,9 +23,6 @@
   <usage><![CDATA[<forrest:contract name="search-input">
   <forrest:properties contract="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:properties>]
 </forrest:contract>]]></usage>
   
@@ -43,7 +40,6 @@
 
       <xsl:template name="search-input-body">
         <xsl:param name="input-size">25</xsl:param>
-        <xsl:param name="search-input"/>
 <xsl:comment>+ 
   |start Search 
   +</xsl:comment>
@@ -54,12 +50,12 @@
                 <!-- Form prompt -->
                 <xsl:variable name="search-prompt">
                   <i18n:text>Search the site with</i18n:text>
-                  <xsl:value-of select="$search-input/search/@provider"/>
+                  <xsl:value-of select="$config/search/@provider"/>
                 </xsl:variable>
                 <!-- Form action -->
                 <xsl:variable name="search-action">
                   <xsl:choose>
-                    <xsl:when test="$search-input/search/@provider = 'lucene'">
+                    <xsl:when test="$config/search/@provider = 'lucene'">
                       <xsl:value-of select="$root"/>
                       <xsl:value-of select="$lucene-search"/>
                     </xsl:when>
@@ -69,7 +65,7 @@
                 <!-- Form query field -->
                 <xsl:variable name="search-query">
                   <xsl:choose>
-                    <xsl:when test="$search-input/search/@provider = 'lucene'">
+                    <xsl:when test="$config/search/@provider = 'lucene'">
                       queryString</xsl:when>
                     <xsl:otherwise>q</xsl:otherwise>
                   </xsl:choose>
@@ -78,7 +74,7 @@
                 <form method="get" action="{$search-action}">
                   <div class="search-hidden">
                     <input type="hidden" name="sitesearch" 
-                      value="{$search-input/search/@domain}"/>
+                      value="{$config/search/@domain}"/>
                   </div>
                   <div class="search-field">
                     <input type="text" name="{$search-query}" 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/siteinfo-credits.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/siteinfo-credits.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/siteinfo-credits.ft Fri Sep 30 04:09:55 2005
@@ -15,71 +15,62 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  name="siteinfo-credits" type="nugget">
-  <description> siteinfo-credits - Template will output the siteinfo-credits 
-    with pelt look'n feel. </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-credits">
+<forrest:contract 
+   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+   xmlns:forrest="http://apache.org/forrest/templates/1.0"
+   name="siteinfo-credits" type="nugget">
+   <description>
+     siteinfo-credits - Template will output the siteinfo-credits with pelt look'n feel.
+   </description>
+   <usage><![CDATA[<forrest:contract name="siteinfo-credits">
    [<forrest:properties contract="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>
-     <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:properties>]
  </forrest:contract>]]></usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="siteinfo-credits" inputFormat="xsl" body="true" 
-    head="false">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="siteinfo-credits-body">
-        <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:comment> |start siteinfo-credits </xsl:comment>
-        <div id="{$box-location}">
-          <xsl:if test="$top-separator = 'true'">
-            <hr/>
-          </xsl:if>
-          <xsl:for-each 
-            select="$siteinfo-credits/credits/credit[not(@role='pdf')]">
-            <xsl:variable name="name" select="name"/>
-            <xsl:variable name="url" select="url"/>
-            <xsl:variable name="image" select="image"/>
-            <xsl:variable name="width" select="width"/>
-            <xsl:variable name="height" select="height"/>
-            <a href="{$url}">
-              <img alt="{$name} - logo" title="{$name}" border="0">
-                <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>
-          <xsl:comment>+ |end siteinfo-credits +</xsl:comment>
-        </div>
-      </xsl:template>
-    </xsl:stylesheet>
+   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+     format="xhtml" name="siteinfo-credits" inputFormat="xsl" body="true" head="false">
+      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        <xsl:template name="siteinfo-credits-body">
+          <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:if test="$config/credits/credit[@box-location = $box-location]">
+ <xsl:comment> 
+     |start siteinfo-credits
+      </xsl:comment>
+     <div id="{$box-location}">
+       <xsl:if test="$top-separator = 'true'">
+         <hr/>
+       </xsl:if>
+   <xsl:for-each select="$config/credits/credit[not(@role='pdf') and @box-location = $box-location]">
+     <!-- xsl:if test="@box-location = $box-location" -->
+     <xsl:variable name="name" select="name"/>
+     <xsl:variable name="url" select="url"/>
+     <xsl:variable name="image" select="image"/>
+     <xsl:variable name="width" select="width"/>
+     <xsl:variable name="height" select="height"/>
+     <a href="{$url}">
+       <img alt="{$name} - logo" title="{$name}" border="0">
+         <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:if -->
+   </xsl:for-each>
+ <xsl:comment>+
+ |end siteinfo-credits
+ +</xsl:comment>
+ </div>
+ </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.plugin.output.viewHelper.xhtml/resources/templates/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/search-input.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/search-input.ft Fri Sep 30 04:09:55 2005
@@ -18,18 +18,9 @@
 <forrest:contract name="search-input" type="nugget"
   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>
+    search-input will output the default search form.
   </description>
-  <usage><![CDATA[<forrest:contract name="search-input">
-  <forrest:properties contract="search-input">
-    <forrest:property name="search-input">
-      <search name="MyProject" domain="mydomain" provider="google"/>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+  <usage><![CDATA[<forrest:contract name="search-input"/>]]></usage>
   
   <forrest:template
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
@@ -40,20 +31,17 @@
 		  <!--FIXME: IMO each search provider should provide a form. This form should be refactored into
         a meta-search from-->
 		  <xsl:template name="search-input-body">
-        <xsl:param name="search-input"/>
 <xsl:comment>+
     |start Search
     +</xsl:comment> 
            <div class="search-input">
              <xsl:choose>
-              <xsl:when test="$search-input/search/@provider = 'lucene'">
+              <xsl:when test="$config/search/@provider = 'lucene'">
                 <!-- Lucene search -->
                 <form method="get" action="{$root}{$lucene-search}">
-                  <div id="search-field"> <input type="text" id="query" 
-                    name="queryString" size="25" 
-                    value="Search the site with {$search-input/search/@provider}:" 
-                    onFocus="getBlank (this, 'Search the site with {$search-input/search/@provider}:');"/> 
-                    &#160;</div>
+                  <div id="search-field">
+                   <input type="text" id="query" name="queryString" size="25" value="Search the site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with {$config/search/@provider}:');"/>
+									  &#160;</div>
 							      <div id="search-submit">
 										  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
 						      </div>
@@ -61,10 +49,9 @@
      					</xsl:when>
       				<xsl:otherwise>
               	<form method="get" action="http://www.google.com/search"> 
-                  <div id="search-hidden">
-                    <input type="hidden" name="sitesearch" 
-                      value="{$search-input/search/@domain}"/>
-                  </div>
+	            		<div id="search-hidden">
+	                	<input type="hidden" name="sitesearch" value="{$config/search/@domain}"/> 
+	              	</div>
 	              	<div id="search-field">
 	                  <input type="text" id="query" name="q" size="25"/>
 	              	</div>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-credits.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-credits.ft?rev=292707&r1=292706&r2=292707&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-credits.ft Fri Sep 30 04:09:55 2005
@@ -15,53 +15,39 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  name="siteinfo-credits" type="nugget">
-  <description>
-    <p> Output the credits.<br/>Credits are typically rendered as a set of 
-      small clickable images in the page footer. </p>
-  </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-credits">
-  <forrest:properties contract="siteinfo-credits">
-    <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:properties>
-</forrest:contract>]]></usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="siteinfo-credits" inputFormat="xsl" body="true" 
-    head="false">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="siteinfo-credits-body">
-        <xsl:param name="siteinfo-credits"/>
-        <xsl:if test="$siteinfo-credits/credits">
-          <div id="credits">
-            <xsl:for-each 
-              select="$siteinfo-credits/credits/credit[not(@role='pdf')]">
-              <div class="credit">
-                <xsl:call-template name="renderlogo">
-                  <xsl:with-param name="name" select="name"/>
-                  <xsl:with-param name="url" select="url"/>
-                  <xsl:with-param name="logo" select="image"/>
-                  <xsl:with-param name="root" select="$root"/>
-                  <xsl:with-param name="width" select="width"/>
-                  <xsl:with-param name="height" select="height"/>
-                </xsl:call-template>
-              </div>
-            </xsl:for-each>
-          </div>
-        </xsl:if>
-      </xsl:template>
-    </xsl:stylesheet>
-  </forrest:template>
-</forrest:contract>
\ No newline at end of file
+<forrest:contract 
+    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+    xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    name="siteinfo-credits" type="nugget">
+
+    <description>
+      Output the credits. Currently the credits are read from skinconf.xml,
+      but this will likely change in near future.
+    </description>
+
+    <usage><![CDATA[<forrest:contract name="siteinfo-credits"/>]]></usage>
+    <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+        format="xhtml" name="siteinfo-credits" inputFormat="xsl" body="true" head="false">
+        <xsl:stylesheet version="1.1" 
+            xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+            <xsl:template name="siteinfo-credits-body">
+                <div id="credits">
+                    <xsl:if test="$config/credits">
+                        <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+                            <div class="credit">
+                                <xsl:call-template name="renderlogo">
+                                    <xsl:with-param name="name" select="name"/>
+                                    <xsl:with-param name="url" select="url"/>
+                                    <xsl:with-param name="logo" select="image"/>
+                                    <xsl:with-param name="root" select="$root"/>
+                                    <xsl:with-param name="width" select="width"/>
+                                    <xsl:with-param name="height" select="height"/>
+                                </xsl:call-template>
+                            </div>
+                        </xsl:for-each>
+                    </xsl:if>
+                </div>
+            </xsl:template>
+        </xsl:stylesheet>
+    </forrest:template>
+</forrest:contract>



Mime
View raw message