further cgi related fixes

4 files changed, 18 insertions, 4 deletions

diff --git a/pagehandler.py b/pagehandler.py
index 2ae7a08..858534b 100755
--- a/pagehandler.py
+++ b/pagehandler.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 import cgi
 import os
@@ -22,7 +23,11 @@ class CmdHandler:
         self.patchname = args[7]
         self.content = dh.series().fetch(self.patchname)
       elif patchtype == "debianonly":
-        something = True
+        self.patchname = "debian-dir only changes"
+        self.content = dh.debiandir()
+      elif patchtype == "nondebian":
+        self.patchname = "direct (non packaging) changes"
+        self.content = dh.nondebiandir()
       else:
         self.error("unhandled patch type '%s'"%(patchtype))
       self.pkgname = pkgname
diff --git a/patchtracker/Writers.py b/patchtracker/Writers.py
index 9b6ded4..7e2fd1c 100755
--- a/patchtracker/Writers.py
+++ b/patchtracker/Writers.py
@@ -66,7 +66,7 @@ class ErrorTemplate(OurTemplate):
 class PatchTemplate(OurTemplate):
   def __init__(self, pkg=None, vers=None, name=None, patch=None):
     tpl = os.sep.join([Conf.template_dir, "patch_view.tmpl"])
-    sl = {'package':pkg, 'version':vers, 'name':name, 'patch':str(patch)}
+    sl = {'package':pkg, 'version':vers, 'name':name, 'patch':patch}
     OurTemplate.__init__(self, file=tpl, searchList=sl)
 
 class PageWriter:
diff --git a/static/css/patches.css b/static/css/patches.css
index 57c29b0..15fe762 100644
--- a/static/css/patches.css
+++ b/static/css/patches.css
@@ -34,4 +34,5 @@ div.patch {
   margin: 30px;
   padding: 15px;
   background-color: #eee;
+  border: 1px solid black;
 }
diff --git a/templates/patch_view.tmpl b/templates/patch_view.tmpl
index b3f645e..ae1e64c 100644
--- a/templates/patch_view.tmpl
+++ b/templates/patch_view.tmpl
@@ -3,17 +3,25 @@
 #import pygments
 #from pygments.lexers import DiffLexer
 #from pygments.formatters import HtmlFormatter
+#from cgi import escape
 #def title
 Patch information for $package / $version / $name
 #end def
 #def body
  <h1>$package / $version / $name</h1>
+ <h2>Summary</h2>
+ <div>
+  <pre><code class="diffstat">
+$escape($patch.diffstat)
+  </code></pre>
+ </div>
  <div>
   <a href="$conf.archive_root_url/patch/series/dl/$package/$version/$name">
    download this patch
   </a>
  </div>
- <div class=patch>
-  $pygments.highlight($patch, $DiffLexer(), $HtmlFormatter(style='colorful', noclasses=True))
+ <h2>Patch contents</h2>
+ <div class="patch">
+  $pygments.highlight($str($patch), $DiffLexer(), $HtmlFormatter(style='colorful', noclasses=True, encoding='utf-8'))
  </div>
 #end def