forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r279317 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates: content-main.ft content-title.ft
Date Wed, 07 Sep 2005 13:05:52 GMT
Author: rgardler
Date: Wed Sep  7 06:05:36 2005
New Revision: 279317

URL: http://svn.apache.org/viewcvs?rev=279317&view=rev
Log:
add namespace to templates (it was 'pretending' to work last before, must have been a copy-over)

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-title.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-main.ft?rev=279317&r1=279316&r2=279317&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-main.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-main.ft
Wed Sep  7 06:05:36 2005
@@ -18,6 +18,7 @@
 <forrest:contract 
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  xmlns:xhtml2="http://www.w3.org/2002/06/xhtml2"
   name="content-main" type="nugget">
   <description>
     content-main - Template will output the main body of a document.
@@ -30,9 +31,7 @@
 	<xsl:comment>+
 	    |start content-main
 	    +</xsl:comment>
-        <!-- FIXME: remove the following "debug" line -->
-        <h1>This comes from the content-main contract</h1>
-			  <xsl:copy-of select="body/*"/>
+			  <xsl:copy-of select="xhtml2:body/*"/>
 <xsl:comment>+
     |end content-main
     +</xsl:comment>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-title.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-title.ft?rev=279317&r1=279316&r2=279317&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-title.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/templates/content-title.ft
Wed Sep  7 06:05:36 2005
@@ -18,9 +18,11 @@
 <forrest:contract 
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  xmlns:xhtml2="http://www.w3.org/2002/06/xhtml2"
   name="content-title" type="nugget">
   <description>
     content-title - Template will output the title (first h1 of the content). 
+    FIXME: in XHTML2 the title may be the heading of the first section
   </description>
   <usage><![CDATA[<forrest:contract name="content-title"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -30,7 +32,8 @@
 	<xsl:comment>+
 	    |start content-title
 	    +</xsl:comment>
-			  <xsl:copy-of select="div[@id='content']/h1[position()=1]"/>
+        <!-- FIXME: this doesn't work yet (namespace issue?)-->
+			  <xsl:copy-of select="xhtml2:div[@id='content']/xhtml2:h1[position()=1]"/>
 <xsl:comment>+
     |end content-title
     +</xsl:comment>



Mime
View raw message