forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r180343 - in /forrest/trunk: main/webapp/skins/common/xslt/html/document2html.xsl main/webapp/skins/leather-dev/xslt/html/document2html.xsl whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
Date Mon, 06 Jun 2005 17:08:36 GMT
Author: thorsten
Date: Mon Jun  6 10:08:35 2005
New Revision: 180343

URL: http://svn.apache.org/viewcvs?rev=180343&view=rev
Log:
Reverted changes to common d2h.xsl done in r180119, because it caused a bug in pelt. I added
the changes instead to leather-dev.

Modified:
    forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl?rev=180343&r1=180342&r2=180343&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl Mon Jun  6 10:08:35
2005
@@ -137,7 +137,7 @@
 
   <xsl:template match="note | warning | fixme">
     <xsl:apply-templates select="@id"/>
-    <div class="frame-{local-name()}">
+    <div class="frame {local-name()}">
       <div class="label">
         <xsl:choose>
           <!-- FIXME: i18n Transformer here -->

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl?rev=180343&r1=180342&r2=180343&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl Mon Jun  6 10:08:35
2005
@@ -143,5 +143,21 @@
       </img>
     </div>
   </xsl:template>
-
+  <xsl:template match="note | warning | fixme">
+    <xsl:apply-templates select="@id"/>
+    <div class="frame {local-name()}">
+      <div class="label">
+        <xsl:choose>
+          <!-- FIXME: i18n Transformer here -->
+          <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
+          <xsl:when test="local-name() = 'note'">Note</xsl:when>
+          <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
+          <xsl:otherwise>Fixme (<xsl:value-of select="@author"/>)</xsl:otherwise>
+        </xsl:choose>
+      </div>
+      <div class="content">
+        <xsl:apply-templates/>
+      </div>
+    </div>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft?rev=180343&r1=180342&r2=180343&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
Mon Jun  6 10:08:35 2005
@@ -20,7 +20,7 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-main" type="nugget">
   <description>
-    content-main - Template will output the content-main. 
+    content-main - Template will output the content-main.
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"



Mime
View raw message