[library-web/new-website-style: 1/55] new website layout



commit 09409ea3b331a75190827f7d68481b10219dca79
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Dec 3 19:01:30 2010 +0100

    new website layout

 data/skin/docbook.css             |    4 -
 data/skin/jquery.autocomplete.css |    5 +-
 data/skin/lgo2010.css             |   43 +++
 data/skin/mallard.css             |    5 +
 data/xslt/db2html.xsl             |  163 +++++++++++
 data/xslt/gtk-doc.xsl             |    3 +
 data/xslt/heading.xsl             |  265 ++++++++++---------
 data/xslt/html2html.xsl           |   23 ++-
 data/xslt/indexes.xsl             |  538 +++++++++++++++++++------------------
 data/xslt/mal2html.xsl            |    5 +-
 10 files changed, 663 insertions(+), 391 deletions(-)
---
diff --git a/data/skin/docbook.css b/data/skin/docbook.css
index d3b600d..1c01c6e 100644
--- a/data/skin/docbook.css
+++ b/data/skin/docbook.css
@@ -27,10 +27,6 @@
 
 }
 
-.article {
-	margin-right: 27ex;
-}
-
 table {
 	border-collapse: collapse;
 }
diff --git a/data/skin/jquery.autocomplete.css b/data/skin/jquery.autocomplete.css
index 3a42c05..e98e361 100644
--- a/data/skin/jquery.autocomplete.css
+++ b/data/skin/jquery.autocomplete.css
@@ -1,8 +1,9 @@
 .ac_results {
 	margin: 0 0 0 1ex;
 	padding: 0px;
-	border: 1px solid WindowFrame;
-	background-color: Window;
+	border: 1px solid black;
+	background-color: white;
+	color: black;
 }
 
 .ac_results ul {
diff --git a/data/skin/lgo2010.css b/data/skin/lgo2010.css
new file mode 100644
index 0000000..72d27c6
--- /dev/null
+++ b/data/skin/lgo2010.css
@@ -0,0 +1,43 @@
+div.subindex {
+	margin: 2em 7em 1em 0em;
+	padding-left: 110px;
+	background-position: top left;
+	background-repeat: no-repeat;
+	min-height: 96px;
+}
+
+div.subindex p {
+	color: #666;
+}
+
+div.subindex h2 {
+	padding: 0;
+	margin: 0;
+}
+
+div.subindex h2 a {
+	text-decoration: inherit;
+}
+
+div.subindex h2 a:hover {
+	text-decoration: underline;
+}
+
+h1.subindex {
+	padding-left: 110px;
+	background-position: top left;
+	background-repeat: no-repeat;
+	line-height: 96px;
+	min-height: 96px;
+}
+
+#subindex-references { background-image: url(icons/api-96.png); }
+#subindex-guides { background-image: url(icons/guides-96.png); }
+#subindex-tools { background-image: url(icons/tools-96.png); }
+#subindex-gdp { background-image: url(icons/gdp-96.png); }
+#subindex-gnome-devel { background-image: url(icons/gnome-development-96.png); }
+
+div.toc dt {
+	font-size: 100%;
+}
+
diff --git a/data/skin/mallard.css b/data/skin/mallard.css
index bef58a3..5c5e174 100644
--- a/data/skin/mallard.css
+++ b/data/skin/mallard.css
@@ -12,6 +12,7 @@ div.head {
 div.body {
 	border: none;
 	max-width: 80em;
+	background: inherit;
 }
 
 div, pre, p {
@@ -23,3 +24,7 @@ div.body div, div.body pre, div.body p {
 	margin: 1em 0 0;
 }
 
+div.linkdiv {
+	border-color: transparent;
+}
+
diff --git a/data/xslt/db2html.xsl b/data/xslt/db2html.xsl
index b9873ec..361c6dc 100644
--- a/data/xslt/db2html.xsl
+++ b/data/xslt/db2html.xsl
@@ -337,4 +337,167 @@ div.sidebar { top: 230px; }
   </xsl:if>
 </xsl:template>
 
+<xsl:template name="db2html.division.html">
+  <xsl:param name="node" select="."/>
+  <xsl:param name="info" select="/false"/>
+  <xsl:param name="template"/>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk">
+      <xsl:with-param name="node" select="$node"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:param name="prev_id">
+    <xsl:choose>
+      <xsl:when test="$depth_of_chunk = 0">
+        <xsl:if test="$info and $db.chunk.info_chunk">
+          <xsl:value-of select="$db.chunk.info_basename"/>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="db.chunk.chunk-id.axis">
+          <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="axis" select="'previous'"/>
+          <xsl:with-param name="depth_in_chunk" select="0"/>
+          <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="next_id">
+    <xsl:call-template name="db.chunk.chunk-id.axis">
+      <xsl:with-param name="node" select="$node"/>
+      <xsl:with-param name="axis" select="'next'"/>
+      <xsl:with-param name="depth_in_chunk" select="0"/>
+      <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:variable name="prev_node" select="key('idkey', $prev_id)"/>
+  <xsl:variable name="next_node" select="key('idkey', $next_id)"/>
+  <!-- FIXME -->
+  <html>
+    <head>
+      <title>
+        <xsl:variable name="title">
+          <xsl:call-template name="db.title">
+            <xsl:with-param name="node" select="$node"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="normalize-space($title)"/>
+      </title>
+      <xsl:if test="string($prev_id) != ''">
+        <link rel="previous">
+          <xsl:attribute name="href">
+            <xsl:call-template name="db.xref.target">
+              <xsl:with-param name="linkend" select="$prev_id"/>
+              <xsl:with-param name="target" select="$prev_node"/>
+              <xsl:with-param name="is_chunk" select="true()"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:attribute name="title">
+            <xsl:call-template name="db.title">
+              <xsl:with-param name="node" select="$prev_node"/>
+            </xsl:call-template>
+          </xsl:attribute>
+        </link>
+      </xsl:if>
+      <xsl:if test="string($next_id) != ''">
+        <link rel="next">
+          <xsl:attribute name="href">
+            <xsl:call-template name="db.xref.target">
+              <xsl:with-param name="linkend" select="$next_id"/>
+              <xsl:with-param name="target" select="$next_node"/>
+              <xsl:with-param name="is_chunk" select="true()"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:attribute name="title">
+            <xsl:call-template name="db.title">
+              <xsl:with-param name="node" select="$next_node"/>
+            </xsl:call-template>
+          </xsl:attribute>
+        </link>
+      </xsl:if>
+      <xsl:if test="/*[1] != $node">
+        <link rel="top">
+          <xsl:attribute name="href">
+            <xsl:call-template name="db.xref.target">
+              <xsl:with-param name="linkend" select="/*[1]/@id"/>
+              <xsl:with-param name="target" select="/*[1]"/>
+              <xsl:with-param name="is_chunk" select="true()"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:attribute name="title">
+            <xsl:call-template name="db.title">
+              <xsl:with-param name="node" select="/*[1]"/>
+            </xsl:call-template>
+          </xsl:attribute>
+        </link>
+      </xsl:if>
+      <xsl:call-template name="db2html.css">
+        <xsl:with-param name="css_file" select="$depth_of_chunk = 0"/>
+      </xsl:call-template>
+      <xsl:call-template name="db2html.division.head.extra"/>
+    </head>
+    <body>
+      <xsl:call-template name="db2html.division.top">
+        <xsl:with-param name="node" select="$node"/>
+        <xsl:with-param name="info" select="$info"/>
+        <xsl:with-param name="template" select="$template"/>
+        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+        <xsl:with-param name="prev_id" select="$prev_id"/>
+        <xsl:with-param name="next_id" select="$next_id"/>
+        <xsl:with-param name="prev_node" select="$prev_node"/>
+        <xsl:with-param name="next_node" select="$next_node"/>
+      </xsl:call-template>
+      <xsl:variable name="sidebar">
+        <xsl:call-template name="db2html.division.sidebar">
+          <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="info" select="$info"/>
+          <xsl:with-param name="template" select="$template"/>
+          <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+          <xsl:with-param name="prev_id" select="$prev_id"/>
+          <xsl:with-param name="next_id" select="$next_id"/>
+          <xsl:with-param name="prev_node" select="$prev_node"/>
+          <xsl:with-param name="next_node" select="$next_node"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <div id="container" class="two_columns">
+        <xsl:attribute name="class">
+          <xsl:if test="$sidebar != ''">
+            <xsl:text>two_columns</xsl:text>
+          </xsl:if>
+        </xsl:attribute>
+        <div class="content">
+        <xsl:choose>
+          <xsl:when test="$template = 'info'">
+            <xsl:call-template name="db2html.info.div">
+              <xsl:with-param name="node" select="$node"/>
+              <xsl:with-param name="info" select="$info"/>
+              <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates select="$node">
+              <xsl:with-param name="depth_in_chunk" select="0"/>
+              <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+            </xsl:apply-templates>
+          </xsl:otherwise>
+        </xsl:choose>
+        </div>
+        <xsl:copy-of select="$sidebar"/>
+      </div>
+      <xsl:call-template name="db2html.division.bottom">
+        <xsl:with-param name="node" select="$node"/>
+        <xsl:with-param name="info" select="$info"/>
+        <xsl:with-param name="template" select="$template"/>
+        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+        <xsl:with-param name="prev_id" select="$prev_id"/>
+        <xsl:with-param name="next_id" select="$next_id"/>
+        <xsl:with-param name="prev_node" select="$prev_node"/>
+        <xsl:with-param name="next_node" select="$next_node"/>
+      </xsl:call-template>
+      <xsl:call-template name="libgo.footer"/>
+    </body>
+  </html>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/data/xslt/gtk-doc.xsl b/data/xslt/gtk-doc.xsl
index 7d18557..9e4a8cf 100644
--- a/data/xslt/gtk-doc.xsl
+++ b/data/xslt/gtk-doc.xsl
@@ -88,6 +88,9 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
       </xsl:for-each>
   </xsl:template>
 
+  <xsl:template name="user.footer.content">
+    <xsl:call-template name="libgo.footer"/>
+  </xsl:template>
 
 
 </xsl:stylesheet>
diff --git a/data/xslt/heading.xsl b/data/xslt/heading.xsl
index 31c3f8a..c64a3a7 100644
--- a/data/xslt/heading.xsl
+++ b/data/xslt/heading.xsl
@@ -11,135 +11,158 @@
 <xsl:template name="libgo.header">
   <xsl:param name="channel"><xsl:value-of select="$libgo.channel"/></xsl:param>
   <xsl:param name="lang"><xsl:value-of select="$libgo.lang"/></xsl:param>
-  <div id="page">
-    <ul id="general">
-      <li id="siteaction-gnome_home" class="home">
-        <a href="http://www.gnome.org/";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-home'"/></xsl:call-template></a>
-      </li>
-      <li id="siteaction-gnome_news">
-        <a href="http://news.gnome.org";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-news'"/></xsl:call-template></a>
-      </li>
-      <li id="siteaction-gnome_projects">
-        <a href="http://www.gnome.org/projects/";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-projects'"/></xsl:call-template></a>
-      </li>
-      <li id="siteaction-gnome_art">
-        <a href="http://art.gnome.org";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-art'"/></xsl:call-template></a>
-      </li>
-      <li id="siteaction-gnome_support">
-        <a href="http://www.gnome.org/support/";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-support'"/></xsl:call-template></a>
-      </li>
-      <li id="siteaction-gnome_development">
-        <a href="http://developer.gnome.org";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-development'"/></xsl:call-template></a>
-      </li>
-      <li id="siteaction-gnome_community">
-        <a href="http://www.gnome.org/community/";
-          ><xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'siteaction-community'"/></xsl:call-template></a>
-      </li>
-    </ul>
-    <div id="header">
-      <div id="header-wrap">
-      <h1>
-          <xsl:call-template name="gettext"><xsl:with-param name="lang"
-          select="$lang"/><xsl:with-param name="msgid"
-          select="'sitetitle'"/></xsl:call-template>
-      </h1>   
-      <div id="control">
-	<div id="search">
-          <form method="get" action="http://www.google.com/custom";>
-            <input type="hidden" name="domains" value="library.gnome.org" />
-            <input type="hidden" name="sitesearch" value="library.gnome.org" />
-	    <input type="text" name="q" maxlength="255" size="15" class="searchTerms"/>
-	    <input type="submit" class="searchButton">
-              <xsl:attribute name="value">
-                <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'searchlabel'"/></xsl:call-template>
-              </xsl:attribute>
-            </input>
-          </form>
-	</div>
-      </div>
-      <div id="tabs">
-        <ul id="portal-globalnav">
-          <li id="portaltab-root">
-            <xsl:if test="$channel = 'home'">
-              <xsl:attribute name="class">selected</xsl:attribute>
-            </xsl:if>
-            <a href="/"><span>
-                <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'homelabel'"/></xsl:call-template></span></a>
-          </li>
-          <li id="portaltab-users">
-            <xsl:if test="$channel = 'users'">
-              <xsl:attribute name="class">selected</xsl:attribute>
-            </xsl:if>
-            <a href="/users/"><span>
-                <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'userslabel'"/></xsl:call-template></span></a>
-          </li>
-          <li id="portaltab-sysadmins">
-            <xsl:if test="$channel = 'admin'">
-              <xsl:attribute name="class">selected</xsl:attribute>
-            </xsl:if>
-            <a href="/admin/"><span>
-                <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'sysadminslabel'"/></xsl:call-template></span></a>
-          </li>
-          <li id="portaltab-developers">
-            <xsl:if test="$channel = 'devel'">
-              <xsl:attribute name="class">selected</xsl:attribute>
-            </xsl:if>
-            <a href="/devel/"><span>
-                <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'developerslabel'"/></xsl:call-template></span></a>
-          </li>
-          <li id="portaltab-about">
-            <xsl:if test="$channel = 'about'">
-              <xsl:attribute name="class">selected</xsl:attribute>
-            </xsl:if>
-	    <a href="/about/about"><span>
-                <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'aboutlabel'"/></xsl:call-template></span></a>
-	  </li>
+
+
+    <!-- accessibility access -->
+    <div id="accessibility_access">
+        <ul>
+            <li><a href="#container">Go to page content</a></li>
+            <li><a href="#top_bar">Go to main menu</a></li>
+            <li><a href="#s" onclick="$('#s').focus(); return false;">Go to the search field</a></li>
         </ul>
-      </div> <!-- end of #tabs -->
-      </div> <!-- end of #header-wrap -->
-    </div> <!-- end of #header -->
-  </div>
+    </div>
+    
+    <!-- global gnome.org domain bar -->
+    <div id="global_domain_bar">
+        <div>
+            <a href="#"><strong>GNOME</strong>.ORG</a>
+        </div>
+    </div>
+    
+    
+    <!-- header -->
+    <div id="header" class="container_12">
+        <div id="logo" class="grid_3">
+            <h1><a title="Go to home page" href="/"><img src="http://wptest.gnome.org/wp-content/themes/gnome-grass/images/gnome-logo.png"; alt="GNOME: The Free Software Desktop Project" /></a></h1>
+        </div>
+        <div id="top_bar" class="grid_9">
+            <div class="left">
+                <div class="menu-globalnav-container"><ul id="menu-globalnav" class="menu">
+                  <li class="menu-item menu-item-type-post_type menu-item-6">
+                  <xsl:if test="$channel = 'about'">
+                    <xsl:attribute name="class">current-menu-item</xsl:attribute>
+                  </xsl:if>
+                  <a href="/about/"><xsl:call-template name="gettext"><xsl:with-param name="lang"
+                    select="$lang"/><xsl:with-param name="msgid"
+                    select="'aboutlabel'"/></xsl:call-template>
+                  </a>
+                  </li>
+                  <li class="menu-item menu-item-type-post_type menu-item-23">
+                  <xsl:if test="$channel = 'users'">
+                    <xsl:attribute name="class">current-menu-item</xsl:attribute>
+                  </xsl:if>
+                  <a href="/users/"><xsl:call-template name="gettext"><xsl:with-param name="lang"
+                    select="$lang"/><xsl:with-param name="msgid"
+                    select="'userslabel'"/></xsl:call-template>
+                  </a>
+                  </li>
+                  <li class="menu-item menu-item-type-post_type menu-item-37">
+                  <xsl:if test="$channel = 'devel'">
+                    <xsl:attribute name="class">current-menu-item</xsl:attribute>
+                  </xsl:if>
+                  <a href="/devel/"><xsl:call-template name="gettext"><xsl:with-param name="lang"
+                    select="$lang"/><xsl:with-param name="msgid"
+                    select="'developerslabel'"/></xsl:call-template>
+                  </a>
+                  </li>
+                  <li class="menu-item menu-item-type-post_type menu-item-40">
+                  <xsl:if test="$channel = 'admin'">
+                    <xsl:attribute name="class">current-menu-item</xsl:attribute>
+                  </xsl:if>
+                  <a href="/admin/"><xsl:call-template name="gettext"><xsl:with-param name="lang"
+                    select="$lang"/><xsl:with-param name="msgid"
+                    select="'sysadminslabel'"/></xsl:call-template>
+                  </a>
+                  </li>
+</ul></div>                            </div>
+            <div class="right">
+                <form role="search" method="get" id="searchform" action="http://www.google.com/custom"; >
+                    <input type="hidden" name="domains" value="library.gnome.org" />
+                    <input type="hidden" name="sitesearch" value="library.gnome.org" />
+                    <div>
+                        <label class="hidden" for="q">
+                        <xsl:call-template name="gettext"><xsl:with-param name="lang"
+                        select="$lang"/><xsl:with-param name="msgid"
+                        select="'searchlabel'"/></xsl:call-template>:
+                        </label><input type="text" value="" name="q" id="s" placeholder="Search" />
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="clearfix"></div>
 </xsl:template>
 
 <xsl:template name="libgo.head">
-  <link rel="stylesheet" type="text/css" href="/skin/lgo.css"/>
-  <link media="print" rel="stylesheet" type="text/css" href="/skin/print.css"/>
+  <link rel="stylesheet" type="text/css" media="all"
+        href="http://wptest.gnome.org/wp-content/themes/gnome-grass/style.css"; />
+  <link rel="stylesheet" type="text/css" media="all" href="/skin/lgo2010.css"/>
+  <!-- XXX <link media="print" rel="stylesheet" type="text/css" href="/skin/print.css"/> -->
   <link rel="icon" type="image/png" href="/skin/gnome-16.png"/>
   <link rel="SHORTCUT ICON" type="image/png" href="/skin/gnome-16.png"/>
   <link rel="search" type="application/opensearchdescription+xml"
     href="/gnome-library-search.xml" title="GNOME Library Search" />
 </xsl:template>
 
+<xsl:template name="libgo.footer">
+    <div id="footer">
+        <div class="container_12">
+            <div class="links grid_9">
+                <div class="menu-footer-1-container"><ul id="menu-footer-1" class="menu"><li id="menu-item-88" class="menu-item menu-item-type-custom menu-item-home menu-item-88"><a href="http://wptest.gnome.org/";>The GNOME Project</a>
+<ul class="sub-menu">
+	<li id="menu-item-89" class="menu-item menu-item-type-post_type menu-item-89"><a href="http://wptest.gnome.org/about/";>What is GNOME?</a></li>
+	<li id="menu-item-90" class="menu-item menu-item-type-custom menu-item-90"><a href="#">Latest Release</a></li>
+	<li id="menu-item-91" class="menu-item menu-item-type-custom menu-item-91"><a href="#">News</a></li>
+	<li id="menu-item-92" class="menu-item menu-item-type-custom menu-item-92"><a href="http://foundation.gnome.org";>GNOME Foundation</a></li>
+</ul>
+</li>
+</ul></div><div class="menu-footer-2-container"><ul id="menu-footer-2" class="menu"><li id="menu-item-93" class="menu-item menu-item-type-post_type menu-item-93"><a href="http://wptest.gnome.org/about/";>About GNOME</a>
+<ul class="sub-menu">
+	<li id="menu-item-94" class="menu-item menu-item-type-custom menu-item-94"><a href="#">History</a></li>
+	<li id="menu-item-95" class="menu-item menu-item-type-post_type menu-item-95"><a href="http://wptest.gnome.org/about/foundation/";>The GNOME Foundation</a></li>
+	<li id="menu-item-96" class="menu-item menu-item-type-post_type menu-item-96"><a href="http://wptest.gnome.org/community/";>Community</a></li>
+	<li id="menu-item-97" class="menu-item menu-item-type-post_type menu-item-97"><a href="http://wptest.gnome.org/contact/";>Contact</a></li>
+	<li id="menu-item-98" class="menu-item menu-item-type-post_type menu-item-98"><a href="http://wptest.gnome.org/download/";>Download</a></li>
+</ul>
+</li>
+</ul></div><div class="menu-footer-3-container"><ul id="menu-footer-3" class="menu"><li id="menu-item-99" class="menu-item menu-item-type-post_type current-menu-item page_item page-item-30 current_page_item menu-item-99"><a href="http://wptest.gnome.org/support/";>Support</a>
+<ul class="sub-menu">
+	<li id="menu-item-100" class="menu-item menu-item-type-custom menu-item-100"><a href="#">Documentation</a></li>
+	<li id="menu-item-101" class="menu-item menu-item-type-custom menu-item-101"><a href="#">Forum</a></li>
+	<li id="menu-item-102" class="menu-item menu-item-type-custom menu-item-102"><a href="#">Mailing Lists</a></li>
+	<li id="menu-item-103" class="menu-item menu-item-type-custom menu-item-103"><a href="#">IRC Channels</a></li>
+</ul>
+</li>
+</ul></div><div class="menu-footer-4-container"><ul id="menu-footer-4" class="menu"><li id="menu-item-104" class="menu-item menu-item-type-custom menu-item-104"><a href="#">Development</a>
+<ul class="sub-menu">
+	<li id="menu-item-105" class="menu-item menu-item-type-custom menu-item-105"><a href="#">Wiki</a></li>
+	<li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-106"><a href="#">Guides</a></li>
+	<li id="menu-item-107" class="menu-item menu-item-type-custom menu-item-107"><a href="#">Development Tools</a></li>
+	<li id="menu-item-108" class="menu-item menu-item-type-custom menu-item-108"><a href="#">References</a></li>
+	<li id="menu-item-109" class="menu-item menu-item-type-custom menu-item-109"><a href="#">Projects</a></li>
+</ul>
+</li>
+</ul></div><div class="menu-footer-5-container"><ul id="menu-footer-5" class="menu"><li id="menu-item-110" class="menu-item menu-item-type-post_type menu-item-110"><a href="http://wptest.gnome.org/community/";>Community</a>
+<ul class="sub-menu">
+	<li id="menu-item-111" class="menu-item menu-item-type-custom menu-item-111"><a href="#">Contribute</a></li>
+	<li id="menu-item-112" class="menu-item menu-item-type-custom menu-item-112"><a href="#">GNOME Store</a></li>
+	<li id="menu-item-113" class="menu-item menu-item-type-custom menu-item-113"><a href="#">Become a friend of GNOME</a></li>
+	<li id="menu-item-114" class="menu-item menu-item-type-post_type menu-item-114"><a href="http://wptest.gnome.org/contact/";>Contact Us</a></li>
+</ul>
+</li>
+</ul></div>            </div>
+            <div class="links grid_3 right">
+                                <div><ul class="menu available_languages"><li><strong>Also available in:</strong><ul class="sub-menu"><li class="active"><a href="http://wptest.gnome.org/support/"; title="English">English</a></li><li><a href="http://wptest.gnome.org/pt-br/"; title="Portuguese (Brazil)">Português</a></li></ul></li></ul></div>            </div>
+            
+            <!-- footnotes -->
+            <div id="footnotes" class="grid_9">
+                Copyright © 2005â??2010 <strong class="gnome_logo">The GNOME Project</strong><br />
+                <small>Optimised for standards. Hosted by <a href="http://redhat.com";>Red Hat</a>.</small>
+            </div>
+            
+            <div class="clear"></div>
+        </div>
+    </div>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/data/xslt/html2html.xsl b/data/xslt/html2html.xsl
index c2f9c4f..fdb7f71 100644
--- a/data/xslt/html2html.xsl
+++ b/data/xslt/html2html.xsl
@@ -202,6 +202,15 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
   <xsl:template match="meta[ content='text/html; charset=US-ASCII']">
   </xsl:template>
 
+  <xsl:template match="html:div[ class='toc']">
+  </xsl:template>
+
+  <xsl:template match="html:div[ class='toc']" mode="sidebar">
+    <div class="sidebar">
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
   <xsl:template match="html:html">
     <html>
      <head>
@@ -218,12 +227,21 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
      </head>
      <body>
       <xsl:call-template name="libgo.header" />
-      <div class="body {$libgo.h2hmode}">
+      <div id="container">
+        <xsl:attribute name="class">
+          <xsl:value-of select="$libgo.h2hmode"/>
+          <xsl:if test="//html:div[ class='toc']">
+            <xsl:text> two_columns</xsl:text>
+          </xsl:if>
+        </xsl:attribute>
+        <div class="content">
         <xsl:if test="$libgo.originalhref">
+          <div class="action_box">
 	  <p class="canonical-ref">
           Canonical document reference:
 	  <a href="{$libgo.originalhref}"><xsl:value-of select="$libgo.originalhref"/></a>
 	  </p>
+          </div>
 	</xsl:if>
         <xsl:choose>
           <xsl:when test="$libgo.h2hmode = 'gtkmm'">
@@ -250,7 +268,10 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
             <xsl:apply-templates select="html:body/*"/>
           </xsl:otherwise>
         </xsl:choose>
+        </div>
+        <xsl:apply-templates select="//html:div[ class='toc']" mode="sidebar"/>
       </div>
+      <xsl:call-template name="libgo.footer"/>
      </body>
     </html>
   </xsl:template>
diff --git a/data/xslt/indexes.xsl b/data/xslt/indexes.xsl
index 9c59d67..4b5f44d 100644
--- a/data/xslt/indexes.xsl
+++ b/data/xslt/indexes.xsl
@@ -20,11 +20,11 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-                xmlns:exsl="http://exslt.org/common";
-                xmlns:html="http://www.w3.org/1999/xhtml";
-                extension-element-prefixes="exsl"
-                xsl:exclude-result-prefixes="sitemap"
-                version="1.0">
+	xmlns:exsl="http://exslt.org/common";
+	xmlns:html="http://www.w3.org/1999/xhtml";
+	extension-element-prefixes="exsl"
+	xsl:exclude-result-prefixes="sitemap"
+	version="1.0">
 
 
 <xsl:import href="heading.xsl"/>
@@ -39,258 +39,262 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
 <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
 
 <xsl:output method="html" encoding="UTF-8" indent="yes"
-        omit-xml-declaration="yes"
-	doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
+omit-xml-declaration="yes"
+doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
 
 <xsl:namespace-alias stylesheet-prefix="html" result-prefix="#default"/>
 
-  <xsl:template name="footer">
-    <div id="footer">
-      <p>
-        Copyright © 2007, 2008 <a href="http://www.gnome.org/";>The GNOME Project</a>.
-	<br />
-	GNOME and the foot logo are trademarks of the GNOME Foundation.
-	<br />
-	Hosted documents have their own copyright notices.
-        <br />
-        <a href="http://validator.w3.org/check/referer";>Optimised</a> for <a
-	href="http://www.w3.org/";>standards</a>.
-	Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.
-      </p>
+<xsl:template name="footer">
+<div id="footer">
+<p>
+Copyright © 2007, 2008 <a href="http://www.gnome.org/";>The GNOME Project</a>.
+<br />
+GNOME and the foot logo are trademarks of the GNOME Foundation.
+<br />
+Hosted documents have their own copyright notices.
+<br />
+<a href="http://validator.w3.org/check/referer";>Optimised</a> for <a
+href="http://www.w3.org/";>standards</a>.
+Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.
+</p>
+</div>
+</xsl:template>
+
+<xsl:template name="category-title">
+<xsl:param name="lang"/>
+<xsl:param name="tocid"/>
+
+<xsl:variable name="rtocid">
+<xsl:choose>
+<xsl:when test="document('../externals/toc.xml')//toc[ id = $tocid]">
+  <xsl:value-of select="$tocid"/>
+</xsl:when>
+<!-- Rarian 0.8 changed all toc id; as library still needs to handle
+     older documents, here is a quick mapping -->
+<xsl:when test="$tocid = 'index'">Core</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsAccessibility'">Accessibility</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsAccessories'">Utility</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsEducation'">Education</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsGames'">Game</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsGraphics'">Graphics</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsInternet'">Network</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsOffice'">Office</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsOther'">Other</xsl:when>
+<xsl:when test="$tocid = 'DesktopApplets'">Other</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsScientific'">Science</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsMultimedia'">AudioVideo</xsl:when>
+<xsl:when test="$tocid = 'ApplicationsSystem'">System</xsl:when>
+</xsl:choose>
+</xsl:variable>
+
+<xsl:choose>
+<xsl:when test="document('../externals/toc.xml')//toc[ id = $rtocid]/title">
+<xsl:variable name="cat-icon"
+	select="document('../externals/toc.xml')//toc[ id = $rtocid]/@icon"/>
+<h2>
+  <xsl:attribute name="class">category<xsl:if test="$cat-icon != ''"
+	> cat-<xsl:value-of select="$cat-icon"/></xsl:if></xsl:attribute>
+  <xsl:if test="$cat-icon != ''">
+    <xsl:attribute name="id"><xsl:value-of select="$cat-icon"/></xsl:attribute>
+  </xsl:if>
+<xsl:choose>
+  <xsl:when test="document('../externals/toc.xml')//toc[ id = $rtocid]/title[ xml:lang = $lang]">
+    <xsl:value-of select="document('../externals/toc.xml')//toc[ id = $rtocid]/title[ xml:lang = $lang]"/>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:value-of select="document('../externals/toc.xml')//toc[ id = $rtocid]/title"/>
+  </xsl:otherwise>
+</xsl:choose>
+</h2>
+</xsl:when>
+<xsl:otherwise>
+<h2 class="category cat-{$tocid}" id="{$tocid}">
+  <xsl:call-template name="gettext"><xsl:with-param name="lang"
+    select="$lang"/><xsl:with-param name="msgid"
+    select="$tocid"/></xsl:call-template>
+</h2>
+</xsl:otherwise>
+</xsl:choose>
+
+</xsl:template>
+
+
+<xsl:template name="language-label">
+<xsl:param name="lang"/>
+<xsl:choose>
+<xsl:when test="document('../languages.xml')//lang[ code = $lang]">
+<xsl:value-of select="document('../languages.xml')//lang[ code =
+$lang]"/>
+</xsl:when>
+<xsl:when test="document('../languages.xml')//lang[substring(@code, 1, 2) = $lang]">
+<xsl:value-of
+select="document('../languages.xml')//lang[substring(@code, 1, 2) =
+$lang]"/>
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="$lang"/>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<xsl:template match="subsection" mode="title">
+<xsl:param name="lang"/>
+<xsl:choose>
+<xsl:when test="title[ xml:lang = $lang]">
+<xsl:value-of select="title[ xml:lang = $lang]"/>
+</xsl:when>
+<xsl:otherwise><xsl:value-of select="title"/></xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<xsl:template match="subsection" mode="intro">
+<xsl:param name="lang"/>
+<xsl:if test="intro">
+<p>
+<xsl:choose>
+<xsl:when test="intro[ xml:lang = $lang]">
+  <xsl:value-of select="intro[ xml:lang = $lang]"/>
+</xsl:when>
+<xsl:otherwise><xsl:value-of select="intro"/></xsl:otherwise>
+</xsl:choose>
+</p>
+</xsl:if>
+</xsl:template>
+
+
+
+<xsl:template name="overlay-section-title">
+<xsl:param name="lang"/>
+<xsl:choose>
+<xsl:when test="document('../overlay.xml')//subsection[ code = $lang]">
+<xsl:value-of select="document('../languages.xml')//lang[ code =
+$lang]"/>
+</xsl:when>
+<xsl:when test="document('../languages.xml')//lang[substring(@code, 1, 2) = $lang]">
+<xsl:value-of
+select="document('../languages.xml')//lang[substring(@code, 1, 2) =
+$lang]"/>
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="$lang"/>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+
+
+<xsl:template match="document" mode="channelindex">
+<xsl:param name="lang"/>
+<dt>
+<xsl:if test="keywords/keyword[. = 'upcoming-deprecation']">
+<xsl:attribute name="class">upcoming-deprecation</xsl:attribute>
+</xsl:if>
+<a lang="{ lang}">
+<xsl:attribute name="href">
+  <xsl:if test="@path"><xsl:value-of select="@path"/></xsl:if>
+  <xsl:if test="@href"><xsl:value-of select="@href"/></xsl:if>
+</xsl:attribute>
+<xsl:if test="@href">
+  <xsl:attribute name="class">external</xsl:attribute>
+</xsl:if>
+<xsl:choose>
+<xsl:when test="normalize-space(title)">
+  <xsl:value-of select="title" />
+</xsl:when>
+<xsl:otherwise>
+  <xsl:value-of select="@module" />
+</xsl:otherwise>
+</xsl:choose>
+</a>
+<xsl:if test="@path and versions/version">
+<xsl:text> </xsl:text>
+<span class="module-more">[<a href="{ modulename}/"><xsl:call-template
+    name="gettext"><xsl:with-param name="lang"
+    select="@lang"/><xsl:with-param name="msgid"
+    select="'more-versions-languages-or-options'"/></xsl:call-template></a>]</span>
+</xsl:if>
+<xsl:if test="@href">
+<xsl:text> </xsl:text>
+<span class="module-more">[<xsl:call-template
+    name="gettext"><xsl:with-param name="lang"
+    select="$lang"/><xsl:with-param name="msgid"
+    select="'external-resource'"/></xsl:call-template>]</span>
+</xsl:if>
+</dt>
+
+<dd>
+<xsl:if test="abstract">
+<p><xsl:value-of select="abstract" /></p>
+</xsl:if>
+<xsl:if test="keywords/keyword[. = 'upcoming-deprecation']">
+<p class="upcoming-deprecation">
+ <xsl:call-template name="gettext"><xsl:with-param name="lang"
+      select="$lang"/><xsl:with-param name="msgid"
+      select="'upcoming-deprecation'"/></xsl:call-template>
+</p>
+</xsl:if>
+<xsl:if test="count(versions/version) > 1 and versions/version[ keyword = 'unstable']">
+<p class="other-versions">
+ <xsl:call-template name="gettext"><xsl:with-param name="lang"
+      select="$lang"/><xsl:with-param name="msgid"
+      select="'see-also'"/></xsl:call-template><xsl:text> </xsl:text>
+  <a href="{ modulename}/unstable/" lang="{ lang}"><xsl:call-template
+    name="gettext"><xsl:with-param name="lang"
+      select="$lang"/><xsl:with-param name="msgid"
+      select="'development-version-doc'"/></xsl:call-template></a>
+</p>
+</xsl:if>
+<xsl:if test="substring($lang, 1, 2) != substring(@lang, 1, 2) and @path">
+<p class="no-translation">
+  <xsl:call-template name="gettext"><xsl:with-param name="lang"
+    select="$lang"/><xsl:with-param name="msgid"
+    select="'missing-translation'"/></xsl:call-template>
+  <xsl:if test="other-languages/lang and @modulename">
+    (<a href="/{ channel}/{ modulename}/">
+      <xsl:call-template name="gettext"><xsl:with-param name="lang"
+	select="$lang"/><xsl:with-param name="msgid"
+	select="'doc-translations'"/></xsl:call-template>
+    </a>)
+  </xsl:if>
+</p>
+</xsl:if>
+</dd>
+</xsl:template>
+
+<xsl:template match="document[ path != '']" mode="modindex">
+<xsl:param name="lang"/>
+<xsl:if test="concat('/', @channel, '/', @modulename, '/') != @path">
+<!-- don't write document index if the document is not versioned -->
+<xsl:variable name="modulename" select="@modulename"/>
+
+<xsl:if test="$libgo.debug">
+<xsl:message>Writing <xsl:value-of
+	select="concat(@channel, '/', @modulename, '/index.html.', $lang)" /></xsl:message>
+</xsl:if>
+
+<exsl:document href="{ channel}/{ modulename}/index.html.{$lang}"
+method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"
+doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+doctype-system="http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="{$lang}">
+<head>
+  <title><xsl:value-of select="title" /> - GNOME Library</title>
+  <xsl:call-template name="libgo.head"/>
+  <script type="text/javascript" src="/js/strings.js" />
+</head>
+<body class="with-star">
+  <xsl:call-template name="libgo.header">
+    <xsl:with-param name="channel" select="@channel"/>
+    <xsl:with-param name="lang" select="$lang"/>
+  </xsl:call-template>
+  <div id="container" class="two_columns">
+    <div class="container_12">
+    <div class="page_title">
+      <h1 class="article title"><a href="{ path}"
+          lang="{ lang}"><xsl:value-of select="title"/></a></h1>
     </div>
