forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r290290 - in /forrest/trunk/whiteboard/plugins: org.apache.forrest.plugin.internal.view/ org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/ org.apache.forrest.plugin.internal.view/resources/stylesheets/html/ org...
Date Mon, 19 Sep 2005 22:20:52 GMT
Author: thorsten
Date: Mon Sep 19 15:20:29 2005
New Revision: 290290

URL: http://svn.apache.org/viewcvs?rev=290290&view=rev
Log:
Fixed jxpath expression in nugget contracts. Added matches to refactor the *.page match. Refactored
the minitoc contract to request the toc via a 
business helper. Updated pelt contract and synced reason change to default.

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/html/document2toc.xsl
  (with props)
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/document2html.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/pelt.fv
    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/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/pelt/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pelt/nav-section.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap?rev=290290&r1=290289&r2=290290&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
Mon Sep 19 15:20:29 2005
@@ -84,9 +84,10 @@
   <map:resources>
     <map:resource name="skinit">
       <map:select type="exists">
-        <map:when test="{project:skins-dir}/xslt/html/{type}.xsl">
+        <map:when 
+          test="{project:skins-dir}{project:theme}/xslt/html/{type}.xsl">
           <map:transform 
-            src="{project:skins-dir}{forrest:skin}/xslt/html/{type}.xsl">
+            src="{project:skins-dir}{project:theme}/xslt/html/{type}.xsl">
             <map:parameter name="notoc" value="{notoc}"/>
             <!-- FIXME: do we need this anymore? -->
             <!-- For backwards-compat with 0.2 - 0.4 skins -->
@@ -243,9 +244,7 @@
       <map:match pattern="*.page">
         <map:aggregate element="site">
           <map:part src="cocoon://skinconf.xml"/>
-          <!--<map:part src="cocoon://tab-{1}.html"/>
-        <map:part src="cocoon://menu-{1}.html"/>-->
-          <map:part src="cocoon://body-{1}.html"/>
+          <map:part src="cocoon:/{1}.body.xml"/>
           <map:part src="cocoon:/prepare.view-nugget.{1}"/>
         </map:aggregate>
         <map:serialize/>
@@ -253,9 +252,7 @@
       <map:match pattern="**/*.page">
         <map:aggregate element="site">
           <map:part src="cocoon://skinconf.xml"/>
-          <!--<map:part src="cocoon://{1}/tab-{2}.html"/>
-        <map:part src="cocoon://{1}/menu-{2}.html"/>-->
-          <map:part src="cocoon://{1}/body-{2}.html"/>
+          <map:part src="cocoon:/{1}{2}.body.xml"/>
           <map:part src="cocoon:/prepare.view-nugget.{1}/{2}"/>
         </map:aggregate>
         <map:serialize/>
@@ -265,6 +262,48 @@
   2. businessHelper
   -->
     <map:pipeline>
