mostly aesthetic changes and initial "breadcrumbs"

5 files changed, 182 insertions, 122 deletions

diff --git a/patchtracker/Templates.py b/patchtracker/Templates.py
index 4445ef1..e6982f0 100755
--- a/patchtracker/Templates.py
+++ b/patchtracker/Templates.py
@@ -8,12 +8,15 @@ import errno
 
 class OurTemplate(Template):
   def __init__(self, file, searchList=None):
-    ourSearchList={"conf":Conf}
+    ourSearchList={"conf":Conf, "crumbs":[], "link":self.link}
     if searchList:
       for k,v in searchList.iteritems():
         ourSearchList[k]=v
     Template.__init__(self, file=file, searchList=ourSearchList)
 
+  def link(self, where, name):
+    return str("<a href=\"%s\">%s</a>"%(where,name))
+
 
 class PackageVersTemplate(OurTemplate):
   def __init__(self, srcpkg):
@@ -25,6 +28,10 @@ class PackageVersTemplate(OurTemplate):
       sl['diffhandler'] = DiffGzHandler(dfile)
     else:
       sl['diffhandler'] = None
+    sl['crumbs'] = [("","Debian patch-tracker"),
+                         ("package/"+srcpkg.name,srcpkg.name),
+                         ("package/"+srcpkg.name+"/"+srcpkg.version,
+                          srcpkg.name+"/"+srcpkg.version)]
     OurTemplate.__init__(self, file=tpl, searchList=sl)
 
 class FrontPageTemplate(OurTemplate):
@@ -41,8 +48,11 @@ class LetterTocTemplate(OurTemplate):
     for name,packagelist in collection.iteritems():
       for d in packagelist.iterkeys():
         self.dists[d] = True
+    sl = {}
+    sl['crumbs'] = [("","Debian patch-tracker"),
+                         ("index/"+letter,"index for "+letter)]
     tpl = os.sep.join([Conf.template_dir, "letter_toc.tmpl"])
-    OurTemplate.__init__(self, file=tpl)
+    OurTemplate.__init__(self, file=tpl, searchList=sl)
 
 class SearchResultsTemplate(OurTemplate):
   def __init__(self, search, collection):
@@ -68,5 +78,17 @@ class PatchTemplate(OurTemplate):
     tpl = os.sep.join([Conf.template_dir, "patch_view.tmpl"])
     sl = {'package':pkg, 'version':vers, 'name':name, 
           'patch':patch, 'patchtype':patchtype}
+    sl['crumbs'] = [("","Debian patch-tracker"),
+                         ("package/"+pkg,pkg),
+                         ("package/"+pkg+"/"+vers, pkg+"/"+vers)]
+    if patchtype == "debianonly":
+      sl['crumbs'].append( ("patch/%s/view/%s/%s"%(patchtype,pkg,vers),
+                            "./debian-dir only patch") )
+    elif patchtype == "series":
+      sl['crumbs'].append(("patch/%s/view/%s/%s/%s"%(patchtype,pkg,vers,name),
+                           "series patch "+name) )
+    elif patchtype == "misc":
+      sl['crumbs'].append(("patch/%s/view/%s/%s/%s"%(patchtype,pkg,vers,name),
+                           "direct patch of "+name) )
     OurTemplate.__init__(self, file=tpl, searchList=sl)
 
