forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r180193 - in /forrest/trunk: main/webapp/skins/leather-dev/xslt/html/ whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/ whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/
Date Mon, 06 Jun 2005 02:24:05 GMT
Author: thorsten
Date: Sun Jun  5 19:24:04 2005
New Revision: 180193

URL: http://svn.apache.org/viewcvs?rev=180193&view=rev
Log:
Fixed the open a href bug in leather-dev (d2h.xsl). Finished the content-main contract and
added the new contracts to the view instead of the content-contract. Made a note to not use
content.fv anymore.

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

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=180193&r1=180192&r2=180193&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 Sun Jun  5 19:24:04
2005
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,8 +27,6 @@
   <xsl:template match="document">
     <div id="content">
 
-      <div id="skinconf-pdflink"/>
-
       <xsl:if test="normalize-space(header/title)!=''">
         <h1><xsl:value-of select="header/title"/></h1>
       </xsl:if>
@@ -54,9 +53,9 @@
           <xsl:value-of select="header/abstract"/>
         </div>
       </xsl:if>
-
+<div id="content-main">
       <xsl:apply-templates select="body"/>
-
+</div>
       <xsl:if test="header/authors">
         <p align="right">
           <font size="-2">
@@ -82,9 +81,14 @@
   <xsl:template match="@id">
     <xsl:apply-imports/>
   </xsl:template>
-
+  <!-- Generate a <a name="..."> tag for an @id -->
+  <xsl:template match="@id">
+    <xsl:if test="normalize-space(.)!=''">
+      <a name="{.}">&#160;</a>
+    </xsl:if>
+  </xsl:template>
   <xsl:template match="section">
-    <a name="{generate-id()}"/>
+    <a name="{generate-id()}">&#160;</a>
     <xsl:apply-templates select="@id"/>
 
     <xsl:variable name = "level" select = "count(ancestor::section)+1" />
@@ -126,62 +130,6 @@
 
   </xsl:template>  
   
-  
-  <!--xsl:template match="section"-->
-    <!-- count the number of section in the ancestor-or-self axis to compute
-         the title element name later on -
-    <xsl:variable name="sectiondepth" select="count(ancestor-or-self::section)"/>
-    <a name="{generate-id()}"/>
-    <xsl:apply-templates select="@id"/-->
-    <!-- generate a title element, level 1 -> h2, level 2 -> h3 and so on... -
-    <xsl:element name="{concat('h',$sectiondepth + 1)}">
-      <xsl:value-of select="title"/>
-      <xsl:if test="$notoc='true' and $sectiondepth = 3">
-        <span style="float: right"><a href="#{@id}-menu">^</a></span>
-      </xsl:if>
-    </xsl:element>
-
-    <xsl:apply-templates select="*[not(self::title)]"/>
-  </xsl:template-->
-  
-  <!-- Generates the "printer friendly version" link -->
-  <!--xsl:template name="printlink">
-    <xsl:if test="$disable-print-link = 'false'"> 
-    <div class="printlink">
-	  <a href="javascript:void(window.print())">
-        <img class="skin" src="{$skin-img-dir}/printer.gif" alt="Print this Page"/>
-	  </a>
-	</div>
-    </xsl:if>
-  </xsl:template-->
-
-  <!-- Generates the PDF link -->
-  <!--xsl:template name="pdflink">
-    <xsl:if test="$dynamic-page='false'">
-      <xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 'false'">

-      <div class="printlink">
-        <a href="{$filename-noext}.pdf">
-          <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" alt="PDF"/>
-        </a>
-  	  </div>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template-->
-  
-
-  <!-- Generates the XML link -->
-  <!--xsl:template name="xmllink">
-    <xsl:if test="$dynamic-page='false'">
-      <xsl:if test="$disable-xml-link = 'false'">
-      <div class="printlink">
-        <a href="{$filename-noext}.xml">
-          <img class="skin" src="{$skin-img-dir}/xmldoc.gif" alt="xml"/>
-        </a>
-      </div>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template-->
-
   <xsl:template match="figure">
     <xsl:apply-templates select="@id"/>
     <div style="text-align: center;">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv?rev=180193&r1=180192&r2=180193&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
Sun Jun  5 19:24:04 2005
@@ -31,7 +31,12 @@
                 <forrest:contract name="txt-link"/>
                 <forrest:contract name="pdf-link"/>
             </forrest:hook>
-            <forrest:contract name="content"/>
+            <forrest:hook name="content">
+              <forrest:contract name="content-title"/>
+              <forrest:contract name="minitoc"/>
+			        <forrest:contract name="content-abstract"/>
+              <forrest:contract name="content-main"/>
+            </forrest:hook>
         </forrest:hook>
         <forrest:hook name="footer">
             <forrest:contract name="feedback"/>

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=180193&r1=180192&r2=180193&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
Sun Jun  5 19:24:04 2005
@@ -30,7 +30,7 @@
 	<xsl:comment>+
 	    |start content-main
 	    +</xsl:comment>
-			  <xsl:apply-templates select="div[@id='content']/h1[position()>1] | div[@id='content']/a"/>
+			  <xsl:copy-of select="div[@id='content']/div[@id='content-main']/*"/>
 <xsl:comment>+
     |end content-main
     +</xsl:comment>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content.ft?rev=180193&r1=180192&r2=180193&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content.ft
Sun Jun  5 19:24:04 2005
@@ -18,7 +18,7 @@
 <forrest:contract name="content" type="nugget"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    This functions will output the content and link.
+    This functions will output the content and link.  DO NOT USE IT ANYMORE
   </description>
   
   <forrest:template



Mime
View raw message