From 759695247d3ba69230056429ecad15f672cdd5cd Mon Sep 17 00:00:00 2001
From: Sean Finney <seanius@debian.org>
Date: Tue, 10 Jun 2008 08:03:50 +0200
Subject: template fixups

---
 templates/letter_toc.tmpl   |  2 +-
 templates/package_vers.tmpl | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'templates')

diff --git a/templates/letter_toc.tmpl b/templates/letter_toc.tmpl
index 604fdad..308e535 100644
--- a/templates/letter_toc.tmpl
+++ b/templates/letter_toc.tmpl
@@ -21,7 +21,7 @@ Debian Project patch tracking system
  #for $d in $dists.iterkeys()
   <td>
   #if $pkgs[$p].has_key($d)
-   <a href="$conf.root_url/packages/$p/$pkgs[$p][$d].version">$pkgs[$p][$d].version</a>
+   <a href="$conf.root_url/package/$p/$pkgs[$p][$d].version">$pkgs[$p][$d].version</a>
   #else
    <i>n/a</i>
   #end if
diff --git a/templates/package_vers.tmpl b/templates/package_vers.tmpl
index 348c389..08eb3d7 100755
--- a/templates/package_vers.tmpl
+++ b/templates/package_vers.tmpl
@@ -4,6 +4,7 @@
 debian specific patch information for $src.name / $suite
 #end def
 #def body
+ #set $u = $conf.root_url
   <h1>debian specific patch information for $src.name / $suite</h1>
   <h2> Summary </h2>
   <table class="summary">
@@ -46,18 +47,26 @@ debian specific patch information for $src.name / $suite
    </tr>
    <tr>
     <th>./debian only changes</th>
-    <td><a href="$conf.root_url/packages/$src.name/$src.version/${src.debianonlydiff}.html">view</a></td>
-    <td><a href="$conf.root_url/packages/$src.name/$src.version/$src.debianonlydiff">download</a></td>
+    <td>
+     <a href="$u/patch/$src.name/$src.version/debianonly/view">view</a>
+    </td>
+    <td>
+     <a href="$u/patch/$src.name/$src.version/debianonly/dl">download</a>
+    </td>
    </tr>
    <tr>
     <th>non packaging (i.e. not ./debian) changes</th>
-    <td><a href="$conf.root_url/packages/$src.name/$src.version/${src.nondebiandiff}.html">view</a></td>
-    <td><a href="$conf.root_url/packages/$src.name/$src.version/$src.nondebiandiff">download</a></td>
+    <td>
+     <a href="$u/patch/$src.name/$src.version/nondebian/view">view</a>
+    </td>
+    <td>
+     <a href="$u/patch/$src.name/$src.version/nondebian/dl">download</a>
+    </td>
    </tr>
   </table>
 #end if
 
-#if $src.directpatches
+#if $src.diffgz
   <h2> Non-packaging "direct" style patches </h2>
   <table class="patchlisting">
    <tr>
@@ -70,7 +79,9 @@ debian specific patch information for $src.name / $suite
   </table>
 #end if
 
-#if $src.seriespatches
+#if $src.diffgz
+#set $series = $diffhandler.series
+#if $series
   <h2> "series" style patches </h2>
   <table class="patchlisting">
    <tr>
@@ -79,14 +90,19 @@ debian specific patch information for $src.name / $suite
     <th>view</th>
     <th>raw</th>
    </tr>
-#for $p,$d in $src.seriespatches.iteritems()
+#for $name,$patch in $series.iterpatches()
    <tr>
-    <td>$p</td>
-    <td class="diffstat"><pre><code>$d</code></pre></td>
-    <td><a href="$conf.root_url/packages/$src.name/$src.version/series/${p}.html">view</a></td>
-    <td><a href="$conf.root_url/packages/$src.name/$src.version/series/${p}">download</a></td>
+    <td>$name</td>
+    <td class="diffstat"><pre><code>$patch.diffstat</code></pre></td>
+    <td>
+     <a href="$u/patch/$src.name/$src.version/series/${name}/view">view</a>
+    </td>
+    <td>
+     <a href="$u/patch/$src.name/$src.version/series/${name}/dl">download</a>
+    </td>
    </tr>
 #end for
   </table>
 #end if
+#end if
 #end def
-- 
cgit v1.2.3