--- trunk/pts/www/xsl/pts.xsl	2007/12/01 09:44:27	1769
+++ trunk/pts/www/xsl/pts.xsl	2008/03/15 15:31:44	1834
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-# Copyright 2002-2007 Raphaël Hertzog and others
+# Copyright 2002-2008 Raphaël Hertzog and others
+# Copyright 2007-2008 Stefano Zacchiroli
 # This file is distributed under the terms of the General Public License
 # version 2 or (at your option) any later version.
 -->
@@ -29,11 +30,14 @@
 <xsl:param name="hasnews" select="''"/>
 <xsl:param name="hasexcuse" select="''"/>
 
-<xsl:variable name="other" select="document(concat('../base/', $dir, '/other.xml'))/other"/>
+<xsl:variable name="other"
+  select="document(concat('../base/', $dir, '/other.xml'))/other"/>
+<xsl:variable name="low-nmu-emails"
+  select="document('../base/low_threshold_nmu.emails.xml')/emails"/>
 
 <!-- Those variables controls the todo and problem item concerning
      standards-version not being up to date -->
-<xsl:variable name="lastsv" select="'3.7.2'"/>
+<xsl:variable name="lastsv" select="'3.7.3'"/>
 <xsl:variable name="lastmajorsv" select="'3.'"/>
 
 <!-- Named templates aka functions -->
@@ -80,6 +84,12 @@
   </xsl:if>
 </xsl:template>
 
+<xsl:variable name="escaped-package">
+  <xsl:call-template name="escape-name">
+    <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
+  </xsl:call-template>
+</xsl:variable>
+
 <!-- Strip epoch -->
 <xsl:template name="strip-epoch">
   <xsl:param name="version"/>
@@ -122,14 +132,14 @@
 </xsl:template>
 
 <xsl:template name="add-maintenance-info">
+  <xsl:param name="email" />
   <xsl:variable name="dm">
     <xsl:if test="dm-upload-allowed and string(dm-upload-allowed)='yes'">
       <xsl:text>true</xsl:text>
     </xsl:if>
   </xsl:variable>
   <xsl:variable name="lownmu">
-    <xsl:if test="maintainer/low-threshold-nmu
-        and string(maintainer/low-threshold-nmu)='yes'">
+    <xsl:if test="$low-nmu-emails/email[text()=$email]">
       <xsl:text>true</xsl:text>
     </xsl:if>
   </xsl:variable>
@@ -145,6 +155,7 @@
 	  <span class="dm-tag">
 	    <a href="http://www.debian.org/vote/2007/vote_003"><acronym title="Debian Maintainer Upload Allowed: can be uploaded by Debian Maintainers">DMUA</acronym></a>
 	  </span>
+          <xsl:text> </xsl:text>
 	</xsl:if>
 
         <xsl:if test="string($lownmu)!=''">
@@ -152,6 +163,7 @@
             <a href="http://wiki.debian.org/LowThresholdNmu"><acronym
                 title="maintainer agrees with Low Threshold NMU, see wiki page for details">LowNMU</acronym></a>
 	  </span>
+          <xsl:text> </xsl:text>
         </xsl:if>
       </td>
     </tr>
@@ -164,11 +176,11 @@
   <xsl:if test="count($news)>0 and string($news)!=''">
     <tr class="titlerow">
     <td class="titlecell">
-      Latest News <a class="feedlink" href="{$package}/news.rss20.xml">RSS</a>
+      Latest news <a class="feedlink" href="{$package}/news.rss20.xml">RSS</a>
     </td></tr>
     <tr class="normalrow">
     <td class="contentcell2">
-    <ul><xsl:copy-of select="$news"/></ul>
+    <ul id="news-list"><xsl:copy-of select="$news"/></ul>
     </td>
     </tr>
   </xsl:if>
@@ -200,7 +212,7 @@
     <xsl:when test="substring(filename,string-length(filename)-6, 7)='diff.gz'">
       <xsl:text>diff</xsl:text>
     </xsl:when>
-    <xsl:when test="substring(filename,string-length(filename)-10, 8)='orig.tar'">
+    <xsl:when test="substring(filename,string-length(filename)-5, 3)='tar'">
       <xsl:text>orig</xsl:text>
     </xsl:when>
     <xsl:otherwise><xsl:text></xsl:text></xsl:otherwise>
@@ -249,7 +261,7 @@
     </td>
   </tr>
   <tr class="normalrow">