diff --git a/static/css/patches.css b/static/css/patches.css
index 39cc8bc..56e29ca 100644
--- a/static/css/patches.css
+++ b/static/css/patches.css
@@ -1,33 +1,30 @@
-th {
-  background-color: #ddd;
-}
-
-table.summary {
+body {
   border: 1px solid;
+  padding: 20px;
 }
 
-table.summary th {
-  text-align: left;
-}
-
-table.patchlisting {
-  border-spacing: 0px;
+h1 {
+  margin: 30px;
+  text-decoration: underline;
 }
 
-table.patchlisting td, table.patchlisting th {
-  border: 1px solid;
+h2 {
+  margin: 20px;
 }
 
-table.packagelisting {
+table {
   border-spacing: 0px;
 }
 
-table.packagelisting td, table.packagelisting th {
+th {
+  padding: 3px;
   border: 1px solid;
+  background-color: #ddd;
 }
 
-td, th {
-  padding: 10px;
+td {
+  padding: 3px;
+  border: 1px solid;
 }
 
 div.patch, div.quicklinks, div.framed {
@@ -37,3 +34,27 @@ div.patch, div.quicklinks, div.framed {
   border: 1px solid black;
 }
 
+div.pageheader {
+  font-size: large;
+  margin-left: 5px;
+  margin-right: 5px;
+  padding: 5px;
+  padding-top: 0px;
+  background-color: #eee;
+  border: 1px solid black;
+  height: 80px;
+}
+
+div.pageheader img {
+  float: right;
+  height: 75px;
+  margin: 5px;
+}
+
+div.breadcrumb {
+  font-size: medium;
+}
+
+div.diffsummary, div.debdiff, div.nondebdiff, div.debseries {
+  margin-left: 40px;
+}
diff --git a/static/img/swirlpatch.png b/static/img/swirlpatch.png
new file mode 100644
index 0000000..220ff9d
--- /dev/null
+++ b/static/img/swirlpatch.png
diff --git a/templates/package_vers.tmpl b/templates/package_vers.tmpl
index 74f207e..58e6c8d 100755
--- a/templates/package_vers.tmpl
+++ b/templates/package_vers.tmpl
@@ -4,119 +4,127 @@
 debian specific patch information for $src.name / $src.version
 #end def
 #def body
- #set $u = $conf.root_url
+  #set $u = $conf.root_url
   <h1>debian specific patch information for $src.name / $src.version</h1>
-  <h2> Summary </h2>
-  <table class="summary">
-   <tr>
-    <th>Package Version</th>
-    <td>$src.version</td>
-   </tr>
-   <tr>
-    <th>Package Type</th>
-    <td>$src.type</td>
-   </tr>
-   <tr>
-    <th>Source Package Format</th>
-    <td>$src.format</td>
-   </tr>
-#if $src.diffgz_name
-   <tr>
-    <th>Diff.gz</th>
-    <td>$src.loc / $src.diffgz_name</td>
-   </tr>
-#end if
-  </table>
+  <div class="diffsummary">
+   <h2> Summary </h2>
+   <table class="summary">
+    <tr>
+     <th>Package Version</th>
+     <td>$src.version</td>
+    </tr>
+    <tr>
+     <th>Package Type</th>
+     <td>$src.type</td>
+    </tr>
+    <tr>
+     <th>Source Package Format</th>
+     <td>$src.format</td>
+    </tr>
+ #if $src.diffgz_name
+    <tr>
+     <th>Diff.gz</th>
+     <td>$src.loc / $src.diffgz_name</td>
+    </tr>
+ #end if
+   </table>
+  </div> <!-- diffsummary -->
 
 #if $src.diffgz_name
-  <h2> "Debian diff" Information </h2>
-  <table class="patchlisting">
-   <tr>
-    <th>Diff file</th>
-    <td colspan="2">
-     <a href="$conf.archive_root_url/$src.loc/$src.diffgz_name">
-      $src.diffgz_name
-     </a>
-    </td>
-   </tr>
-   <tr>
-    <th>Size</th><td colspan="2">$src.diffgz_size</td>
-   </tr>
-   <tr>
-    <th>MD5sum</th><td colspan="2">$src.diffgz_md5sum</td>
-   </tr>
-   <tr>
-    <th>./debian only changes</th>
-    <td>
-     <a href="$u/patch/debianonly/view/$src.name/$src.version">view</a>
-    </td>
-    <td>
-     <a href="$u/patch/debianonly/dl/$src.name/$src.version">download</a>
-    </td>
-   </tr>
-#if $src.diffgz_name and $diffhandler.nondebiandir.lines
-   <tr>
-    <th>non packaging (i.e. not ./debian) changes</th>
-    <td>
-     <a href="$u/patch/nondebian/view/$src.name/$src.version">view</a>
-    </td>
-    <td>
-     <a href="$u/patch/nondebian/dl/$src.name/$src.version">download</a>
-    </td>
-   </tr>
-#end if
-  </table>
-#end if
+  <div class="debdiff">
+   <h2> "Debian diff" Information </h2>
+   <table class="patchlisting">
+    <tr>
+     <th>Diff file</th>
+     <td colspan="2">
+      <a href="$conf.archive_root_url/$src.loc/$src.diffgz_name">
+       $src.diffgz_name
+      </a>
+     </td>
+    </tr>
+    <tr>
+     <th>Size</th><td colspan="2">$src.diffgz_size</td>
+    </tr>
+    <tr>
+     <th>MD5sum</th><td colspan="2">$src.diffgz_md5sum</td>
+    </tr>
+    <tr>
+     <th>./debian only changes</th>
+     <td>
+      <a href="$u/patch/debianonly/view/$src.name/$src.version">view</a>
+     </td>
+     <td>
+      <a href="$u/patch/debianonly/dl/$src.name/$src.version">download</a>
+     </td>
+    </tr>
+ #if $src.diffgz_name and $diffhandler.nondebiandir.lines
+    <tr>
+     <th>non packaging (i.e. not ./debian) changes</th>
+     <td>
+      <a href="$u/patch/nondebian/view/$src.name/$src.version">view</a>
+     </td>
+     <td>
+      <a href="$u/patch/nondebian/dl/$src.name/$src.version">download</a>
+     </td>
+    </tr>
+ #end if
+   </table>
+ #end if
+  </div> <!-- debdiff -->
 
 #if $src.diffgz_name and $diffhandler.nondebiandir.lines
-  <h2> Misc. Non-packaging "direct" style patches </h2>
-  <table class="patchlisting">
-   <tr>
-    <th>file</th>
-    <th>inserted</th>
-    <th>deleted</th>
-    <th>modified</th>
-    <th>view</th>
-    <th>download</th>
-   </tr>
-#for $insd,$deld,$modd,$f in $diffhandler.nondebiandir.diffstat.stats
-   <tr>
-    <td>$f</td><td>$insd</td><td>$deld</td><td>$modd</td>
-    <td>
-     <a href="$u/patch/misc/view/$src.name/$src.version/$f">view</a>
-    </td>
-    <td>
-     <a href="$u/patch/misc/dl/$src.name/$src.version/$f">download</a>
-    </td>
-   </tr>
-#end for
-  </table>
+  <div class="nondebdiff">
+   <h2> Misc. Non-packaging "direct" style patches </h2>
+   <table class="patchlisting">
+    <tr>
+     <th>file</th>
+     <th>inserted</th>
+     <th>deleted</th>
+     <th>modified</th>
+     <th>view</th>
+     <th>download</th>
+    </tr>
+ #for $insd,$deld,$modd,$f in $diffhandler.nondebiandir.diffstat.stats
+    <tr>
+     <td>$f</td><td>$insd</td><td>$deld</td><td>$modd</td>
+     <td>
+      <a href="$u/patch/misc/view/$src.name/$src.version/$f">view</a>
+     </td>
+     <td>
+      <a href="$u/patch/misc/dl/$src.name/$src.version/$f">download</a>
+     </td>
+    </tr>
+ #end for
+   </table>
+  </div> <!-- nondebdiff -->
 #end if
 
 #if $src.diffgz_name
 #set $series = $diffhandler.series
 #if $series
-  <h2> "series" style patches </h2>
-  <table class="patchlisting">
-   <tr>
-    <th>patch</th>
-    <th>summary</th>
-    <th>view</th>
-    <th>raw</th>
-   </tr>
-#for $name,$patch in $series.iterpatches()
-   <tr>
-    <td>$name</td>
-    <td class="diffstat"><pre><code>$patch.diffstat</code></pre></td>
-    <td>
-     <a href="$u/patch/series/view/$src.name/$src.version/$name">view</a>
-    </td>
-    <td>
-     <a href="$u/patch/series/dl/$src.name/$src.version/$name">download</a>
-    </td>
-   </tr>
-#end for
-  </table>
+  <div class="debseries">
+   <h2> "series" style patches </h2>
+   <table class="patchlisting">
+    <tr>
+     <th>patch</th>
+     <th>summary</th>
+     <th>view</th>
+     <th>raw</th>
+    </tr>
+ #for $name,$patch in $series.iterpatches()
+    <tr>
+     <td>$name</td>
+     <td class="diffstat"><pre><code>$patch.diffstat</code></pre></td>
+     <td>
+      <a href="$u/patch/series/view/$src.name/$src.version/$name">view</a>
+     </td>
+     <td>
+      <a href="$u/patch/series/dl/$src.name/$src.version/$name">download</a>
+     </td>
+    </tr>
+ #end for
+   </table>
+  </div> <!-- debseries -->
 #end if
 #end if
 #end def
diff --git a/templates/skeleton.tmpl b/templates/skeleton.tmpl
index 12c379a..9ffa298 100644
--- a/templates/skeleton.tmpl
+++ b/templates/skeleton.tmpl
@@ -7,6 +7,15 @@
         href="$conf.root_url/static/css/patches.css"/>
  </head>
  <body>
+  <div class="pageheader">
+   <img alt="[patchlogo]" src="$conf.root_url/static/img/swirlpatch.png"/>
+   <p> Debian patch tracking system </p>
+  <div class="breadcrumb">
+   #set $links = [$link($conf.root_url+"/"+b[0],b[1]) for b in $crumbs]
+   #set $llist = " - ".join($links)
+   $llist
+  </div> <!-- breadcrumb -->
+  </div>
   $body
  </body>
 </html>