* doc/* : total revamp of the web site based on Diana Fong design

  but not completely integrated yet
Daniel

1 files changed, 160 insertions, 442 deletions

diff --git a/docs/site.xsl b/docs/site.xsl
index 8f9056dec2..c7f164d912 100644
--- a/docs/site.xsl
+++ b/docs/site.xsl
@@ -107,104 +107,6 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  <xsl:template name="docfilename">
-    <xsl:param name="name" select="string(@href)"/>
-    <xsl:choose>
-      <xsl:when test="$name = '#Introducti'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Documentat'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Reporting'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#help'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Help'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Downloads'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#News'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Contributi'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#xsltproc'">
-        <xsl:text>xsltproc2.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#API'">
-        <xsl:text>API.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#XSLT'">
-        <xsl:text>XSLT.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#XML'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Validation'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#tree'">
-        <xsl:text>tree.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#library'">
-        <xsl:text>library.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#interface'">
-        <xsl:text>interface.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Example'">
-        <xsl:text>example.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Entities'">
-        <xsl:text>entities.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#architecture'">
-        <xsl:text>architecture.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Namespaces'">
-        <xsl:text>namespaces.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#DOM'">
-        <xsl:text>DOM.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Catalog'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Upgrading'">
-        <xsl:text>upgrade.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Encodings'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#IO'">
-        <xsl:text>xmlio.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Memory'">
-        <xsl:text>xmlmem.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Thread'">
-        <xsl:text>threads.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#FAQ'">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = '#Python'">
-        <xsl:text>python.html</xsl:text>
-      </xsl:when>
-      <xsl:when test="$name = ''">
-        <xsl:text>unknown.html</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
   <xsl:template name="filename">
     <xsl:param name="name" select="string(@href)"/>
     <xsl:choose>
@@ -236,7 +138,7 @@
         <xsl:text>xsltproc2.html</xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#API'">
-        <xsl:text>API.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#XSLT'">
         <xsl:text>XSLT.html</xsl:text>
@@ -248,19 +150,19 @@
         <xsl:text>xmldtd.html</xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#tree'">
-        <xsl:text>tree.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#library'">
-        <xsl:text>library.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#interface'">
-        <xsl:text>interface.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Example'">
-        <xsl:text>example.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Entities'">
-        <xsl:text>entities.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#architecture'">
         <xsl:text>architecture.html</xsl:text>
@@ -269,31 +171,31 @@
         <xsl:text>namespaces.html</xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#DOM'">
-        <xsl:text>DOM.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Catalog'">
         <xsl:text>catalog.html</xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Upgrading'">
-        <xsl:text>upgrade.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Encodings'">
         <xsl:text>encoding.html</xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#IO'">
-        <xsl:text>xmlio.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Memory'">
-        <xsl:text>xmlmem.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Thread'">
-        <xsl:text>threads.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#FAQ'">
         <xsl:text>FAQ.html</xsl:text>
       </xsl:when>
       <xsl:when test="$name = '#Python'">
-        <xsl:text>python.html</xsl:text>
+        <xsl:text></xsl:text>
       </xsl:when>
       <xsl:when test="$name = ''">
         <xsl:text>unknown.html</xsl:text>
@@ -307,262 +209,131 @@
  - The global title
  -->
   <xsl:variable name="globaltitle" select="string(/html/body/h1[1])"/>
+
 <!--
- - The table of content
+  the main menu box
  -->
-  <xsl:variable name="toc">
+  <xsl:template name="mainmenu">
+   <div class="left">
     <form action="search.php"
           enctype="application/x-www-form-urlencoded" method="get">
       <input name="query" type="text" size="20" value=""/>
       <input name="submit" type="submit" value="Search ..."/>
     </form>
-    <ul><!-- style="margin-left: -1em" -->
-      <li><a href="index.html">Home</a></li>
-      <xsl:for-each select="/html/body/h2">
-        <xsl:variable name="filename">
-          <xsl:call-template name="tocfilename">
-            <xsl:with-param name="name" select="concat('#', string(a[1]/@name))"/>
-          </xsl:call-template>
-        </xsl:variable>
-	<xsl:if test="$filename != ''">
-	  <li>
-	    <xsl:element name="a">
-	      <xsl:attribute name="href">
-	        <xsl:value-of select="$filename"/>
-	      </xsl:attribute>
-	      <xsl:if test="$filename = 'docs.html'">
-		  <xsl:attribute name="style">font-weight:bold</xsl:attribute>
-	      </xsl:if>
-	      <xsl:value-of select="."/>
-	    </xsl:element>
-	  </li>
-	</xsl:if>
-      </xsl:for-each>
-      <li><a style="font-weight:bold"
-             href="html/index.html">API Menu</a></li>
-      <li><a href="ChangeLog.html">Recent Changes</a></li>
-    </ul>
-  </xsl:variable>
-  <xsl:variable name="develtoc">
+    <div class="box">
+      <h2 class="box_title">main menu</h2>
+    </div>
+    <p><a href="{$href_base}index.html">Home</a></p>
+    <xsl:for-each select="/html/body/h2">
+    <xsl:variable name="filename">
+      <xsl:call-template name="tocfilename">
+	<xsl:with-param name="name" select="concat('#', string(a[1]/@name))"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:if test="$filename != ''">
+      <p>
+	<xsl:element name="a">
+	  <xsl:attribute name="href">
+	    <xsl:value-of select="$filename"/>
+	  </xsl:attribute>
+	  <xsl:if test="$filename = 'docs.html'">
+	      <xsl:attribute name="style">font-weight:bold</xsl:attribute>
+	  </xsl:if>
+	  <xsl:value-of select="."/>
+	</xsl:element>
+      </p>
+    </xsl:if>
+    </xsl:for-each>
+    <p><a style="font-weight:bold"
+             href="html/index.html">API Menu</a></p>
+      <p><a href="ChangeLog.html">Recent Changes</a></p>
+
+    <div class="box">
+      <h2 class="box_title">related links</h2>
+    </div>
+    <p><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></p>
+    <p><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></p>
+    <a href="http://xmlsoft.org/"><img src="{$href_base}Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo"/></a>
+   </div>
+  </xsl:template>
+
+<!--
+  the main menu box
+ -->
+  <xsl:template name="develtoc">
+   <div class="left">
     <form action="search.php"
           enctype="application/x-www-form-urlencoded" method="get">
       <input name="query" type="text" size="20" value=""/>
       <input name="submit" type="submit" value="Search ..."/>
     </form>
-    <ul><!-- style="margin-left: -1em" -->
-      <li><a href="index.html" style="font-weight:bold">Main Menu</a></li>
-      <li><a style="font-weight:bold"
-             href="html/index.html">API Menu</a></li>
-      <li><a href="ChangeLog.html">ChangeLog</a></li>
-      <xsl:for-each select="/html/body/h2">
-        <xsl:variable name="filename">
-          <xsl:call-template name="docfilename">
-            <xsl:with-param name="name" select="concat('#', string(a[1]/@name))"/>
-          </xsl:call-template>
-        </xsl:variable>
-	<xsl:if test="$filename != ''">
-	  <li>
-	    <xsl:element name="a">
-	      <xsl:attribute name="href">
-	        <xsl:value-of select="$filename"/>
-	      </xsl:attribute>
-	      <xsl:value-of select="."/>
-	    </xsl:element>
-	  </li>
-	</xsl:if>
-      </xsl:for-each>
-      <li><a href="libvir.html">flat page</a>, <a href="site.xsl">stylesheet</a></li>
-    </ul>
-  </xsl:variable>
-  <xsl:variable name="api">
-    <ul><!-- style="margin-left: -1em" -->
-      <li><a href="{$href_base}APIchunk0.html">Alphabetic</a></li>
-      <li><a href="{$href_base}APIconstructors.html">Constructors</a></li>
-      <li><a href="{$href_base}APIfunctions.html">Functions/Types</a></li>
-      <li><a href="{$href_base}APIfiles.html">Modules</a></li>
-      <li><a href="{$href_base}APIsymbols.html">Symbols</a></li>
-    </ul>
-  </xsl:variable>
-  <xsl:variable name="related">
-    <ul><!-- style="margin-left: -1em" -->
-      <li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li>
-      <li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li>
-<!--
-      <li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li>
-  -->
-    </ul>
-  </xsl:variable>
-  <xsl:template name="toc">
-    <table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000">
-      <tr>
-        <td>
-          <table width="100%" border="0" cellspacing="1" cellpadding="3">
-            <tr>
-              <td colspan="1" bgcolor="#eecfa1" align="center">
-                <center>
-                  <b><xsl:value-of select="$menu_name"/></b>
-                </center>
-              </td>
-            </tr>
-            <tr>
-              <td bgcolor="#fffacd">
-                <xsl:copy-of select="$toc"/>
-              </td>
-            </tr>
-          </table>
-          <table width="100%" border="0" cellspacing="1" cellpadding="3">
-            <tr>
-              <td colspan="1" bgcolor="#eecfa1" align="center">
-                <center>
-                  <b>Related links</b>
-                </center>
-              </td>
-            </tr>
-            <tr>
-              <td bgcolor="#fffacd">
-                <xsl:copy-of select="$related"/>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
+    <div class="box">
+      <h2 class="box_title">API menu</h2>
+    </div>
+      <p><a href="{$href_base}index.html">Main menu</a></p>
+      <p><a href="{$href_base}/html/index.html">API menu</a></p>
+      <p><a href="{$href_base}ChangeLog.html">ChangeLog</a></p>
+    <div class="box">
+      <h2 class="box_title">API Indexes</h2>
+    </div>
+      <p><a href="{$href_base}APIchunk0.html">Alphabetic</a></p>
+      <p><a href="{$href_base}APIconstructors.html">Constructors</a></p>
+      <p><a href="{$href_base}APIfunctions.html">Functions/Types</a></p>
+      <p><a href="{$href_base}APIfiles.html">Modules</a></p>
+      <p><a href="{$href_base}APIsymbols.html">Symbols</a></p>
+    <div class="box">
+      <h2 class="box_title">related links</h2>
+    </div>
+    <p><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></p>
+    <p><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></p>
     <a href="http://xmlsoft.org/"><img src="{$href_base}Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo"/></a>
+   </div>
   </xsl:template>
-  <xsl:template name="develtoc">
-    <table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000">
-      <tr>
-        <td>
-          <table width="100%" border="0" cellspacing="1" cellpadding="3">
-            <tr>
-              <td colspan="1" bgcolor="#eecfa1" align="center">
-                <center>
-                  <b>Developer Menu</b>
-                </center>
-              </td>
-            </tr>
-            <tr>
-              <td bgcolor="#fffacd">
-                <xsl:copy-of select="$develtoc"/>
-              </td>
-            </tr>
-          </table>
-          <table width="100%" border="0" cellspacing="1" cellpadding="3">
-            <tr>
-              <td colspan="1" bgcolor="#eecfa1" align="center">
-                <center>
-                  <b>API Indexes</b>
-                </center>
-              </td>
-            </tr>
-            <tr>
-              <td bgcolor="#fffacd">
-                <xsl:copy-of select="$api"/>
-              </td>
-            </tr>
-          </table>
-          <table width="100%" border="0" cellspacing="1" cellpadding="3">
-            <tr>
-              <td colspan="1" bgcolor="#eecfa1" align="center">
-                <center>
-                  <b>Related links</b>
-                </center>
-              </td>
-            </tr>
-            <tr>
-              <td bgcolor="#fffacd">
-                <xsl:copy-of select="$related"/>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-  <xsl:template mode="head" match="title">
-    <title>
-      <xsl:apply-templates/>
-    </title>
+
+<!--
+  the menu box for developper's pages
+ -->
+<!--
+  the page title
+ -->
+
+  <xsl:template name="titlebox">
+    <xsl:param name="title"/>
+    <h3 class="title"><xsl:value-of select="$title"/></h3>
   </xsl:template>
-  <xsl:template mode="head" match="meta">
-</xsl:template>
+
 <!--
  - Write the styles in the head
  -->
   <xsl:template name="style">
-    <link rel="SHORTCUT ICON" href="/favicon.ico"/> 
-    <style type="text/css">
-TD {font-family: Verdana,Arial,Helvetica}
-BODY {font-family: Verdana,Arial,Helvetica; margin-top: 2em; margin-left: 0em; margin-right: 0em}
-H1 {font-family: Verdana,Arial,Helvetica}
-H2 {font-family: Verdana,Arial,Helvetica}
-H3 {font-family: Verdana,Arial,Helvetica}
-A:link, A:visited, A:active { text-decoration: underline }
-</style>
+    <link rel="stylesheet" type="text/css" href="{$href_base}libvir.css" />
   </xsl:template>
+
 <!--
- - Write the title box on top
+ - The top section 
  -->
-  <xsl:template name="titlebox">
-    <xsl:param name="title" select="'Main Page'"/>
-    <table border="0" width="100%" cellpadding="5" cellspacing="0" align="center">
-    <tr>
-    <td width="120">
-    <a href="http://www.redhat.com/"><img src="{$href_base}redhat.gif" alt="Red Hat Logo"/></a>
-    </td>
-    <td>
-    <table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000">
-      <tr>
-        <td>
-          <table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd">
-            <tr>
-              <td align="center">
-                <xsl:element name="h1">
-                  <xsl:value-of select="$globaltitle"/>
-                </xsl:element>
-                <xsl:element name="h2">
-                  <xsl:value-of select="$title"/>
-                </xsl:element>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    </td>
-    </tr>
-    </table>
+  <xsl:template name="top">
+    <div id="top">
+      <img src="{$href_base}libvirHeader.png" alt="Libvir the virtualization API" />
+    </div>
   </xsl:template>
+
 <!--
- - Handling of nodes in the body before the first H2, table of content
- - Everything is just copied over, except href which may get rewritten
- - and h1/h2/a at the top level
+ - The top section for the main page
  -->
-  <xsl:template priority="2" mode="subcontent" match="a">
-    <xsl:variable name="filename">
-      <xsl:call-template name="filename">
-        <xsl:with-param name="name" select="string(@href)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:copy>
-      <xsl:attribute name="href">
-        <xsl:value-of select="$filename"/>
-      </xsl:attribute>
-      <xsl:apply-templates mode="subcontent" select="node()"/>
-    </xsl:copy>
+  <xsl:template name="topmain">
+    <div id="topmain">
+      <img src="{$href_base}libvirLogo.png" alt="Libvir the virtualization API" />
+    </div>
   </xsl:template>
-  <xsl:template mode="subcontent" match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates mode="subcontent" select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template mode="content" match="@*|node()">
-    <xsl:if test="name() != 'h1' and name() != 'h2'">
-      <xsl:copy>
-        <xsl:apply-templates mode="subcontent" select="@*|node()"/>
-      </xsl:copy>
-    </xsl:if>
+
+<!--
+ - The bottom section
+ -->
+  <xsl:template name="bottom">
+    <div id="copyright"> </div> 
   </xsl:template>
+
 <!--
  - Handling of nodes in the body after an H2
  - Open a new file and dump all the siblings up to the next H2
@@ -574,11 +345,6 @@ A:link, A:visited, A:active { text-decoration: underline }
         <xsl:with-param name="name" select="concat('#', string($header/a[1]/@name))"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="tocfilename">
-      <xsl:call-template name="tocfilename">
-        <xsl:with-param name="name" select="concat('#', string($header/a[1]/@name))"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="title">
       <xsl:value-of select="$header"/>
     </xsl:variable>
@@ -592,125 +358,77 @@ A:link, A:visited, A:active { text-decoration: underline }
             <xsl:value-of select="$title"/>
           </xsl:element>
         </head>
-        <body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000">
-          <xsl:call-template name="titlebox">
-            <xsl:with-param name="title" select="$title"/>
-          </xsl:call-template>
-          <table border="0" cellpadding="4" cellspacing="0" width="100%" align="center">
-            <tr>
-              <td bgcolor="#8b7765">
-                <table border="0" cellspacing="0" cellpadding="2" width="100%">
-                  <tr>
-                    <td valign="top" width="200" bgcolor="#8b7765">
-		      <xsl:choose>
-		        <xsl:when test="$filename = 'docs.html'">
-                          <xsl:call-template name="develtoc"/>
-		        </xsl:when>
-		        <xsl:when test="$tocfilename = ''">
-                          <xsl:call-template name="develtoc"/>
-		        </xsl:when>
-		        <xsl:otherwise>
-                          <xsl:call-template name="toc"/>
-		        </xsl:otherwise>
-		      </xsl:choose>
-                    </td>
-                    <td valign="top" bgcolor="#8b7765">
-                      <table border="0" cellspacing="0" cellpadding="1" width="100%">
-                        <tr>
-                          <td>
-                            <table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000">
-                              <tr>
-                                <td>
-                                  <table border="0" cellpadding="3" cellspacing="1" width="100%">
-                                    <tr>
-                                      <td bgcolor="#fffacd">
-                                        <xsl:apply-templates mode="subfile" select="$header/following-sibling::*[preceding-sibling::h2[1] = $header         and name() != 'h2' ]"/>
-					<p><a href="bugs.html">Daniel Veillard</a></p>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </td>
-                              </tr>
-                            </table>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
+        <body>
+	  <div id="main">
+	    <xsl:call-template name="top"/>
+	    <div id="left">
+	      <xsl:call-template name="mainmenu"/>
+	    </div>
+	    <div id="right">
+	      <xsl:call-template name="titlebox">
+		<xsl:with-param name="title" select="$title"/>
+	      </xsl:call-template>
+	      <xsl:apply-templates mode="subfile" select="$header/following-sibling::*[preceding-sibling::h2[1] = $header and name() != 'h2' ]"/>
+	    </div>
+	    <xsl:call-template name="bottom"/>
+	  </div>
         </body>
       </html>
     </xsl:document>
   </xsl:template>
+
+  <xsl:template mode="subcontent" match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates mode="subcontent" select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template mode="content" match="@*|node()">
+    <xsl:if test="name() != 'h1' and name() != 'h2'">
+      <xsl:copy>
+        <xsl:apply-templates mode="subcontent" select="@*|node()"/>
+      </xsl:copy>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template mode="subfile" match="@*|node()">
     <xsl:copy>
       <xsl:apply-templates mode="content" select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
+
 <!--
  - Handling of the initial body and head HTML document
  -->
   <xsl:template match="body">
     <xsl:variable name="firsth2" select="./h2[1]"/>
-    <xsl:variable name="rest2" select="./h2[position()&gt;1]"/>
-    <body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000">
-      <xsl:call-template name="titlebox">
-        <xsl:with-param name="title" select="'libvir'"/>
-      </xsl:call-template>
-      <table border="0" cellpadding="4" cellspacing="0" width="100%" align="center">
-        <tr>
-          <td bgcolor="#8b7765">
-            <table border="0" cellspacing="0" cellpadding="2" width="100%">
-              <tr>
-                <td valign="top" width="200" bgcolor="#8b7765">
-                  <xsl:call-template name="toc"/>
-                </td>
-                <td valign="top" bgcolor="#8b7765">
-                  <table border="0" cellspacing="0" cellpadding="1" width="100%">
-                    <tr>
-                      <td>
-                        <table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000">
-                          <tr>
-                            <td>
-                              <table border="0" cellpadding="3" cellspacing="1" width="100%">
-                                <tr>
-                                  <td bgcolor="#fffacd">
-                                    <xsl:apply-templates mode="content" select="($firsth2/preceding-sibling::*)"/>
-                                    <xsl:for-each select="./h2">
-                                      <xsl:call-template name="subfile">
-                                        <xsl:with-param name="header" select="."/>
-                                      </xsl:call-template>
-                                    </xsl:for-each>
-				    <p><a href="bugs.html">Daniel Veillard</a></p>
-                                  </td>
-                                </tr>
-                              </table>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
+    <body>
+      <div id="main">
+	<xsl:call-template name="topmain"/>
+        <div id="left">
+	  <xsl:call-template name="mainmenu"/>
+        </div>
+        <div id="right">
+          <xsl:apply-templates mode="content" select="($firsth2/preceding-sibling::*)"/>
+          <xsl:for-each select="./h2">
+            <xsl:call-template name="subfile">
+	      <xsl:with-param name="header" select="."/>
+            </xsl:call-template>
+          </xsl:for-each>
+        </div>
+        <xsl:call-template name="bottom"/>
+      </div>
     </body>
   </xsl:template>
   <xsl:template match="head">
-    <head>
-      <xsl:call-template name="style"/>
-      <xsl:apply-templates mode="head"/>
-    </head>
   </xsl:template>
   <xsl:template match="html">
     <xsl:message>Generating the Web pages</xsl:message>
     <html>
+      <head>
+        <xsl:call-template name="style"/>
+        <title>the virtualization API</title>
+      </head>
       <xsl:apply-templates/>
     </html>
   </xsl:template>