Return-Path: 
 <svn-return-4744-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 70550 invoked from network); 13 Jan 2006 16:21:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 13 Jan 2006 16:21:47 -0000
Received: (qmail 75729 invoked by uid 500); 13 Jan 2006 16:21:45 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 75690 invoked by uid 500); 13 Jan 2006 16:21:45 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 75679 invoked by uid 99); 13 Jan 2006 16:21:45 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jan 2006 08:21:45 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 13 Jan 2006 08:21:44 -0800
Received: (qmail 69821 invoked by uid 65534); 13 Jan 2006 16:21:24 -0000
Message-ID: <20060113162124.69820.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r368773 - in
 /forrest/trunk/main/template-sites/v3/src/documentation/resources/themes:
 pelt.fv pelt/html/nav-main-sub.ft
Date: Fri, 13 Jan 2006 16:21:22 -0000
To: svn@forrest.apache.org
From: cdupoirieux@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cdupoirieux
Date: Fri Jan 13 08:21:16 2006
New Revision: 368773

URL: http://svn.apache.org/viewcvs?rev=368773&view=rev
Log:
nav-main-sub.ft and nav-section fore pelt...

Added:
    forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/nav-main-sub.ft
      - copied, changed from r368658, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft
Modified:
    forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv

Modified: forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv?rev=368773&r1=368772&r2=368773&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv (original)
+++ forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv Fri Jan 13 08:21:16 2006
@@ -301,19 +301,19 @@
             </trail>
           </forrest:property>
         </forrest:contract>
-        <!--
+
         <forrest:hook name="leftbar">
           <forrest:contract name="nav-section">
-            <forrest:properties contract="nav-section">
               <forrest:property name="nav-section" nugget="get.navigation">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
               </forrest:property>
               <forrest:property name="nav-section-toc" nugget="get.tov">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
               </forrest:property>
+              <forrest:property name="expanding">true</forrest:property>
               <forrest:property name="toc" max-depth="2"/>
-            </forrest:properties>
           </forrest:contract>
+          <!--
           <forrest:contract name="genericMarkup">
             <forrest:properties contract="genericMarkup">
               <forrest:property name="genericMarkup">
@@ -376,7 +376,9 @@
             </forrest:properties>
           </forrest:contract>
           <forrest:contract name="nav-section-round-bottom"/>
+          -->
         </forrest:hook>
+        <!--
         <jx:import uri="cocoon://prepare.tiles.export-link"/>
         <forrest:hook name="content">
         -->

Copied: forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/nav-main-sub.ft (from r368658, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft)
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/nav-main-sub.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/nav-main-sub.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft&r1=368658&r2=368773&rev=368773&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft (original)
+++ forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/nav-main-sub.ft Fri Jan 13 08:21:16 2006
@@ -15,39 +15,38 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract name="nav-main-sub" type="nugget"
+<forrest:contract name="nav-main-sub"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
     nav-main-sub will output the secondary navigation AKA level2.
   </description>
-  <usage><![CDATA[<forrest:contract name="nav-main-sub">
-  <forrest:properties contract="nav-main-sub">
-    <forrest:property name="nav-main-sub" nugget="get.navigation">
-      <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
-    </forrest:property>
-  </forrest:properties>
-</forrest:contract>]]></usage>
+   <usage><![CDATA[<forrest:contract name="nav-main-sub" dataURI="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>]]>
+    </usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
+  name="nav-main-sub" inputFormat="xsl">
 
     <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>+
+      <xsl:template match="/" >
+        <forrest:content>
+          <forrest:part>
+<xsl:comment>+
     |start nav-main-sub
     +</xsl:comment>
-    <!-- FIXME - Suppress the following test when empty div problem is solved -->
-  <xsl:if test="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*">
-    <div id="level2tabs">
-      <xsl:copy-of
-        select="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*"/>
-    </div>
-  </xsl:if>
-  <xsl:comment>+
+            <!-- FIXME - Suppress the following test when empty div problem is solved -->
+            <!-- FIXME - With a little css work, we should use the common contract and suppress this one (no need of level2tabs) -->
+            <xsl:if test="navigation/tab/div[@id='nav-main-sub']/*">
+              <div id="level2tabs">
+                <xsl:copy-of
+                  select="navigation/tab/div[@id='nav-main-sub']/*"/>
+              </div>
+            </xsl:if>
+<xsl:comment>+
     |end Endtabs
     +</xsl:comment>
-		  </xsl:template>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
 		</xsl:stylesheet>
 	</forrest:template>
 </forrest:contract>