-  </xsl:template>
-
-  <xsl:template name="category-title">
-    <xsl:param name="lang"/>
-    <xsl:param name="tocid"/>
-
-    <xsl:variable name="rtocid">
-      <xsl:choose>
-        <xsl:when test="document('../externals/toc.xml')//toc[ id = $tocid]">
-          <xsl:value-of select="$tocid"/>
-        </xsl:when>
-	<!-- Rarian 0.8 changed all toc id; as library still needs to handle
-	     older documents, here is a quick mapping -->
-        <xsl:when test="$tocid = 'index'">Core</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsAccessibility'">Accessibility</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsAccessories'">Utility</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsEducation'">Education</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsGames'">Game</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsGraphics'">Graphics</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsInternet'">Network</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsOffice'">Office</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsOther'">Other</xsl:when>
-        <xsl:when test="$tocid = 'DesktopApplets'">Other</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsScientific'">Science</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsMultimedia'">AudioVideo</xsl:when>
-        <xsl:when test="$tocid = 'ApplicationsSystem'">System</xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="document('../externals/toc.xml')//toc[ id = $rtocid]/title">
-        <xsl:variable name="cat-icon"
-                select="document('../externals/toc.xml')//toc[ id = $rtocid]/@icon"/>
-        <h2>
-          <xsl:attribute name="class">category<xsl:if test="$cat-icon != ''"
-                > cat-<xsl:value-of select="$cat-icon"/></xsl:if></xsl:attribute>
-          <xsl:if test="$cat-icon != ''">
-            <xsl:attribute name="id"><xsl:value-of select="$cat-icon"/></xsl:attribute>
-          </xsl:if>
-        <xsl:choose>
-          <xsl:when test="document('../externals/toc.xml')//toc[ id = $rtocid]/title[ xml:lang = $lang]">
-            <xsl:value-of select="document('../externals/toc.xml')//toc[ id = $rtocid]/title[ xml:lang = $lang]"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="document('../externals/toc.xml')//toc[ id = $rtocid]/title"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        </h2>
-      </xsl:when>
-      <xsl:otherwise>
-        <h2 class="category cat-{$tocid}" id="{$tocid}">
-          <xsl:call-template name="gettext"><xsl:with-param name="lang"
-            select="$lang"/><xsl:with-param name="msgid"
-            select="$tocid"/></xsl:call-template>
-        </h2>
-      </xsl:otherwise>
-    </xsl:choose>
-
-  </xsl:template>
-
-
-  <xsl:template name="language-label">
-    <xsl:param name="lang"/>
-    <xsl:choose>
-      <xsl:when test="document('../languages.xml')//lang[ code = $lang]">
-        <xsl:value-of select="document('../languages.xml')//lang[ code =
-        $lang]"/>
-      </xsl:when>
-      <xsl:when test="document('../languages.xml')//lang[substring(@code, 1, 2) = $lang]">
-        <xsl:value-of
-        select="document('../languages.xml')//lang[substring(@code, 1, 2) =
-        $lang]"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$lang"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="subsection" mode="title">
-    <xsl:param name="lang"/>
-    <xsl:choose>
-      <xsl:when test="title[ xml:lang = $lang]">
-        <xsl:value-of select="title[ xml:lang = $lang]"/>
-      </xsl:when>
-      <xsl:otherwise><xsl:value-of select="title"/></xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="subsection" mode="intro">
-    <xsl:param name="lang"/>
-    <xsl:if test="intro">
-      <p>
-      <xsl:choose>
-        <xsl:when test="intro[ xml:lang = $lang]">
-          <xsl:value-of select="intro[ xml:lang = $lang]"/>
-        </xsl:when>
-        <xsl:otherwise><xsl:value-of select="intro"/></xsl:otherwise>
-      </xsl:choose>
-      </p>
-    </xsl:if>
-  </xsl:template>
-
-
-
-  <xsl:template name="overlay-section-title">
-    <xsl:param name="lang"/>
-    <xsl:choose>
-      <xsl:when test="document('../overlay.xml')//subsection[ code = $lang]">
-        <xsl:value-of select="document('../languages.xml')//lang[ code =
-        $lang]"/>
-      </xsl:when>
-      <xsl:when test="document('../languages.xml')//lang[substring(@code, 1, 2) = $lang]">
-        <xsl:value-of
-        select="document('../languages.xml')//lang[substring(@code, 1, 2) =
-        $lang]"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$lang"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-
-
-  <xsl:template match="document" mode="channelindex">
-    <xsl:param name="lang"/>
-    <dt>
-      <xsl:if test="keywords/keyword[. = 'upcoming-deprecation']">
-        <xsl:attribute name="class">upcoming-deprecation</xsl:attribute>
-      </xsl:if>
-      <a lang="{ lang}">
-        <xsl:attribute name="href">
-          <xsl:if test="@path"><xsl:value-of select="@path"/></xsl:if>
-          <xsl:if test="@href"><xsl:value-of select="@href"/></xsl:if>
-        </xsl:attribute>
-        <xsl:if test="@href">
-          <xsl:attribute name="class">external</xsl:attribute>
-        </xsl:if>
-      <xsl:choose>
-	<xsl:when test="normalize-space(title)">
-	  <xsl:value-of select="title" />
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@module" />
-	</xsl:otherwise>
-      </xsl:choose>
-      </a>
-      <xsl:if test="@path and versions/version">
-      <xsl:text> </xsl:text>
-      <span class="module-more">[<a href="{ modulename}/"><xsl:call-template
-            name="gettext"><xsl:with-param name="lang"
-            select="@lang"/><xsl:with-param name="msgid"
-            select="'more-versions-languages-or-options'"/></xsl:call-template></a>]</span>
-      </xsl:if>
-      <xsl:if test="@href">
-      <xsl:text> </xsl:text>
-      <span class="module-more">[<xsl:call-template
-            name="gettext"><xsl:with-param name="lang"
-            select="$lang"/><xsl:with-param name="msgid"
-            select="'external-resource'"/></xsl:call-template>]</span>
-      </xsl:if>
-    </dt>
-
-    <dd>
-      <xsl:if test="abstract">
-        <p><xsl:value-of select="abstract" /></p>
-      </xsl:if>
-      <xsl:if test="keywords/keyword[. = 'upcoming-deprecation']">
-        <p class="upcoming-deprecation">
-         <xsl:call-template name="gettext"><xsl:with-param name="lang"
-              select="$lang"/><xsl:with-param name="msgid"
-              select="'upcoming-deprecation'"/></xsl:call-template>
-        </p>
-      </xsl:if>
-      <xsl:if test="count(versions/version) > 1 and versions/version[ keyword = 'unstable']">
-        <p class="other-versions">
-         <xsl:call-template name="gettext"><xsl:with-param name="lang"
-              select="$lang"/><xsl:with-param name="msgid"
-              select="'see-also'"/></xsl:call-template><xsl:text> </xsl:text>
-          <a href="{ modulename}/unstable/" lang="{ lang}"><xsl:call-template
-            name="gettext"><xsl:with-param name="lang"
-              select="$lang"/><xsl:with-param name="msgid"
-              select="'development-version-doc'"/></xsl:call-template></a>
-        </p>
-      </xsl:if>
-      <xsl:if test="substring($lang, 1, 2) != substring(@lang, 1, 2) and @path">
-        <p class="no-translation">
-          <xsl:call-template name="gettext"><xsl:with-param name="lang"
-            select="$lang"/><xsl:with-param name="msgid"
-            select="'missing-translation'"/></xsl:call-template>
-          <xsl:if test="other-languages/lang and @modulename">
-            (<a href="/{ channel}/{ modulename}/">
-              <xsl:call-template name="gettext"><xsl:with-param name="lang"
-                select="$lang"/><xsl:with-param name="msgid"
-                select="'doc-translations'"/></xsl:call-template>
-            </a>)
-          </xsl:if>
-        </p>
-      </xsl:if>
-    </dd>
-  </xsl:template>
-
-  <xsl:template match="document[ path != '']" mode="modindex">
-    <xsl:param name="lang"/>
-    <xsl:if test="concat('/', @channel, '/', @modulename, '/') != @path">
-       <!-- don't write document index if the document is not versioned -->
-    <xsl:variable name="modulename" select="@modulename"/>
-
-    <xsl:if test="$libgo.debug">
-      <xsl:message>Writing <xsl:value-of
-                select="concat(@channel, '/', @modulename, '/index.html.', $lang)" /></xsl:message>
-    </xsl:if>
-
-    <exsl:document href="{ channel}/{ modulename}/index.html.{$lang}"
-        method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"
-        doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-        doctype-system="http://www.w3.org/TR/html4/loose.dtd";>
-      <html lang="{$lang}">
-	<head>
-	  <title><xsl:value-of select="title" /> - GNOME Library</title>
-	  <xsl:call-template name="libgo.head"/>
-          <script type="text/javascript" src="/js/strings.js" />
-	</head>
-	<body class="with-star">
-	  <xsl:call-template name="libgo.header">
-            <xsl:with-param name="channel" select="@channel"/>
-	    <xsl:with-param name="lang" select="$lang"/>
-          </xsl:call-template>
-	  <div class="body body-sidebar">
-	    <h1 class="article title"><a href="{ path}"
-	      lang="{ lang}"><xsl:value-of select="title"/></a></h1>
+    <div class="content">
 	    <xsl:if test="abstract">
 	    <p>
 	     <xsl:value-of select="abstract" />
