avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject svn commit: rev 20242 - in avalon/trunk/tools/magic/xdoc/src: dist/themes/avalon2/html xdocs
Date Sun, 23 May 2004 09:16:52 GMT
Author: niclas
Date: Sun May 23 02:16:52 2004
New Revision: 20242

Modified:
   avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/nav-aggregate.xsl
   avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/transform.xsl
   avalon/trunk/tools/magic/xdoc/src/xdocs/navigation.xml
Log:
Another step in direction of site generation.

Modified: avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/nav-aggregate.xsl
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/nav-aggregate.xsl	(original)
+++ avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/nav-aggregate.xsl	Sun May 23
02:16:52 2004
@@ -24,10 +24,14 @@
   </xsl:template>
   
   <xsl:template match="menu" >
+    <xsl:param name="level" select="''" />
     <menu>
+      <level><xsl:value-of select="$level" /></level>
       <xsl:choose >
         <xsl:when test="count( ../links ) = 0" >
-          <xsl:apply-templates select="document('../navigation.xml', / )/project/body/menu"
/>
+          <xsl:apply-templates select="document('../navigation.xml', / )/project/body/menu"
>
+            <xsl:with-param name="level" select="concat( $level, '../' )" />
+          </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
           <category>

Modified: avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/transform.xsl
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/transform.xsl	(original)
+++ avalon/trunk/tools/magic/xdoc/src/dist/themes/avalon2/html/transform.xsl	Sun May 23 02:16:52
2004
@@ -8,27 +8,21 @@
   <xsl:template match="document">
     <html>
     <head>
+      <title>
+        <xsl:value-of select="properties/title" />
+      </title>
       <link rel="stylesheet" href="print.css" type="text/css" media="print"></link>
-      <link rel="stylesheet" href="/avalon/resources/style.css" type="text/css"></link>
-      <xsl:apply-templates select="properties" />
+      <link rel="stylesheet" type="text/css">
+        <xsl:attribute name="href"><xsl:value-of select="document('navigation.xml',
/ )/project/body/menu//level" />resources/style.css</xsl:attribute>
+      </link>
     </head>
       <xsl:apply-templates select="body" />
     </html>    
   </xsl:template>
   
-  <xsl:template match="properties">
-      <xsl:apply-templates />
-  </xsl:template>
-  
   <xsl:template match="author">
-    <meta name="author"><xsl:attribute name="content"><xsl:value-of select="."/></xsl:attribute></meta>
-    <meta name="email"><xsl:attribute name="content"><xsl:value-of select="@email"/></xsl:attribute></meta>
-  </xsl:template>
-  
-  <xsl:template match="title">
-    <title>
-      <xsl:value-of select="." />
-    </title>
+    <meta name="author"><xsl:attribute name="content"><xsl:value-of select="."
/></xsl:attribute></meta>
+    <meta name="email"><xsl:attribute name="content"><xsl:value-of select="@email"
/></xsl:attribute></meta>
   </xsl:template>
   
   <xsl:template match="body">
@@ -36,7 +30,9 @@
       <table class="logobar" >
         <tr>
           <td class="feather" width="167px"  >
-            <img src="/avalon/resources/feather.jpg" />
+            <img>
+              <xsl:attribute name="src"><xsl:value-of select="document('navigation.xml',
/ )/project/body/menu//level" />resources/feather.jpg</xsl:attribute>
+            </img>
           </td>
           <td class="panel">
             <div class="project">Apache Avalon</div>
@@ -46,12 +42,19 @@
       </table>
       
       <div class="icons">
-        <img class="pdf" src="/images/pdf.png" />
-        <img class="printer" src="/images/printer.png" />
+        <img class="pdf" >
+          <xsl:attribute name="src"><xsl:value-of select="document('navigation.xml',
/ )/project/body/menu//level" />resource/pdf.png</xsl:attribute>
+        </img>
+        <img class="printer" >
+          <xsl:attribute name="src"><xsl:value-of select="document('navigation.xml',
/ )/project/body/menu//level" />resource/printer.png</xsl:attribute>
+        </img>
       </div>
       
       <div class="categorybar">
-        <a href="/" class="homecategory">Home</a>
+        <a class="homecategory">
+          <xsl:attribute name="href"><xsl:value-of select="document('navigation.xml',
/ )/project/body/menu//level" />index.html</xsl:attribute>
+          Home
+        </a>
         
         <xsl:apply-templates select="document('navigation.xml', / )/project/body//category/item"
>
           <xsl:with-param name="dir" select="''" />
@@ -139,7 +142,7 @@
     <a>
       <xsl:attribute name="class"><xsl:value-of select="$class" /></xsl:attribute>
       <xsl:attribute name="href">
-        <xsl:value-of select="concat( $dir, @href )"/>
+        <xsl:value-of select="concat( $dir, @href )" />
       </xsl:attribute>
       <xsl:value-of select="@name" />
     </a>

Modified: avalon/trunk/tools/magic/xdoc/src/xdocs/navigation.xml
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/xdocs/navigation.xml	(original)
+++ avalon/trunk/tools/magic/xdoc/src/xdocs/navigation.xml	Sun May 23 02:16:52 2004
@@ -25,25 +25,15 @@
  <body>
 
     <links>
-      <item name="Home" href="http://apache.org/" type="left" />
-      <item name="Central" href="http://merlin.apache.org/central/" type="right"/>
-      <item name="Products" href="http://merlin.apache.org/products/" selected="true"
type="right"/>
-      <item name="Planet" href="http://merlin.apache.org/planet/" type="right"/>
+      <item name="Central" href="http://merlin.apache.org/central/" />
+      <item name="Products" href="http://merlin.apache.org/products/" />
+      <item name="Planet" href="http://merlin.apache.org/planet/" />
     </links>
 
     <menu>
       <item name="About XDoc Plugin" href="index.html"/>
       <item name="Properties" href="properties.html"/>
       <item name="Methods" href="methods.html"/>
-      <item name="dummy1" href="methods.html"/>
-      <item name="dummy2" href="methods.html"/>
-      <item name="dummy3" href="methods.html"/>
-      <item name="dummy4" href="methods.html"/>
-      <item name="dummy5" href="methods.html"/>
-      <item name="dummy6" href="methods.html"/>
-      <item name="dummy7" href="methods.html"/>
-      <item name="dummy8" href="methods.html"/>
-      <item name="dummy9" href="methods.html"/>
     </menu>
  </body>
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message