forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdupoiri...@apache.org
Subject svn commit: r368762 - in /forrest/trunk/main/template-sites/v3/src/documentation/resources/themes: common/html/branding-breadcrumbs.ft pelt.fv
Date Fri, 13 Jan 2006 15:55:58 GMT
Author: cdupoirieux
Date: Fri Jan 13 07:55:50 2006
New Revision: 368762

URL: http://svn.apache.org/viewcvs?rev=368762&view=rev
Log:
branding-breadcrumbs.ft for pelt migration.

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

Copied: forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/branding-breadcrumbs.ft
(from r368658, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/branding-breadcrumbs.ft)
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/branding-breadcrumbs.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/branding-breadcrumbs.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/branding-breadcrumbs.ft&r1=368658&r2=368762&rev=368762&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/branding-breadcrumbs.ft
(original)
+++ forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/branding-breadcrumbs.ft
Fri Jan 13 07:55:50 2006
@@ -15,56 +15,63 @@
   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"
-  name="branding-breadcrumbs"
-  type="nugget">
+<forrest:contract name="branding-breadcrumbs"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <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.themer" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.themer/"/>
-      </trail>
-    </forrest:property>
-  </forrest:properties>
+  <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.themer" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.themer/"/>
+    </trail>
+  </forrest:property>
 </forrest:contract>]]></usage>
+
   <forrest:template 
-    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="html" name="branding-breadcrumbs" inputFormat="xsl" body="true" head="false">
+    name="branding-breadcrumbs" inputFormat="xsl">
+
     <xsl:stylesheet version="1.1" 
-        xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:template name="branding-breadcrumbs-body">
-          <xsl:param name="branding-breadcrumbs"/>
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        <xsl:param name="defaultVariables" select="'test.html'"/>
+        <xsl:param name="branding-breadcrumbs"/>
+        <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+
+        <xsl:template match="/">
+          <forrest:content>
+            <forrest:part>
   <!--breadcrumbs org location-->
 <xsl:comment>+
-    |breadtrail
+    | start 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>
-        <script type="text/javascript" language="JavaScript" src="{$root}themes/breadcrumbs.js">&#160;</script>
-      </div>
+              <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>
+                <script type="text/javascript" language="JavaScript" src="{$root}themes/breadcrumbs.js">&#160;</script>
+              </div>
+<xsl:comment>+
+    | end breadtrail
+    +</xsl:comment>
+            </forrest:part>
+          </forrest:content>
         </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

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=368762&r1=368761&r2=368762&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 07:55:50 2006
@@ -237,19 +237,16 @@
   -->
 
     <forrest:hook name="container">
-   <!--
       <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.themer" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.themer/"/>
-            </trail>
-          </forrest:property>
-        </forrest:properties>
+        <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.themer" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.themer/"/>
+          </trail>
+        </forrest:property>
       </forrest:contract>
-      -->
+
       <forrest:hook name="header">
       <forrest:contract name="branding-tagline">
           <forrest:property name="branding-tagline-name">new 
@@ -266,6 +263,7 @@
             <forrest:property name="branding-logo-logo">images/group.png</forrest:property>
           </forrest:contract>
         </forrest:hook>
+<!-- FIXME - Problem chaining two hooks with the same name...
         <forrest:hook class="logo">
           <forrest:contract name="branding-logo">
             <forrest:property name="branding-logo-name">MyProject</forrest:property>
@@ -274,47 +272,36 @@
             <forrest:property name="branding-logo-logo">images/project.png</forrest:property>
           </forrest:contract>
         </forrest:hook>
+-->
         <forrest:contract name="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:contract>
-        <!--
+
         <forrest:hook name="nav-main-hook">
-          <forrest:contract name="nav-main">
-            <forrest:properties contract="nav-main">
-              <forrest:property name="nav-main" nugget="get.navigation">
-                <jx:import uri="cocoon://${cocoon.parameters.getRequest}.navigation.xml"/>
-              </forrest:property>
-            </forrest:properties>
-          </forrest:contract>
+          <forrest:contract name="nav-main" 
+            dataURI="cocoon://#{$getRequest}.navigation.xml"/>
           <forrest:hook name="publishedStrip">
-            <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>
+            <forrest:contract name="nav-main-sub" 
+              dataURI="cocoon://#{$getRequest}.navigation.xml"/>
             <forrest:contract name="siteinfo-current-time"/>
           </forrest:hook>
         </forrest:hook>
-        -->
+
       </forrest:hook>
-      <!--
       <forrest:hook name="page">
         <forrest:contract name="branding-breadcrumbs">
-          <forrest:properties contract="branding-breadcrumbs">
-            <forrest:property name="branding-breadcrumbs">
-              <trail>
-                <link1 name="myGroup" href="http://www.apache.org/"/>
-                <link2 name="myProject" href="http://forrest.apache.org/"/>
-                <link3 name="" href=""/>
-              </trail>
-            </forrest:property>
-          </forrest:properties>
+          <forrest:property name="branding-breadcrumbs">
+            <trail>
+              <link1 name="myGroup" href="http://www.apache.org/"/>
+              <link2 name="myProject" href="http://forrest.apache.org/"/>
+              <link3 name="" href=""/>
+            </trail>
+          </forrest:property>
         </forrest:contract>
+        <!--
         <forrest:hook name="leftbar">
           <forrest:contract name="nav-section">
             <forrest:properties contract="nav-section">
@@ -441,7 +428,9 @@
             </forrest:properties>
           </forrest:contract>
         </forrest:hook>
+        -->
       </forrest:hook>
+      <!--
       <forrest:hook name="footer">
         <forrest:hook class="lastmodified">
           <forrest:contract name="siteinfo-last-published"/>



Mime
View raw message