@@ -417,8 +421,10 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
             <script type="text/javascript" src="/js/language.js" />
             </div>
             </xsl:if>
+	    </div>
 	  </div>
-	  <xsl:call-template name="footer"/>
+          </div>
+	  <xsl:call-template name="libgo.footer"/>
 	</body>
       </html>
     </exsl:document>
@@ -594,10 +600,12 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
             <xsl:with-param name="channel" select="@channel"/>
             <xsl:with-param name="lang" select="@lang"/>
           </xsl:call-template>
-	  <div class="body body-sidebar">
+	  <div id="container" class="two_columns">
+	    <div class="container_12">
 	    <xsl:if test="title">
-	      <h1 class="subindex" id="subindex-{ id}"><xsl:value-of select="title"/></h1>
+	      <div class="page_title"><h1 class="subindex" id="subindex-{ id}"><xsl:value-of select="title"/></h1></div>
 	    </xsl:if>
+            <div class="content">
 	    <xsl:apply-templates select="section" mode="channelindex">
               <xsl:sort select="format-number(@weight, '0.000')" order="descending"/>
 	      <xsl:sort select="translate(@toc_id, $ucletters, $lcletters)" />
@@ -607,6 +615,7 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
 	    <xsl:apply-templates select="index" mode="channelindex">
               <xsl:sort select="format-number(@weight, '0.000')" order="descending"/>
 	    </xsl:apply-templates>
