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/[EMAIL
PROTECTED]'nav-main-sub']/*">
- <div id="level2tabs">
- <xsl:copy-of
- select="$nav-main-sub/navigation/tab/[EMAIL
PROTECTED]'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/[EMAIL PROTECTED]'nav-main-sub']/*">
+ <div id="level2tabs">
+ <xsl:copy-of
+ select="navigation/tab/[EMAIL PROTECTED]'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>