+      <map:match pattern="**body.html">
+        <map:select type="exists">
+          <map:when test="{project:content.xdocs}{1}{2}.ehtml">
+            <map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
+            <map:transform src="{forrest:stylesheets}/html2htmlbody.xsl" />
+            <map:transform type="linkrewriter" 
+              src="cocoon:/{1}linkmap-{2}.html"/>
+            <map:transform 
+              src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+            <map:serialize/>
+          </map:when>
+        </map:select>
+      </map:match>
+      <!--intermediate format link rewritten-->
+      <map:match pattern="**.source.rewritten.xml">
+        <map:generate src="cocoon://{1}{2}.xml"/>
+        <map:transform type="idgen"/>
+        <map:transform type="xinclude"/>
+        <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
+        <map:transform 
+          src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+        <map:serialize/>
+      </map:match>
+      <!-- (HTML rendered from intermediate format -->
+      <map:match pattern="**.body.xml">
+        <map:generate src="cocoon:/{1}{2}.source.rewritten.xml"/>
+        <map:call resource="skinit">
+          <map:parameter name="type" value="document2html"/>
+          <map:parameter name="path" value="{1}{2}.html"/>
+          <map:parameter name="notoc" value="false"/>
+        </map:call>
+      </map:match>
+      <!--TOC from source.rewritten-->
+      <map:match pattern="**.toc.xml">
+        <map:generate src="cocoon:/{1}{2}.source.rewritten.xml"/>
+        <map:call resource="skinit">
+          <map:parameter name="type" value="document2toc"/>
+          <map:parameter name="path" value="{1}{2}.html"/>
+          <map:parameter name="notoc" value="false"/>
+        </map:call>
+      </map:match>
+      <!--navigation for the current request -->
       <map:match pattern="*.navigation.xml">
         <map:aggregate element="navigation">
           <map:part src="cocoon:/tab-{1}.html" element="tab"/>
@@ -279,13 +318,13 @@
         </map:aggregate>
         <map:serialize/>
       </map:match>
+      <!--navigation for the current request PART menu-->
       <map:match pattern="**book-*.html">
         <map:mount uri-prefix="" src="menu.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**menu-*.html">
         <map:generate src="cocoon:/{1}book-{2}.html"/>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <!--<map:serialize/>-->
         <map:transform 
           src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
         <map:call resource="skinit">
@@ -293,6 +332,7 @@
           <map:parameter name="path" value="{1}{2}.html"/>
         </map:call>
       </map:match>
+      <!--navigation for the current request PART tab-->
       <map:match pattern="**tab-*.html">
         <map:mount uri-prefix="" src="tabs.xmap" check-reload="yes" />
       </map:match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/document2html.xsl?rev=290290&r1=290289&r2=290290&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/document2html.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/document2html.xsl
Mon Sep 19 15:20:29 2005
@@ -335,34 +335,6 @@
     </xsl:choose>
   </xsl:template>
 
-  <!--  Templates for "toc" mode.  This will generate a complete
-        Table of Contents for the document.  This will then be used
-        by the site2xhtml to generate a Menu ToC and a Page ToC -->
-
-  <xsl:template match="document" mode="toc">
-    <xsl:apply-templates mode="toc"/>
-  </xsl:template>
-
-  <xsl:template match="body" mode="toc">
-    <tocitems>
-      <xsl:apply-templates select="section" mode="toc">
-        <xsl:with-param name="level" select="1"/>
-      </xsl:apply-templates>
-    </tocitems>
-  </xsl:template>
-
-  <xsl:template match="section" mode="toc">
-    <xsl:param name="level"/>
-
-    <tocitem level="{$level}">
-      <xsl:attribute name="href">#<xsl:call-template name="generate-id"/></xsl:attribute>
-      <xsl:attribute name="title"><xsl:value-of select="title"/></xsl:attribute>
-      <xsl:apply-templates mode="toc">
-        <xsl:with-param name="level" select="$level+1"/>
-      </xsl:apply-templates>
-    </tocitem>
-  </xsl:template>
-
   <xsl:template match="node()|@*" mode="toc"/>
 
   <!-- End of "toc" mode templates -->

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/html/document2toc.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/html/document2toc.xsl?rev=290290&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/html/document2toc.xsl
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/html/document2toc.xsl
Mon Sep 19 15:20:29 2005
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2005 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
+
+  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.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+This stylesheet contains templates for converting documentv11 to HTML.  See the
+imported document2html.xsl for details.
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!--  Templates for "toc" mode.  This will generate a complete
+        Table of Contents for the document.  This will then be used
+        by the site2xhtml to generate a Menu ToC and a Page ToC -->
+  
+  <xsl:template match="document">
+    <xsl:apply-templates mode="toc"/>
+  </xsl:template>
+  <xsl:template match="body" mode="toc">
+    <tocitems>
+      <xsl:apply-templates select="section" mode="toc">
+        <xsl:with-param name="level" select="1"/>
+      </xsl:apply-templates>
+    </tocitems>
+  </xsl:template>
+  <xsl:template match="section" mode="toc">
+    <xsl:param name="level"/>
+    <tocitem level="{$level}">
+      <xsl:attribute name="href">#<xsl:call-template 
+        name="generate-id"/></xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:value-of select="title"/>
+      </xsl:attribute>
+      <xsl:apply-templates mode="toc">
+        <xsl:with-param name="level" select="$level+1"/>
+      </xsl:apply-templates>
+    </tocitem>
+  </xsl:template>
+  <xsl:template name="generate-id">
+    <xsl:choose>
+      <xsl:when test="@id">
+        <xsl:value-of select="@id"/>
+      </xsl:when>
+      <xsl:when test="@title">
+        <xsl:value-of select="@title"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="generate-id(.)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="node()|@*" mode="toc"/>
+</xsl:stylesheet>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/html/document2toc.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv?rev=290290&r1=290289&r2=290290&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
Mon Sep 19 15:20:29 2005
@@ -78,7 +78,17 @@
         <forrest:hook name="content">
           <forrest:contract name="content-title"/>
           <forrest:contract name="content-abstract"/>
-          <forrest:contract name="content-minitoc"/>
+          <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" >
+                <toc max-depth="2" 
+                min-sections="1" location="page"/>
+              </forrest:property>
+            </forrest:properties>
+					</forrest:contract>
           <forrest:contract name="content-main"/>
         </forrest:hook>
       </forrest:hook>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/pelt.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/pelt.fv?rev=290290&r1=290289&r2=290290&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/pelt.fv
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/pelt.fv
Mon Sep 19 15:20:29 2005
@@ -163,7 +163,17 @@
           <forrest:contract name="content-title"/>
           <forrest:contract name="content-abstract"/>
           <forrest:contract name="content-motd-page"/>
-          <forrest:contract name="content-minitoc"/>
+          <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" >
+                <toc max-depth="2" 
+                min-sections="1" location="page"/>
+              </forrest:property>
+            </forrest:properties>
+					</forrest:contract>
           <forrest:contract name="content-main"/>
           <forrest:contract name="content-author"/>
         </forrest:hook>

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=290290&r1=290289&r2=290290&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
Mon Sep 19 15:20:29 2005
@@ -18,54 +18,75 @@
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-minitoc" type="nugget">
   <description>
-    content-minitoc - Template will output the mini-toc (toc-table of content). 
+    content-minitoc - Configure the TOC, i.e. the Table of Contents.
+  @max-depth - 
+   how many "section" levels need to be included in the
+   generated Table of Contents (TOC). 
+  @min-sections - 
+   Minimum required to create a TOC.
+  @location ("page","menu","page,menu", "none") - 
+   Where to show the TOC.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-minitoc"/>]]></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>
+  <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>
   </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=290290&r1=290289&r2=290290&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
Mon Sep 19 15:20:29 2005
@@ -23,7 +23,7 @@
   <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.request}.navigation.xml</url>