+            </div>
 	  </div>
           <div class="sidebar">
             <xsl:if test="@channel = 'users'">
@@ -695,7 +704,8 @@ $('#symbol').autocomplete('/symbols/lookup/',
 	    </ul>
             <script type="text/javascript" src="/js/language.js" />
           </div>
-	  <xsl:call-template name="footer"/>
+	  </div>
+	  <xsl:call-template name="libgo.footer"/>
 	</body>
       </html>
     </exsl:document>
@@ -726,7 +736,8 @@ div.body-sidebar { width: 100%; }
             <xsl:with-param name="channel" select="'home'"/>
             <xsl:with-param name="lang" select="@lang"/>
           </xsl:call-template>
-	  <div class="body body-sidebar">
+	  <div id="container" class="two_columns">
+            <div class="content">
             <div id="usr">
               <h2><a href="users/">
                 <xsl:call-template name="gettext"><xsl:with-param name="lang"
@@ -751,7 +762,6 @@ div.body-sidebar { width: 100%; }
                 select="'developerstext'"/></xsl:call-template>
               </p>
             </div>
-	    <br class="clear"/>
             <div id="adm">
               <h2><a href="admin/">
                 <xsl:call-template name="gettext"><xsl:with-param name="lang"
@@ -786,7 +796,8 @@ div.body-sidebar { width: 100%; }
 	    </ul>
             <script type="text/javascript" src="/js/language.js" />
           </div>
-	  <xsl:call-template name="footer"/>
+          </div>
+	  <xsl:call-template name="libgo.footer"/>
 	</body>
       </html>
     </exsl:document>
@@ -810,8 +821,9 @@ div.body-sidebar { width: 100%; }
 	<body class="with-star">
 	  <xsl:call-template name="libgo.header">
           </xsl:call-template>
-	  <div class="body body-sidebar">
-	  <h1 class="title">Nightly Generated Documents</h1>
+	  <div id="container" class="two_columns">
+	    <div class="container_12">
+	  <div class="page_title"><h1 class="title">Nightly Generated Documents</h1></div>
 	  <ul>
 	  <xsl:for-each select="index[ lang = 'en']//document">
 	  <xsl:if test="versions/version[ href='nightly'] = 'nightly'">
@@ -820,6 +832,8 @@ div.body-sidebar { width: 100%; }
 	  </xsl:for-each>
 	  </ul>
 	  </div>
+	  </div>
+	  <xsl:call-template name="libgo.footer"/>
 	</body>
       </html>
     </exsl:document>
diff --git a/data/xslt/mal2html.xsl b/data/xslt/mal2html.xsl
index 2034755..140085c 100644
--- a/data/xslt/mal2html.xsl
+++ b/data/xslt/mal2html.xsl
@@ -96,9 +96,9 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
       <title>
         <xsl:apply-templates mode="html.title.mode" select="$node"/>
       </title>
-      <xsl:call-template name="libgo.head"/>
       <xsl:call-template name="html.head.custom"/>
       <xsl:call-template name="html.css"/>
+      <xsl:call-template name="libgo.head"/>
       <link rel="stylesheet" type="text/css" href="/skin/mallard.css"/>
     </head>
     <body>
@@ -106,15 +106,18 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
       <xsl:call-template name="libgo.header">
         <xsl:with-param name="lang"><xsl:value-of select="$libgo.lang"/></xsl:with-param>
       </xsl:call-template>
+      <div id="container">
       <div class="head">
         <xsl:apply-templates mode="html.header.mode" select="$node"/>
       </div>
       <div class="body">
         <xsl:apply-templates mode="html.body.mode" select="$node"/>
       </div>
+      </div>
       <div class="footer">
         <xsl:apply-templates mode="html.footer.mode" select="$node"/>
       </div>
+      <xsl:call-template name="libgo.footer"/>
     </body>
   </html>
 </xsl:template>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]