-    <td class="labelcell"><a href="http://www.debian.org/doc/manuals/developers-reference/ch-pkgs.en.html#s-collaborative-maint">Co-Maintainers</a></td>
+    <td class="labelcell"><a href="http://www.debian.org/doc/manuals/developers-reference/ch-pkgs.en.html#s-collaborative-maint">Uploaders</a></td>
     <td class="contentcell">
       <xsl:if test="uploaders">
 	<xsl:for-each select="uploaders/item">
@@ -272,15 +284,21 @@
       <xsl:if test="not(uploaders)">
 	<a class="none" title="You should find some co-maintainers ..." name="fake">None</a>
       </xsl:if>
-      <xsl:call-template name='add-maintenance-info' />
+      <xsl:call-template name='add-maintenance-info'>
+        <xsl:with-param name="email" select="maintainer/email" />
+      </xsl:call-template>
   </td></tr>
   <tr class="normalrow">
-    <td class="labelcell">Standards-Version</td>
+    <td class="labelcell">Standards version</td>
     <td class="contentcell"><xsl:value-of select="standards-version"/></td>
   </tr>
   <tr class="normalrow">
-    <td class="labelcell">Priority &amp; Section</td>
-    <td class="contentcell"><xsl:value-of select="priority"/> - <xsl:value-of select="section"/></td>
+    <td class="labelcell">Priority</td>
+    <td class="contentcell"> <xsl:value-of select="priority"/> </td>
+  </tr>
+  <tr class="normalrow">
+    <td class="labelcell">Section</td>
+    <td class="contentcell"> <xsl:value-of select="section"/> </td>
   </tr>
   <xsl:call-template name='add-vcs-info' />
   <xsl:if test="architecture!='any' and architecture!='all'">
@@ -294,11 +312,24 @@
 <xsl:template name="bugs-count">
   <tr class="titlerow">
     <td class="titlecell" colspan="2">
-      Bugs count
+      Bugs count 
     </td>
   </tr>
   <tr class="normalrow" id="bugs_all">
-    <td class="labelcell">All bugs</td>
+    <td class="labelcell">All bugs
+       (<xsl:element name="a">
+	<xsl:attribute name="href">
+	  <xsl:text>http://people.debian.org/~glandium/bts/</xsl:text>
+	  <xsl:value-of select="substring($package, 1, 1)"/>
+	  <xsl:text>/</xsl:text>
+	  <xsl:call-template name="escape-name">
+	    <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
+	  </xsl:call-template>
+	  <xsl:text>.png</xsl:text>
+	</xsl:attribute>
+	<xsl:text>graph</xsl:text>
+      </xsl:element>)
+    </td>
     <td class="contentcell">
       <xsl:element name="a">
 	<xsl:attribute name="href">
@@ -331,7 +362,7 @@
     </td>
   </tr>
   <tr class="normalrow" id="bugs_in">
-    <td class="labelcell"><span class="indented"><acronym title="Important and Normal">I&amp;N bugs</acronym></span></td>
+    <td class="labelcell"><span class="indented"><acronym title="Important and Normal">I&amp;N</acronym> bugs</span></td>
     <td class="contentcell">
       <xsl:element name="a">
 	<xsl:attribute name="href">
@@ -348,7 +379,7 @@
     </td>
   </tr>
   <tr class="normalrow" id="bugs_mw">
-    <td class="labelcell"><span class="indented"><acronym title="Minor and Wishlist">M&amp;W bugs</acronym></span></td>
+    <td class="labelcell"><span class="indented"><acronym title="Minor and Wishlist">M&amp;W</acronym> bugs</span></td>
     <td class="contentcell">
       <xsl:element name="a">
 	<xsl:attribute name="href">
@@ -365,7 +396,7 @@
     </td>
   </tr>
   <tr class="normalrow" id="bugs_fp">
-    <td class="labelcell"><span class="indented"><acronym title="Fixed and Pending">F&amp;P bugs</acronym></span></td>
+    <td class="labelcell"><span class="indented"><acronym title="Fixed and Pending">F&amp;P</acronym> bugs</span></td>
     <td class="contentcell">
       <xsl:element name="a">
 	<xsl:attribute name="href">
@@ -492,7 +523,8 @@
     <tr class="normalrow">
       <td class="labelcell"><a href="http://www.debian.org/releases/sarge/">Oldstable</a></td>
       <td class="contentcell">