+      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]></usage>

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=290290&r1=290289&r2=290290&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
Mon Sep 19 15:20:29 2005
@@ -23,7 +23,7 @@
   <usage><![CDATA[<forrest:contract name="nav-main">
   <forrest:properties contract="nav-main">
     <forrest:property name="nav-main" nugget="get.navigation">
-      <url>${cocoon.parameters.request}.navigation.xml</url>
+      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]></usage>

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=290290&r1=290289&r2=290290&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
Mon Sep 19 15:20:29 2005
@@ -23,7 +23,7 @@
   <usage><![CDATA[<forrest:contract name="nav-section">
   <forrest:properties contract="nav-section">
     <forrest:property name="nav-section" nugget="get.navigation">
-      <url>${cocoon.parameters.request}.navigation.xml</url>
+      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]></usage>

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=290290&r1=290289&r2=290290&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
Mon Sep 19 15:20:29 2005
@@ -23,7 +23,7 @@
   <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.request}.navigation.xml</url>
+      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]></usage>

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=290290&r1=290289&r2=290290&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
Mon Sep 19 15:20:29 2005
@@ -23,7 +23,7 @@
   <usage><![CDATA[<forrest:contract name="nav-section">
   <forrest:properties contract="nav-section">
     <forrest:property name="nav-section" nugget="get.navigation">
-      <url>${cocoon.parameters.request}.navigation.xml</url>
+      <url>#{$cocoon/parameters/getRequest}.navigation.xml</url>
     </forrest:property>
   </forrest:properties>
 </forrest:contract>]]></usage>



Mime
View raw message