forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdupoiri...@apache.org
Subject svn commit: r369494 - in /forrest/trunk/main/template-sites/v3/src/documentation/resources/themes: pelt.fv pelt/html/content-main.ft
Date Mon, 16 Jan 2006 15:11:22 GMT
Author: cdupoirieux
Date: Mon Jan 16 07:11:15 2006
New Revision: 369494

URL: http://svn.apache.org/viewcvs?rev=369494&view=rev
Log:
content-main.ft migration (FOR-787)

Added:
    forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/content-main.ft
      - copied, changed from r369411, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.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=369494&r1=369493&r2=369494&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 Mon Jan
16 07:11:15 2006
@@ -40,23 +40,16 @@
         <css url="pelt.basic.css" media="screen" theme="Pelt"/>
         <css url="pelt.screen.css" media="screen" theme="Pelt"/>
         <css url="pelt.print.css" media="print"/>
-      </forrest:property>
-    </forrest:contract>
-  <!--
-    <forrest:css url="common.css" media="screen" rel="alternate stylesheet" theme="common"/>
-    <forrest:css url="leather-dev.css" media="screen" rel="alternate stylesheet" theme="common"/>
-    <forrest:css url="pelt.basic.css" media="screen" theme="Pelt"/>
-    <forrest:css url="pelt.screen.css" media="screen" theme="Pelt"/>
-    <forrest:css url="pelt.print.css" media="print"/>
-    <forrest:css >
-/* Extra css */
+        <css>/* Extra css */
     p.quote {
       margin-left: 2em;
       padding: .5em;
       background-color: #f0f0f0;
       font-family: monospace;
-    }
-    </forrest:css>
+    }</css>
+      </forrest:property>
+    </forrest:contract>
+  <!--
     <forrest:contract name="branding-theme-profiler">
       <forrest:properties contract="branding-theme-profiler">
          <forrest:property name="branding-theme-profiler-theme">Pelt</forrest:property>
@@ -367,31 +360,24 @@
           <forrest:contract name="nav-section-round-bottom"/>
 
         </forrest:hook>
-        <!--
         <jx:import uri="cocoon://prepare.tiles.export-link"/>
         <forrest:hook name="content">
-        -->
           <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant
between Pelt and Leather-dev... -->
           <!--<forrest:hook class="trail">
             <forrest:contract name="branding-fontsize"/>
           </forrest:hook>-->
           <!--
           <forrest:contract name="content-title">
-            <forrest:properties contract="content-title">
               <forrest:property name="content-title" nugget="get.title">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
               </forrest:property>
-            </forrest:properties>
           </forrest:contract>
           <forrest:contract name="content-abstract">
-            <forrest:properties contract="content-abstract">
               <forrest:property name="content-abstract" nugget="get.abstract">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.abstract.xml"/>
               </forrest:property>
-            </forrest:properties>
           </forrest:contract>
           <forrest:contract name="content-minitoc">
-            <forrest:properties contract="content-minitoc">
               <forrest:property name="content-minitoc-toc" nugget="get.toc">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
               </forrest:property>
@@ -399,27 +385,22 @@
                 <toc max-depth="2" 
                 min-sections="1" location="page"/>
               </forrest:property>
-            </forrest:properties>
           </forrest:contract>
-          <forrest:contract name="content-main">
-            <forrest:properties contract="content-main">
-              <forrest:property name="content-main" nugget="get.body">
-                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
-              </forrest:property>
-              <forrest:property name="content-main-conf">
-                <headings type="underlined"/>
-              </forrest:property>
-            </forrest:properties>
+          -->
+          <forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.body.xml">
+            <forrest:property name="content-main-conf">
+              <headings type="underlined"/>
+            </forrest:property>
           </forrest:contract>
+          <!--
           <forrest:contract name="content-authors">
-            <forrest:properties contract="content-authors">
               <forrest:property name="content-authors" nugget="get.authors">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/>
               </forrest:property>
-            </forrest:properties>
           </forrest:contract>
+          -->
         </forrest:hook>
-        -->
+
       </forrest:hook>
       <!--
       <forrest:hook name="footer">

Copied: forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/content-main.ft
(from r369411, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft)
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/content-main.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/content-main.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft&r1=369411&r2=369494&rev=369494&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft
(original)
+++ forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt/html/content-main.ft
Mon Jan 16 07:11:15 2006
@@ -18,37 +18,46 @@
 <forrest:contract
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-main" type="nugget">
+  name="content-main">
+
   <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>
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main">
-  <forrest:properties contract="content-main">
-    <forrest:property name="content-main" nugget="get.body">
-      <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
-    </forrest:property>
-    <!-- Heading types can be clean|underlined|boxed  -->
-    <forrest:property name="content-main-conf">
-      <headings type="boxed"/>
-    </forrest:property>
-  </forrest:properties>
+
+  <usage><![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.body.xml"/>
+  </forrest:property>
+  <!-- Heading types can be clean|underlined|boxed  -->
+  <forrest:property name="content-main-conf">
+    <headings type="boxed"/>
+  </forrest:property>
 </forrest:contract>]]></usage>
+
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="html" name="content-main" inputFormat="xsl" body="true" head="false">
-     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    name="content-main" inputFormat="xsl">
+    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="content-main-conf" select='boxed'/>
+
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part>
+            <xsl:comment>+ |start content-main Yeah !+</xsl:comment>
+            <xsl:apply-templates
+              select="//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>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
       <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>
+
       <!--headings-->
       <xsl:template match="div[@class = 'skinconf-heading-1']">
         <xsl:param name="content-main-conf"/>
@@ -64,6 +73,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
+
       <xsl:template match="div[@class = 'section']">
         <xsl:param name="content-main-conf"/>
         <div class="section">
@@ -73,6 +83,7 @@
           </xsl:apply-templates>
         </div>
       </xsl:template>
+
       <xsl:template match="div[@class = 'skinconf-heading-2']">
         <xsl:param name="content-main-conf"/>
         <xsl:choose>
@@ -87,6 +98,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
+
       <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
         <xsl:copy>
           <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>



Mime
View raw message