-	<xsl:value-of select="document(concat('../base/', $dir, '/oldstable.xml'))/source/version"/>
+        <a href="http://packages.debian.org/source/oldstable/{$package}"><xsl:value-of
+            select="document(concat('../base/', $dir, '/oldstable.xml'))/source/version"/></a>
       </td>
     </tr>
   </xsl:if>
@@ -510,7 +542,8 @@
     <tr class="normalrow">
       <td class="labelcell"><a href="http://www.debian.org/releases/stable/">Stable</a></td>
       <td class="contentcell">
-	<xsl:value-of select="document(concat('../base/', $dir, '/stable.xml'))/source/version"/>
+        <a href="http://packages.debian.org/source/stable/{$package}"><xsl:value-of
+            select="document(concat('../base/', $dir, '/stable.xml'))/source/version"/></a>
       </td>
     </tr>
   </xsl:if>
@@ -536,7 +569,8 @@
     <tr class="normalrow">
       <td class="labelcell"><a href="http://www.debian.org/releases/testing/">Testing</a></td>
       <td class="contentcell">
-	<xsl:value-of select="document(concat('../base/', $dir, '/testing.xml'))/source/version"/>
+        <a href="http://packages.debian.org/source/testing/{$package}"><xsl:value-of
+            select="document(concat('../base/', $dir, '/testing.xml'))/source/version"/></a>
       </td>
     </tr>
   </xsl:if>
@@ -562,7 +596,8 @@
     <tr class="normalrow">
       <td class="labelcell">Unstable</td>
       <td class="contentcell">
-	<xsl:value-of select="document(concat('../base/', $dir, '/unstable.xml'))/source/version"/>
+        <a href="http://packages.debian.org/source/unstable/{$package}"><xsl:value-of
+            select="document(concat('../base/', $dir, '/unstable.xml'))/source/version"/></a>
       </td>
     </tr>
   </xsl:if>
@@ -572,7 +607,8 @@
     <tr class="normalrow">
       <td class="labelcell">Experimental</td>
       <td class="contentcell">
-	<xsl:value-of select="document(concat('../base/', $dir, '/experimental.xml'))/source/version"/>
+        <a href="http://packages.debian.org/source/experimental/{$package}"><xsl:value-of
+            select="document(concat('../base/', $dir, '/experimental.xml'))/source/version"/></a>
       </td>
     </tr>
   </xsl:if>
@@ -641,6 +677,9 @@
   <tr>
     <td class="contentcell" colspan="2" style="text-align: left">
       <ul>
+        <xsl:if test="homepage">
+          <li> <a href="{homepage}">Upstream homepage</a> </li>
+        </xsl:if>
 	<li>
 	  <xsl:element name="a">
 	    <xsl:attribute name="href">
@@ -662,26 +701,20 @@
 	</li>
 	<xsl:if test="architecture!='all'">
 	  <li>
-	    <xsl:element name="a">
-	      <xsl:attribute name="href">
-		<xsl:text>http://buildd.debian.org/pkg.cgi?pkg=</xsl:text>
-		<xsl:call-template name="escape-name">
-		  <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-		</xsl:call-template>
-	      </xsl:attribute>
-	      <xsl:text>Buildd logs</xsl:text>
-	    </xsl:element>
-	    <xsl:text> (</xsl:text>
-	    <xsl:element name="a">
-	      <xsl:attribute name="href">
-		<xsl:text>http://experimental.debian.net/build.php?pkg=</xsl:text>
-		<xsl:call-template name="escape-name">
-		  <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-		</xsl:call-template>
-	      </xsl:attribute>
-	      <xsl:text>more</xsl:text>
-	    </xsl:element>
-	    <xsl:text>)</xsl:text>
+            <xsl:text>Buildd: </xsl:text>
+            <a href="http://buildd.debian.org/pkg.cgi?pkg={$escaped-package}"
+              title="buildd.debian.org build logs">logs</a>
+            <xsl:text>, </xsl:text>
+            <!-- <a href="http://people.debian.org/~igloo/status.php?packages={$escaped-package}"
+              title="igloo's build logs on people.debian.org">more</a> -->
+            <a href="http://buildd.debian.org/~jeroen/status/package.php?p={$escaped-package}"
+              title="jeroen's build logs on buildd.debian.org">more</a>
+            <xsl:text>, </xsl:text>
+            <a href="http://experimental.debian.net/build.php?pkg={$escaped-package}"
+              title="experimental.debian.net build logs">exp</a>
+            <xsl:text>, </xsl:text>
+            <a href="http://buildd.debian-ports.org/status/package.php?p={$escaped-package}"
+              title="debian ports build logs">ports</a>
 	  </li>
 	</xsl:if>
 	<!-- DISABLED until ddtp.debian.org is back up
