You are viewing a plain text version of this content. The canonical link for it is here.

Posted to svn@forrest.apache.org by cd...@apache.org on 2005/10/13 13:06:28 UTC

svn commit: r320731 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates: content-title.ft pelt/content-title.ft

Author: cdupoirieux
Date: Thu Oct 13 04:06:20 2005
New Revision: 320731

URL: http://svn.apache.org/viewcvs?rev=320731&view=rev
Log:
Merge both content-title contracts.
Add of the sub-title management (which is in the Document DTD).

Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/pelt/content-title.ft
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/content-title.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/content-title.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/content-title.ft?rev=320731&r1=320730&r2=320731&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/content-title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/templates/content-title.ft Thu Oct 13 04:06:20 2005
@@ -20,7 +20,7 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-title" type="nugget">
   <description>
-    content-title - Template will output the title (first h1 of the content). 
+    content-title - Template will output the title (first h1 of the content) and the sub-title (first h3 of the content). 
   </description>
   <usage><![CDATA[<forrest:contract name="content-title">
   <forrest:properties contract="content-title">
@@ -36,10 +36,10 @@
         match="div[@id='content']/h1[position()=1]">
         <xsl:param name="content-title"/>
         <xsl:comment>+ |start content-title +</xsl:comment>
-        <xsl:copy-of 
-          select="$content-title/div[@id='content']/h1[position()=1]"/>
+        [<xsl:copy-of select="$content-title/div[@id='content']/h1[position()=1]"/>]
+        [[<xsl:copy-of select="$content-title/div[@id='content']/h3[position()=1]"/>]]
         <xsl:comment>+ |end content-title +</xsl:comment>
       </xsl:template>
-	  </xsl:stylesheet>
+    </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>