forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r161829 - in forrest/trunk: main/webapp/skins/common/xslt/html/site2xhtml.xsl main/webapp/skins/pelt/xslt/html/site2xhtml.xsl site-author/content/xdocs/docs/compliance.xml site-author/status.xml
Date Tue, 19 Apr 2005 03:25:44 GMT
Author: crossley
Date: Mon Apr 18 20:25:41 2005
New Revision: 161829

URL: http://svn.apache.org/viewcvs?view=rev&rev=161829
Log:
Generate html/head/meta elements from document-v2.
Submitted by: Mark Eggers
Issue: FOR-482 and FOR-457

Modified:
    forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
    forrest/trunk/site-author/content/xdocs/docs/compliance.xml
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl?view=diff&r1=161828&r2=161829
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl Mon Apr 18 20:25:41 2005
@@ -333,6 +333,20 @@
     </meta>
   </xsl:template>
 
+  <!-- meta information from v 2.0 documents
+       FIXME: the match is really inefficient -->
+  <xsl:template name="meta-data">
+    <xsl:for-each select="//meta-data/meta">
+      <xsl:element name="meta">
+        <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
+        <xsl:attribute name="content"><xsl:value-of select="."/></xsl:attribute>
+        <xsl:if test="@xml:lang">
+          <xsl:attribute name="lang"><xsl:value-of select="@xml:lang"/></xsl:attribute>
         
+        </xsl:if>
+      </xsl:element>
+    </xsl:for-each>
+  </xsl:template>
+
   <xsl:template name="feedback">
     <div id="feedback">
       <xsl:value-of select="$config/feedback"/>

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl?view=diff&r1=161828&r2=161829
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl Mon Apr 18 20:25:41 2005
@@ -50,8 +50,10 @@
 <!--+
   |generator meta
   +-->
+            <!-- Add some Forrest-specific metadata -->
             <xsl:call-template name="html-meta"/>
-            <xsl:apply-templates select="//meta-data"/>
+            <!-- Add any metadata from the documents -->
+            <xsl:call-template name="meta-data"/>
 <!--+
   |title
   +-->

Modified: forrest/trunk/site-author/content/xdocs/docs/compliance.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs/compliance.xml?view=diff&r1=161828&r2=161829
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs/compliance.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs/compliance.xml Mon Apr 18 20:25:41 2005
@@ -48,13 +48,7 @@
       </p>
       <p>
         The "<code>pelt</code>" skin
-<!--
         validates as HTML 4.0.1
--->
-        does not validate as HTML 4.0.1 (There is an extra "meta-data" element in the head
-        - see
-        <link href="http://issues.cocoondev.org/browse/FOR-482">FOR-482</link>
-       ).
       </p>
       <p>
         The "<code>tigris</code>" skin

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?view=diff&r1=161828&r2=161829
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Mon Apr 18 20:25:41 2005
@@ -51,6 +51,9 @@
         Added document to facilitate
         <link href="site:upgrading_07">upgrading to v0.7</link>
       </action>
+      <action dev="DC" type="fix" context="xsl" fixes-bug="FOR-482,FOR-457" due-to="Mark
Eggers">
+        Generate html/head/meta elements from document-v2.
+      </action>
       <action dev="DC" type="add" context="plugins">
         Added org.apache.forrest.plugin.input.listLocations plugin.
         Use lists of locations maintained in a simple xml format



Mime
View raw message