@@ -718,68 +751,30 @@
 	    Debcheck on:
 	    <xsl:if test="$hasunstable">
 	      <xsl:text> </xsl:text>
-	      <xsl:element name="a">
-		<xsl:attribute name="href">
-		  <xsl:text>http://qa.debian.org/debcheck.php?dist=unstable&amp;package=</xsl:text>
-		  <xsl:call-template name="escape-name">
-		    <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-		  </xsl:call-template>
-		</xsl:attribute>
-		<xsl:text>unstable</xsl:text>
-	      </xsl:element>
+              <a href="http://qa.debian.org/debcheck.php?dist=unstable&amp;package={$escaped-package}">unstable</a>
 	    </xsl:if>
 	    <xsl:if test="$hastesting">
 	      <xsl:text> </xsl:text>
-	      <xsl:element name="a">
-		<xsl:attribute name="href">
-		  <xsl:text>http://qa.debian.org/debcheck.php?dist=testing&amp;package=</xsl:text>
-		  <xsl:call-template name="escape-name">
-		    <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-		  </xsl:call-template>
-		</xsl:attribute>
-		<xsl:text>testing</xsl:text>
-	      </xsl:element>
+              <a href="http://qa.debian.org/debcheck.php?dist=testing&amp;package={$escaped-package}">testing</a>
 	    </xsl:if>
 	    <xsl:if test="$hasstable">
 	      <xsl:text> </xsl:text>
-	      <xsl:element name="a">
-		<xsl:attribute name="href">
-		  <xsl:text>http://qa.debian.org/debcheck.php?dist=stable&amp;package=</xsl:text>
-		  <xsl:call-template name="escape-name">
-		    <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-		  </xsl:call-template>
-		</xsl:attribute>
-		<xsl:text>stable</xsl:text>
-	      </xsl:element>
+              <a href="http://qa.debian.org/debcheck.php?dist=stable&amp;package={$escaped-package}">stable</a>
 	    </xsl:if>
 	  </li>
 	</xsl:if>
-	<!-- convert maintainer/name to follow lintian.debian.org convention [FG] -->
-	<xsl:variable name="pattern" select="concat('àáèéëêòöøîìùñ-~/()&#34; ', &quot;'&quot;)"/>
-	<xsl:variable name="_name" select="translate(maintainer/name, $pattern, '_____________________')"/>
-	<li><a href="http://lintian.debian.org/reports/m{$_name}.html#{$package}">Lintian report</a></li>
+	<!-- convert maintainer/name to follow lintian.debian.org convention -->
+	<xsl:variable name="pattern" select="concat('àáèéëêòöøîìùñ~/()&#34; ', &quot;'&quot;)"/>
+	<xsl:variable name="_email" select="translate(maintainer/email, $pattern, '_____________________')"/>
+	<li><a href="http://lintian.debian.org/reports/maintainer/{$_email}.html#{$package}">Lintian report</a></li>
 	<li>
-	  <xsl:element name="a">
-	    <xsl:attribute name="href">
-	      <xsl:text>http://qa.debian.org/developer.php?popcon=</xsl:text>
-	      <xsl:call-template name="escape-name">
-		<xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:attribute>
-	    <xsl:text>Popcon stats</xsl:text>
-	  </xsl:element>
-	</li>
-	<li>
-	  <xsl:element name="a">
-	    <xsl:attribute name="href">
-	      <xsl:text>http://svnbuildstat.debian.net/packages/info/</xsl:text>
-	      <xsl:call-template name="escape-name">
-		<xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:attribute>
-	    <xsl:text>Svnbuildstat</xsl:text>
-	  </xsl:element>
+          <a href="http://qa.debian.org/developer.php?popcon={$escaped-package}">Popcon stats</a>
 	</li>
+        <xsl:if test="$other/@svnbuildstat='yes'">
+          <li>
+            <a href="http://svnbuildstat.debian.net/packages/info/{$escaped-package}">Svnbuildstat</a>
+          </li>
+        </xsl:if>
       </ul>
     </td>
   </tr>
@@ -788,7 +783,7 @@
 <xsl:template name="package-files">
   <tr class="titlerow">
     <td class="titlecell" colspan="2">
-      Package files
+      Source package
   </td></tr>
   <tr class="titlerow">
     <td class="labelcell">
@@ -799,7 +794,7 @@
 	  <xsl:value-of select="directory"/>
 	  <xsl:text>/</xsl:text>
 	</xsl:attribute>
-	<xsl:text>Source files</xsl:text>
+	<xsl:text>Files</xsl:text>
       </xsl:element>
     </td>
     <td class="contentcell" id="src_files">
@@ -859,25 +854,18 @@
       <xsl:for-each select="$other/todo/item">
 	<xsl:call-template name="outputitem"/>
       </xsl:for-each>
-      <!-- new upstream version goes in todo [FG] -->
-      <xsl:if test="$other/@watch='yes' and $other/watch/@new!='0'"> 
-	<li>A new upstream version was found:
-	  (<xsl:value-of select="$other/watch/@new"/>). <a href="{$other/watch/@url}"><xsl:value-of select="$other/watch/@url"/></a></li>
+      <xsl:if test="$other[dehs/@newer]">
+	<li>A new upstream version is available:
+          <a href="http://dehs.alioth.debian.org/maintainer.php?name={$escaped-package}"><xsl:value-of select="$other/dehs/@newer"/></a>,
+          you should consider packaging it.</li>
       </xsl:if>
       <xsl:if test="$other/bugs/@patch!='0'">
 	<li>The Bug Tracking System contains
-	  <xsl:element name="a">
-	    <xsl:attribute name="href">
-	      <xsl:text>http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&amp;data=</xsl:text>
-	      <xsl:call-template name="escape-name">
-		<xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-	      </xsl:call-template>
-	      <xsl:text>&amp;include=tags:patch&amp;exclude=tags:pending&amp;pend-exc=done</xsl:text>
-	    </xsl:attribute>
-	    <xsl:value-of select="$other/bugs/@patch"/> patch<xsl:if test="$other/bugs/@patch!='1'">es</xsl:if>
-	  </xsl:element>, you should include
-	  <xsl:if test="$other/bugs/@patch!='1'">them</xsl:if>
-	  <xsl:if test="$other/bugs/@patch='1'">it</xsl:if>.
+          <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&amp;data={$escaped-package}&amp;include=tags:patch&amp;exclude=tags:pending&amp;pend-exc=done">patches fixing
+          <xsl:value-of select="$other/bugs/@patch"/> bug<xsl:if test="$other/bugs/@patch!='1'">s</xsl:if>
+          </a>, consider including or untagging
+          <xsl:if test="$other/bugs/@patch!='1'">them</xsl:if>
+          <xsl:if test="$other/bugs/@patch='1'">it</xsl:if>.
 	</li>
       </xsl:if>
     </xsl:if>
@@ -904,16 +892,7 @@
 	  href="http://ftp-master.debian.org/testing/update_excuses.html.gz#{$package}">testing</a>
 	even though the <xsl:value-of select="document(concat('../base/', $dir, '/excuse.xml'))/excuse/@limit"/>-day
 	delay is over.
-	<xsl:element name="a">
-	  <xsl:attribute name="href">
-	    <xsl:text>http://bjorn.haxx.se/debian/testing.pl?package=</xsl:text>
-	    <xsl:call-template name="escape-name">
-	      <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:attribute>
-	  Check why
-	</xsl:element>
-	.</li>
+        <a href="http://release.debian.org/migration/testing.pl?package={$escaped-package}">Check why</a>.</li>
     </xsl:if>
     <xsl:if test="not(starts-with(standards-version, $lastmajorsv))">
       <li>The package is severly out of date with respect to the Debian
@@ -1051,7 +1030,8 @@
 	</li>
       </xsl:if>
 
-      <!-- uscan output if present [FG] -->
+      <!-- disable watch rendering, see above -->
+      <!--
       <xsl:if test="$other/@watch='yes'">
 	<li>
 	  <xsl:if test="$other/watch/@warning!=''">
@@ -1059,6 +1039,14 @@
 	  </xsl:if>
 	</li>
       </xsl:if>
+      -->
+      <xsl:if test="$other[dehs/@error]">
+        <li>The package has a <kbd>debian/watch</kbd> file, but the last
+          attempt to use it for checking for newer upstream versions failed
+          with
+          <a href="http://dehs.alioth.debian.org/maintainer.php?name={$escaped-package}">an
+            error</a>.</li>
+      </xsl:if>
 
       <!-- Misc problems reported -->
       <xsl:for-each select="$other/problems/item">
@@ -1083,7 +1071,7 @@
   <xsl:if test="$hasexcuse">
     <tr class="titlerow">
       <td class="titlecell">
-	Testing Status
+	Testing status
     </td></tr>
     <tr class="normalrow">
       <td class="contentcell2" style="text-align: left">
@@ -1135,22 +1123,33 @@
   <html>
   <head>
   <meta name="ROBOTS" content="NOFOLLOW"/>
-  <link type="text/css" title="Default" rel="stylesheet" href="../common/pts.css"/>
-  <link type="text/css" title="Standard link rendering" rel="alternate stylesheet" href="../common/pts2.css"/>
+  <link type="text/css" title="User selected" rel="stylesheet" href="../common/default.css"/>
+  <link type="text/css" title="Official" rel="alternate stylesheet" href="../common/revamp.css"/>
+  <link type="text/css" title="Legacy PTS" rel="alternate stylesheet" href="../common/pts.css"/>
   <link type="text/css" title="Compact rendering" rel="alternate stylesheet" href="../common/compact.css"/>
+  <script type="text/javascript" src="../common/pts.js"></script>
   <xsl:if test="count($news)>0 and string($news)!=''">
     <link rel="alternate" type="application/rss+xml" title="RSS"
       href="{$package}/news.rss20.xml" />
   </xsl:if>
   <title>Overview of <xsl:value-of select="$package"/> source package</title>
   </head>
-  <body>
+  <body onload="javascript:onLoad();">
   
-  <form method="get" action="/common/index.html" style="float: right;">
-  <!-- this link should make lynx/links happy [FG] -->
-  <p>Jump to package (<a href="/">home page</a>): <br/>
+  <div id="quickforms" style="float: right;">
+  <form method="get" action="/common/index.html">
+  <p><span title="Jump to package">Go:</span> 
   <input type="text" name="src" value=""/></p>
   </form>
+  <form id="csspref-form" method="get" action="/common/set-csspref.php">
+  <p>Switch style: <select name="csspref" onchange="javascript:onChangeStyle();">
+  <option value="revamp.css">Default</option>
+  <option value="compact.css">Compact</option>
+  <option value="pts.css">Legacy</option>
+  </select></p>
+  </form>
+  
+  </div>
   <h1>Overview of
   <xsl:element name="a">
     <xsl:attribute name="href">
@@ -1186,13 +1185,11 @@
   <!-- LEFT SIDE -->
   <table class="lefttable">
     <xsl:call-template name="general-information" />
-    <xsl:call-template name="bugs-count" />
-    <xsl:call-template name="pts-subscription" />
-    <xsl:call-template name="binary-packages" />
     <xsl:call-template name="available-versions" />
-    <xsl:call-template name="patches" />
-    <xsl:call-template name="other-links" />
+  </table>
+  <table class="lefttable">
     <xsl:call-template name="package-files" />
+    <xsl:call-template name="binary-packages" />
   </table>
   <!-- END LEFT SIDE -->
   </td><td class="containercell">
@@ -1200,11 +1197,24 @@
   <table class="righttable">
     <xsl:call-template name="todo-list" />
     <xsl:call-template name="problems" />
+  </table>
+  <table class="righttable">
     <xsl:call-template name="testing-status" />
     <xsl:call-template name="static-info" />
     <xsl:call-template name="latest-news" />
   </table>
   <!-- END RIGHT SIDE -->
+  </td><td class="containercell">
+  <table class="lefttable">
+    <xsl:call-template name="bugs-count" />
+    <xsl:call-template name="pts-subscription" />
+  </table>
+  <table class="lefttable">
+    <xsl:call-template name="patches" />
+  </table>
+  <table class="lefttable">
+    <xsl:call-template name="other-links" />
+  </table>
   </td></tr>
   </table>
 
@@ -1215,11 +1225,13 @@
   <hr/>
   <div class="footer">
     <p>
-      Debian Package Tracking System - Copyright 2002-2007 Raphaël Hertzog and
-      others<br/>
+      <a href="http://www.debian.org">Debian</a> Package Tracking System -
+      Copyright 2002-2008 Raphaël Hertzog and others.<br/>
       Report problems to the <a href="http://bugs.debian.org/qa.debian.org"
-	>qa.debian.org pseudopackage</a><br/>
-      Last modified : <xsl:value-of select="$date"/>
+	><tt>qa.debian.org</tt> pseudopackage</a> in the <a
+	href="http://bugs.debian.org">Debian <acronym title="Bug Tracking
+	  System">BTS</acronym></a>.<br/>
+      Last modified : <xsl:value-of select="$date"/>.
     </p>
   </div>
   </div>