diff --git a/django_website/templates/trac_templates/attachment.cs b/django_website/templates/trac_templates/attachment.cs
index 49074bc71..1575a7775 100644
--- a/django_website/templates/trac_templates/attachment.cs
+++ b/django_website/templates/trac_templates/attachment.cs
@@ -1,4 +1,4 @@
-<?cs set:html.stylesheet = 'css/code.css' ?>
+<?cs set:html.stylesheet = 'css/diff.css' ?>
 <?cs include "header.cs" ?>
 <?cs include "macros.cs" ?>
 
@@ -6,35 +6,71 @@
 
 <div id="content" class="attachment">
 
- <h3>Add Attachment to <a href="<?cs
-   var:file.attachment_parent_href?>"><?cs var:file.attachment_parent?></a></h3>
- <form id="attachment" method="post" enctype="multipart/form-data" action="<?cs
-   var:cgi_location ?>">
+<?cs if:attachment.mode == 'new' ?>
+ <h1>Add Attachment to <a href="<?cs var:attachment.parent.href?>"><?cs
+   var:attachment.parent.name ?></a></h1>
+ <form id="attachment" method="post" enctype="multipart/form-data" action="">
   <div class="field">
-   <label for="file">File:</label>
-   <input type="file" id="file" name="attachment" />
+   <label>File:<br /><input type="file" name="attachment" /></label>
   </div>
   <fieldset>
    <legend>Attachment Info</legend>
    <div class="field">
-    <label for="author">Your email or username:</label><br />
-    <input type="text" id="author" name="author" class="textwidget" size="30"
-        value="<?cs var:attachment.author?>" />
+    <label>Your email or username:<br />
+    <input type="text" name="author" size="30" value="<?cs
+      var:attachment.author?>" /></label>
    </div>
    <div class="field">
-    <label for="description">Description of the file (optional):</label><br />
-    <input type="text" id="description" name="description" class="textwidget"
-        size="60" />
-   </div><br />
+    <label>Description of the file (optional):<br />
+    <input type="text" name="description" size="60" /></label
+   </div>
+   <div class="options">
+    <label><input type="checkbox" name="replace" checked="checked" />
+    Replace existing attachment of the same name</label>
+   </div>
+   <br />
   </fieldset>
   <div class="buttons">
-   <input type="hidden" name="mode" value="attachment" />
-   <input type="hidden" name="type" value="<?cs var:attachment.type ?>" />
-   <input type="hidden" name="id" value="<?cs var:attachment.id ?>" />
-   <input type="submit" value="Add Attachment" />
+   <input type="hidden" name="action" value="new" />
+   <input type="hidden" name="type" value="<?cs var:attachment.parent.type ?>" />
+   <input type="hidden" name="id" value="<?cs var:attachment.parent.id ?>" />
+   <input type="submit" value="Add attachment" />
    <input type="submit" name="cancel" value="Cancel" />
   </div>
  </form>
+<?cs elif:attachment.mode == 'delete' ?>
+ <h1><a href="<?cs var:attachment.parent.href ?>"><?cs
+   var:attachment.parent.name ?></a>: <?cs var:attachment.filename ?></h1>
+ <p><strong>Are you sure you want to delete this attachment?</strong><br />
+ This is an irreversible operation.</p>
+ <div class="buttons">
+  <form method="post" action=""><div id="delete">
+   <input type="hidden" name="action" value="delete" />
+   <input type="submit" name="cancel" value="Cancel" />
+   <input type="submit" value="Delete attachment" />
+  </div></form>
+ </div><?cs else ?>
+ <h1><a href="<?cs var:attachment.parent.href ?>"><?cs
+   var:attachment.parent.name ?></a>: <?cs var:attachment.filename ?></h1>
+ <div id="preview"><?cs
+  if:attachment.preview ?>
+   <?cs var:attachment.preview ?><?cs
+  elif:attachment.max_file_size_reached ?>
+   <strong>HTML preview not available</strong>, since file-size exceeds
+   <?cs var:attachment.max_file_size  ?> bytes. You may <a href="<?cs
+     var:attachment.raw_href ?>">download the file</a> instead.<?cs
+  else ?>
+   <strong>HTML preview not available</strong>. To view the file,
+   <a href="<?cs var:attachment.raw_href ?>">download the file</a>.<?cs
+  /if ?>
+ </div>
+ <?cs if:attachment.can_delete ?><div class="buttons">
+  <form method="get" action=""><div id="delete">
+   <input type="hidden" name="action" value="delete" />
+   <input type="submit" value="Delete attachment" />
+  </div></form>
+ </div><?cs /if ?>
+<?cs /if ?>
 
 </div>
 <?cs include "footer.cs"?>
diff --git a/django_website/templates/trac_templates/browser.cs b/django_website/templates/trac_templates/browser.cs
index 2bf140616..78d02bc50 100644
--- a/django_website/templates/trac_templates/browser.cs
+++ b/django_website/templates/trac_templates/browser.cs
@@ -9,81 +9,106 @@
 </div>
 
 <div id="content" class="browser">
- <?cs call:browser_path_links(browser.path, browser) ?>
+ <h1><?cs call:browser_path_links(browser.path, browser) ?></h1>
 
  <div id="jumprev">
-  <form action="<?cs var:browser_current_href ?>" method="get">
-   <div>
-    <label for="rev">View revision:</label>
-    <input type="text" id="rev" name="rev" value="<?cs
-      var:browser.revision?>" size="4" />
-   </div>
-  </form>
+  <form action="" method="get"><div>
+   <label for="rev">View revision:</label>
+   <input type="text" id="rev" name="rev" value="<?cs
+     var:browser.revision ?>" size="4" />
+  </div></form>
  </div>
 
- <table class="listing" id="dirlist">
-  <thead>
-   <tr>
-    <th class="name<?cs if:browser.order == "name" ?> <?cs
-      var:browser.order_dir ?><?cs /if ?>"><a title="Sort by name<?cs
-      if:browser.order == "name" && browser.order_dir == "asc" ?> (descending)<?cs
-      /if ?>" href="<?cs var:browser.current_href?>?order=name<?cs
-      if:browser.order == "name" && browser.order_dir == "asc" ?>&desc=1<?cs
-      /if ?>">Name</a>
-    </th>
-    <th class="rev">Rev</th>
-    <th class="age<?cs if:browser.order == "date" ?> <?cs
-      var:browser.order_dir ?><?cs /if ?>"><a title="Sort by age<?cs
-      if:browser.order == "date" && browser.order_dir == "asc" ?> (descending)<?cs
-      /if ?>" href="<?cs var:browser.current_href?>?order=date<?cs
-      if:browser.order == "date" && browser.order_dir == "asc" ?>&desc=1<?cs
-      /if ?>">Age</a>
-    </th>
-    <th class="change">Last Change</th>
-   </tr>
-  </thead>
-  <tbody>
-   <?cs if:browser.path != "/" ?>
-    <tr class="even">
-     <td class="name" colspan="4">
-      <a class="parent" title="Parent Directory" href="<?cs
-        var:browser.parent_href ?>">../</a>
-     </td>
-    </tr>
-   <?cs /if ?>
-   <?cs each:item = browser.items ?>
-    <tr class="<?cs if:name(item) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
-     <td class="name"><?cs
-      if:item.is_dir ?><?cs
-       if:item.permission ?>
-        <a class="dir" title="Browse Directory" href="<?cs
-          var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
-       else ?>
-        <span class="dir" title="Access Denied" href=""><?cs
-          var:item.name ?></span><?cs
-       /if ?><?cs
-      else ?><?cs
-       if:item.permission != '' ?>    
-        <a class="file" title="View File" href="<?cs
-          var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
-       else ?>
-        <span class="file" title="Access Denied" href=""><?cs
-          var:item.name ?></span><?cs
-       /if ?><?cs
-      /if ?>
-     </td>
-     <td class="rev"><?cs if:item.permission != '' ?><a title="View Revision Log" href="<?cs
-       var:item.log_href ?>"><?cs var:item.created_rev ?></a><?cs else ?><?cs var:item.created_rev ?><?cs /if ?></td>
-     <td class="age"><span title="<?cs var:item.date ?>"><?cs
-       var:item.age ?></span></td>
-     <td class="change">
-      <span class="author"><?cs var:item.author ?>:</span>
-      <span class="change"><?cs var:item.change ?></span>
-     </td>
+ <?cs if:browser.is_dir ?>
+  <table class="listing" id="dirlist">
+   <thead>
+    <tr><?cs 
+     call:sortable_th(browser.order, browser.desc, 'name', 'Name', browser.href) ?><?cs 
+     call:sortable_th(browser.order, browser.desc, 'size', 'Size', browser.href) ?>
+     <th class="rev">Rev</th><?cs 
+     call:sortable_th(browser.order, browser.desc, 'date', 'Age', browser.href) ?>
+     <th class="change">Last Change</th>
     </tr>
-   <?cs /each ?>
-  </tbody>
- </table>
+   </thead>
+   <tbody>
+    <?cs if:len(links.up) != "/" ?>
+     <tr class="even">
+      <td class="name" colspan="4">
+       <a class="parent" title="Parent Directory" href="<?cs
+         var:links.up.0.href ?>">../</a>
+      </td>
+     </tr>
+    <?cs /if ?>
+    <?cs each:item = browser.items ?>
+     <?cs set:change = browser.changes[item.rev] ?>
+     <tr class="<?cs if:name(item) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
+      <td class="name"><?cs
+       if:item.is_dir ?><?cs
+        if:item.permission ?>
+         <a class="dir" title="Browse Directory" href="<?cs
+           var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
+        else ?>
+         <span class="dir" title="Access Denied" href=""><?cs
+           var:item.name ?></span><?cs
+        /if ?><?cs
+       else ?><?cs
+        if:item.permission != '' ?>
+         <a class="file" title="View File" href="<?cs
+           var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
+        else ?>
+         <span class="file" title="Access Denied" href=""><?cs
+           var:item.name ?></span><?cs
+        /if ?><?cs
+       /if ?>
+      </td>
+      <td class="size"><?cs var:item.size ?></td>
+      <td class="rev"><?cs if:item.permission != '' ?><a title="View Revision Log" href="<?cs
+        var:item.log_href ?>"><?cs var:item.rev ?></a><?cs else ?><?cs var:item.rev ?><?cs /if ?></td>
+      <td class="age"><span title="<?cs var:browser.changes[item.rev].date ?>"><?cs
+        var:browser.changes[item.rev].age ?></span></td>
+      <td class="change">
+       <span class="author"><?cs var:browser.changes[item.rev].author ?>:</span>
+       <span class="change"><?cs var:browser.changes[item.rev].message ?></span>
+      </td>
+     </tr>
+    <?cs /each ?>
+   </tbody>
+  </table><?cs
+ /if ?><?cs
+
+ if:len(browser.props) || !browser.is_dir ?>
+  <table id="info" summary="Revision info"><?cs
+   if:!browser.is_dir ?><tr>
+    <th scope="row">
+     Revision <a href="<?cs var:file.changeset_href ?>"><?cs var:file.rev ?></a>
+     (checked in by <?cs var:file.author ?>, <?cs var:file.age ?> ago)
+    </th>
+    <td class="message"><?cs var:file.message ?></td>
+   </tr><?cs /if ?><?cs
+   if:len(browser.props) ?><tr>
+    <td colspan="2"><ul class="props"><?cs
+     each:prop = browser.props ?>
+      <li>Property <strong><?cs var:name(prop) ?></strong> set to <em><code><?cs
+      var:prop ?></code></em></li><?cs
+     /each ?>
+    </ul></td><?cs
+   /if ?></tr>
+  </table><?cs
+ /if ?><?cs
+ 
+ if:!browser.is_dir ?>
+  <div id="preview"><?cs
+   if:file.preview ?><?cs
+    var:file.preview ?><?cs
+   elif:file.max_file_size_reached ?>
+    <strong>HTML preview not available</strong>, since file-size exceeds <?cs
+    var:file.max_file_size  ?> bytes. Try <a href="<?cs
+    var:file.raw_href ?>">downloading</a> the file instead.<?cs
+   else ?><strong>HTML preview not available</strong>. To view, <a href="<?cs
+    var:file.raw_href ?>">download</a> the file.<?cs
+   /if ?>
+  </div><?cs
+ /if ?>
 
  <div id="help">
   <strong>Note:</strong> See <a href="<?cs var:trac.href.wiki
diff --git a/django_website/templates/trac_templates/changeset.cs b/django_website/templates/trac_templates/changeset.cs
index f3bd925c6..f1c723d9b 100644
--- a/django_website/templates/trac_templates/changeset.cs
+++ b/django_website/templates/trac_templates/changeset.cs
@@ -23,7 +23,13 @@
 <div id="content" class="changeset">
 <h1>Changeset <?cs var:changeset.revision ?></h1>
 
-<?cs if:len(changeset.diff.files) ?><form method="post" id="prefs" action="">
+<?cs each:change = changeset.changes ?><?cs
+ if:len(change.diff) ?><?cs
+  set:has_diffs = 1 ?><?cs
+ /if ?><?cs
+/each ?><?cs if:has_diffs || diff.options.ignoreblanklines 
+  || diff.options.ignorecase || diff.options.ignorewhitespace ?>
+<form method="post" id="prefs" action="">
  <div>
   <label for="style">View differences</label>
   <select id="style" name="style">
@@ -63,6 +69,36 @@
  </div>
 </form><?cs /if ?>
 
+<?cs def:node_change(item,cl,kind) ?><?cs 
+  set:ndiffs = len(item.diff) ?><?cs
+  set:nprops = len(item.props) ?>
+  <div class="<?cs var:cl ?>"></div><?cs 
+  if:cl == "rem" ?>
+   <a title="Show what was removed (rev. <?cs var:item.rev.old ?>)" href="<?cs
+     var:item.browser_href.old ?>"><?cs var:item.path.old ?></a><?cs
+  else ?>
+   <a title="Show entry in browser" href="<?cs
+     var:item.browser_href.new ?>"><?cs var:item.path.new ?></a><?cs
+  /if ?>
+  <span class="comment">(<?cs var:kind ?>)</span><?cs
+  if:item.path.old && item.change == 'copy' || item.change == 'move' ?>
+   <small><em>(<?cs var:kind ?> from <a href="<?cs
+    var:item.browser_href.old ?>" title="Show original file (rev. <?cs
+    var:item.rev.old ?>)"><?cs var:item.path.old ?></a>)</em></small><?cs
+  /if ?><?cs
+  if:$ndiffs + $nprops > #0 ?>
+    (<a href="#file<?cs var:name(item) ?>" title="Show differences"><?cs
+      if:$ndiffs > #0 ?><?cs var:ndiffs ?>&nbsp;diff<?cs if:$ndiffs > #1 ?>s<?cs /if ?><?cs 
+      /if ?><?cs
+      if:$ndiffs && $nprops ?>, <?cs /if ?><?cs 
+      if:$nprops > #0 ?><?cs var:nprops ?>&nbsp;prop<?cs if:$nprops > #1 ?>s<?cs /if ?><?cs
+      /if ?></a>)<?cs
+  elif:cl == "mod" ?>
+    (<a href="<?cs var:item.browser_href.old ?>"
+        title="Show previous version in browser">previous</a>)<?cs
+  /if ?>
+<?cs /def ?>
+
 <dl id="overview">
  <dt class="time">Timestamp:</dt>
  <dd class="time"><?cs var:changeset.time ?></dd>
@@ -71,24 +107,20 @@
  <dt class="message">Message:</dt>
  <dd class="message" id="searchable"><?cs var:changeset.message ?></dd>
  <dt class="files">Files:</dt>
- <dd class="files"><?cs set:anchor_idx = #0 ?>
+ <dd class="files">
   <ul><?cs each:item = changeset.changes ?>
-   <li>
-    <?cs if:item.change == "A" ?>
-     <div class="add"></div>
-     <a href="<?cs var:item.browser_href ?>" title="Show file in browser"><?cs
-       var:item.name ?></a> <span class="comment">(added)</span>
-    <?cs elif:item.change == "M" ?>
-     <div class="mod"></div>
-     <a href="<?cs var:item.browser_href ?>" title="Show file in browser"><?cs
-       var:item.name ?></a> <span class="comment">(modified)</span><?cs
-     if:len(changeset.diff.files[anchor_idx].changes) ?>
-      (<a href="#file<?cs var:anchor_idx ?>" title="Show differences">diff</a>)<?cs
-     /if ?><?cs set:anchor_idx = anchor_idx + #1 ?>
-    <?cs elif:item.change == "D" ?>
-     <div class="rem"></div>
-     <?cs var:item.name ?> <span class="comment">(deleted)</span>
-    <?cs /if ?>
+   <li><?cs
+    if:item.change == 'add' ?><?cs
+     call:node_change(item, 'add', 'added') ?><?cs
+    elif:item.change == 'delete' ?><?cs
+     call:node_change(item, 'rem', 'deleted') ?><?cs
+    elif:item.change == 'copy' ?><?cs
+     call:node_change(item, 'cp', 'copied') ?><?cs
+    elif:item.change == 'move' ?><?cs
+     call:node_change(item, 'mv', 'moved') ?><?cs
+    elif:item.change == 'edit' ?><?cs
+     call:node_change(item, 'mod', 'modified') ?><?cs
+    /if ?>
    </li>
   <?cs /each ?></ul>
  </dd>
@@ -102,73 +134,71 @@
    <dt class="add"></dt><dd>Added</dd>
    <dt class="rem"></dt><dd>Removed</dd>
    <dt class="mod"></dt><dd>Modified</dd>
+   <dt class="cp"></dt><dd>Copied</dd>
+   <dt class="mv"></dt><dd>Moved</dd>
   </dl>
  </div>
- <ul>
-  <?cs each:file = changeset.diff.files ?>
-   <?cs if:len(file.changes) ?>
-    <li id="file<?cs var:name(file) ?>">
-     <h2><a href="<?cs
-       var:file.browser_href.new ?>" title="Show version <?cs
-       var:file.rev.new ?> of this file in browser"><?cs
-       var:file.name.new ?></a></h2>
-     <?cs if:diff.style == 'sidebyside' ?>
-      <table class="sidebyside" summary="Differences" cellspacing="0">
-       <colgroup class="base">
-        <col class="lineno" /><col class="content" />
-       <colgroup class="chg">
-        <col class="lineno" /><col class="content" />
-       </colgroup>
-       <thead><tr>
-        <th colspan="2"><a href="<?cs var:file.browser_href.old ?>">Revision <?cs
-          var:file.rev.old ?></a></th>
-        <th colspan="2"><a href="<?cs var:file.browser_href.new ?>">Revision <?cs
-          var:file.rev.new ?></a></th>
-       </tr></thead>
-       <?cs each:change = file.changes ?>
-        <tbody>
-         <?cs call:diff_display(change, diff.style) ?>
-        </tbody>
-        <?cs if:name(change) < len(file.changes) - 1 ?>
-         <tbody class="skippedlines">
-          <tr><th>&hellip;</th><td>&nbsp;</td>
-          <th>&hellip;</th><td>&nbsp;</td></tr>
-         </tbody>
-        <?cs /if ?>
-       <?cs /each ?>
-      </table>
-     <?cs else ?>
-      <table class="inline" summary="Differences" cellspacing="0">
-       <colgroup>
-        <col class="lineno" />
-        <col class="lineno" />
-        <col class="content" />
-       </colgroup>
-       <thead><tr>
-        <th title="Revision <?cs var:file.rev.old ?>"><a href="<?cs
-          var:file.browser_href.old ?>" title="Show revision <?cs
-          var:file.rev.old ?> of this file in browser">r<?cs
-          var:file.rev.old ?></a></th>
-        <th title="Revision <?cs var:file.rev.new ?>"><a href="<?cs
-          var:file.browser_href.new ?>" title="Show revision <?cs
-          var:file.rev.new ?> of this file in browser">r<?cs
-          var:file.rev.new ?></a></th>
-        <th>&nbsp;</th>
-       </tr></thead>
-       <?cs each:change = file.changes ?>
-        <?cs call:diff_display(change, diff.style) ?>
-        <?cs if:name(change) < len(file.changes) - 1 ?>
-         <tbody class="skippedlines">
-          <tr><th>&hellip;</th><th>&hellip;</th><td>&nbsp;</td></tr>
-         </tbody>
-        <?cs /if ?>
-       <?cs /each ?>
-      </table>
-     <?cs /if ?>
-    </li>
-   <?cs /if ?>
-  <?cs /each ?>
- </ul>
+ <ul class="entries"><?cs
+ each:item = changeset.changes ?><?cs
+  if:len(item.diff) || len(item.props) ?><li class="entry" id="file<?cs
+   var:name(item) ?>"><h2><a href="<?cs
+   var:item.browser_href.new ?>" title="Show new revision <?cs
+   var:item.rev.new ?> of this file in browser"><?cs
+   var:item.path.new ?></a></h2><?cs
+   if:len(item.props) ?><ul class="props"><?cs
+    each:prop = item.props ?><li>Property <strong><?cs
+     var:name(prop) ?></strong> <?cs
+     if:prop.old && prop.new ?>changed from <?cs
+     elif:!prop.old ?>set<?cs
+     else ?>deleted<?cs
+     /if ?><?cs
+     if:prop.old && prop.new ?><em><tt><?cs var:prop.old ?></tt></em><?cs /if ?><?cs
+     if:prop.new ?> to <em><tt><?cs var:prop.new ?></tt></em><?cs /if ?></li><?cs
+    /each ?></ul><?cs
+   /if ?><?cs
+   if:len(item.diff) ?><table class="<?cs
+    var:diff.style ?>" summary="Differences" cellspacing="0"><?cs
+    if:diff.style == 'sidebyside' ?>
+     <colgroup class="l"><col class="lineno" /><col class="content" /></colgroup>
+     <colgroup class="r"><col class="lineno" /><col class="content" /></colgroup>
+     <thead><tr>
+      <th colspan="2"><a href="<?cs
+       var:item.browser_href.old ?>" title="Show old rev. <?cs
+       var:item.rev.old ?> of <?cs var:item.path.old ?>">Revision <?cs
+       var:item.rev.old ?></a></th>
+      <th colspan="2"><a href="<?cs
+       var:item.browser_href.new ?>" title="Show new rev. <?cs
+       var:item.rev.old ?> of <?cs var:item.path.new ?>">Revision <?cs
+       var:item.rev.new ?></a></th>
+      </tr>
+     </thead><?cs
+     each:change = item.diff ?><tbody><?cs
+      call:diff_display(change, diff.style) ?></tbody><?cs
+      if:name(change) < len(item.diff) - 1 ?><tbody class="skipped"><tr>
+       <th>&hellip;</th><td>&nbsp;</td><th>&hellip;</th><td>&nbsp;</td>
+      </tr></tbody><?cs /if ?><?cs
+     /each ?><?cs
+    else ?>
+     <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
+     <thead><tr>
+      <th title="Revision <?cs var:item.rev.old ?>"><a href="<?cs
+       var:item.browser_href.old ?>" title="Show old version of <?cs
+       var:item.path.old ?>">r<?cs var:item.rev.old ?></a></th>
+      <th title="Revision <?cs var:item.rev.new ?>"><a href="<?cs
+       var:item.browser_href.new ?>" title="Show new version of <?cs
+       var:item.path.new ?>">r<?cs var:item.rev.new ?></a></th>
+      <th>&nbsp;</th></tr>
+     </thead><?cs
+     each:change = item.diff ?><?cs
+      call:diff_display(change, diff.style) ?><?cs
+      if:name(change) < len(item.diff) - 1 ?><tbody class="skipped"><tr>
+       <th>&hellip;</th><th>&hellip;</th><td>&nbsp;</td>
+      </tr></tbody><?cs /if ?><?cs
+     /each ?><?cs
+    /if ?></table><?cs
+   /if ?></li><?cs
+  /if ?><?cs
+ /each ?></ul>
 </div>
 
 </div>
diff --git a/django_website/templates/trac_templates/header.cs b/django_website/templates/trac_templates/header.cs
index 4d06f745a..1b6b31ba3 100644
--- a/django_website/templates/trac_templates/header.cs
+++ b/django_website/templates/trac_templates/header.cs
@@ -26,8 +26,8 @@
         <?cs /each ?>
 
         <style type="text/css">
-         <?cs if:html.stylesheet ?>@import url(http://media.djangoproject.com/trac/<?cs
-           var:html.stylesheet ?>);<?cs /if ?>
+         <?cs if:html.stylesheet ?>@import url(http://media.djangoproject.com/trac/<?cs var:html.stylesheet ?>);<?cs /if ?>
+         <?cs if:html.stylesheet2 ?>@import url(http://media.djangoproject.com/trac/<?cs var:html.stylesheet2 ?>);<?cs /if ?>
          <?cs include "site_css.cs" ?>
         </style>
         <script src="<?cs var:htdocs_location ?>trac.js" type="text/javascript"></script>
diff --git a/django_website/templates/trac_templates/log.cs b/django_website/templates/trac_templates/log.cs
index 68d537dab..c0f46ad5e 100644
--- a/django_website/templates/trac_templates/log.cs
+++ b/django_website/templates/trac_templates/log.cs
@@ -5,26 +5,80 @@
 <div id="ctxtnav" class="nav">
  <ul>
   <li class="last"><a href="<?cs
-    var:log.items.0.file_href ?>">View Latest Revision</a></li>
+    var:log.browser_href ?>">View Latest Revision</a></li><?cs
+  if:len(chrome.links.prev) ?>
+   <li class="first<?cs if:!len(chrome.links.next) ?> last<?cs /if ?>">
+    &larr; <a href="<?cs var:chrome.links.prev.0.href ?>" title="<?cs
+      var:chrome.links.prev.0.title ?>">Newer Revisions</a>
+   </li><?cs
+  /if ?><?cs
+  if:len(chrome.links.next) ?>
+   <li class="<?cs if:!len(chrome.links.prev) ?>first <?cs /if ?>last">
+    <a href="<?cs var:chrome.links.next.0.href ?>" title="<?cs
+      var:chrome.links.next.0.title ?>">Older Revisions</a> &rarr;
+   </li><?cs
+  /if ?>
  </ul>
 </div>
 
-<div id="content" class="log">
- <?cs call:browser_path_links(log.path, log) ?>
 
- <div id="jumprev">
-  <form action="<?cs var:browser_current_href ?>" method="get">
-   <div>
-    <label for="rev">View revision:</label>
-    <input type="text" id="rev" name="rev" value="<?cs
-      var:log.items.0.rev ?>" size="4" />
+<div id="content" class="log">
+ <h1><?cs call:browser_path_links(log.path, log) ?></h1>
+ <form id="prefs" action="<?cs var:browser_current_href ?>" method="get">
+  <div>
+   <input type="hidden" name="action" value="<?cs var:log.mode ?>" />
+   <label>View log starting at <input type="text" id="rev" name="rev" value="<?cs
+    var:log.items.0.rev ?>" size="5" /></label>
+   <label>and back to <input type="text" id="stop_rev" name="stop_rev" value="<?cs
+    var:log.stop_rev ?>" size="5" /></label>
+   <br />
+   <div class="choice" ?>
+    <fieldset>
+     <legend>Mode:</legend>
+     <label for="stop_on_copy">
+      <input type="radio" id="stop_on_copy" name="mode" value="stop_on_copy" <?cs
+       if:log.mode != "follow_copy" || log.mode != "path_history" ?> checked="checked" <?cs
+       /if ?> />
+      Stop on copy 
+     </label>
+     <label for="follow_copy">
+      <input type="radio" id="follow_copy" name="mode" value="follow_copy" <?cs
+       if:log.mode == "follow_copy" ?> checked="checked" <?cs /if ?> />
+      Follow copies
+     </label>
+     <label for="path_history">
+      <input type="radio" id="path_history" name="mode" value="path_history" <?cs
+       if:log.mode == "path_history" ?> checked="checked" <?cs /if ?> />
+      Show only adds, moves and deletes
+     </label>
+    </fieldset>
    </div>
-  </form>
+   <label><input type="checkbox" name="verbose" <?cs
+    if:log.verbose ?> checked="checked" <?cs
+    /if ?> /> Show full log messages</label>
+  </div>
+  <div class="buttons">
+   <input type="submit" value="Update" 
+          title="Warning: by updating, you will clear the page history" />
+  </div>
+ </form>
+ <div class="diff">
+  <div id="legend">
+   <h3>Legend:</h3>
+   <dl>
+    <dt class="add"></dt><dd>Added</dd><?cs
+    if:log.mode == "path_history" ?>
+     <dt class="rem"></dt><dd>Removed</dd><?cs
+    /if ?>
+    <dt class="mod"></dt><dd>Modified</dd>
+    <dt class="cp"></dt><dd>Copied or renamed</dd>
+   </dl>
+  </div>
  </div>
-
  <table id="chglist" class="listing">
   <thead>
    <tr>
+    <th class="change"></th>
     <th class="data">Date</th>
     <th class="rev">Rev</th>
     <th class="chgset">Chgset</th>
@@ -32,22 +86,51 @@
     <th class="summary">Log Message</th>
    </tr>
   </thead>
-  <tbody>
-   <?cs each:item = log.items ?>
+  <tbody><?cs
+   set:indent = #1 ?><?cs
+   each:item = log.items ?><?cs
+    if:item.copyfrom_path ?>
+     <tr class="<?cs if:name(item) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
+      <td class="copyfrom_path" colspan="6" style="padding-left: <?cs var:indent ?>em">
+       copied from <a href="<?cs var:item.browser_href ?>"?><?cs var:item.copyfrom_path ?></a>:
+      </td>
+     </tr><?cs
+     set:indent = indent + #1 ?><?cs
+    elif:log.mode == "path_history" ?><?cs
+      set:indent = #1 ?><?cs
+    /if ?>
     <tr class="<?cs if:name(item) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
-     <td class="date"><?cs var:item.date ?></td>
+     <td class="change" style="padding-left:<?cs var:indent ?>em">
+      <a title="View log starting at this revision" href="<?cs var:item.log_href ?>">
+       <div class="<?cs var:item.change ?>"></div>
+       <span class="comment">(<?cs var:item.change ?>)</span>
+      </a>
+     </td>
+     <td class="date"><?cs var:log.changes[item.rev].date ?></td>
      <td class="rev">
-      <a href="<?cs var:item.file_href ?>"><?cs var:item.rev ?></a>
+      <a href="<?cs var:item.browser_href ?>"><?cs var:item.rev ?></a>
      </td>
      <td class="chgset">
-      <a class="block-link" href="<?cs var:item.changeset_href ?>"><?cs var:item.rev ?></a>
+      <a href="<?cs var:item.changeset_href ?>"><?cs var:item.rev ?></a>
      </td>
-     <td class="author"><?cs var:item.author ?></td>
-     <td class="summary"><?cs var:item.log ?></td>
-    </tr>
-   <?cs /each ?>
+     <td class="author"><?cs var:log.changes[item.rev].author ?></td>
+     <td class="summary"><?cs var:log.changes[item.rev].message ?></td>
+    </tr><?cs
+   /each ?>
   </tbody>
- </table>
+ </table><?cs
+ if:len(links.prev) || len(links.next) ?><div id="paging" class="nav"><ul><?cs
+  if:len(links.prev) ?><li class="first<?cs
+   if:!len(links.next) ?> last<?cs /if ?>">&larr; <a href="<?cs
+   var:links.prev.0.href ?>" title="<?cs
+   var:links.prev.0.title ?>">Younger Revisions</a></li><?cs
+  /if ?><?cs
+  if:len(links.next) ?><li class="<?cs
+   if:len(links.prev) ?>first <?cs /if ?>last"><a href="<?cs
+   var:links.next.0.href ?>" title="<?cs
+   var:links.next.0.title ?>">Older Revisions</a> &rarr;</li><?cs
+  /if ?></ul></div><?cs
+ /if ?>
 
 </div>
 <?cs include "footer.cs"?>
diff --git a/django_website/templates/trac_templates/log_rss.cs b/django_website/templates/trac_templates/log_rss.cs
index be37cb191..66b4150d4 100644
--- a/django_website/templates/trac_templates/log_rss.cs
+++ b/django_website/templates/trac_templates/log_rss.cs
@@ -1,31 +1,27 @@
 <?xml version="1.0"?>
-<!-- RSS generated by Trac v<?cs var:$trac.version ?> on <?cs var:$trac.time ?> -->
+<!-- RSS generated by Trac v<?cs var:trac.version ?> on <?cs var:trac.time ?> -->
 <rss version="2.0">
-   <?cs set base_url = $HTTP.Protocol+'://'+$HTTP.Host ?>
-   <?cs if $HTTP.Port ?>
-     <?cs set base_url = $base_url + ':' + $HTTP.Port ?>
-   <?cs /if ?>
-    <channel>
-      <?cs if $project.name.encoded ?>
-        <title><?cs var:$project.name.encoded ?>: Revisions of <?cs var:$log.path ?></title>
-      <?cs else ?>
-        <title>Revisions of <?cs var:$log.filename ?></title>
-      <?cs /if ?>
-      <link><?cs var:$base_url ?><?cs var:$log.href ?></link>
-      <description>Trac Log - Revisions of <?cs var:$log.path ?></description>
-      <language>en-us</language>
-      <generator>Trac v<?cs var:$trac.version ?></generator>
-      <?cs each:item = $log.items ?>
-       <item>
-<!--  XXX: author element requires email address in rss 2.0.
-           maybe we should use the DC rdf stuff for metadata instead?
-       <author><?cs var:$item.author ?></author> -->
-         <pubDate><?cs var:$item.gmt ?></pubDate>
-         <title><?cs var:$item.rev+': '+$item.shortlog ?></title>
-         <link><?cs var:$base_url+$item.file_href ?></link>
-         <description><?cs var:$item.log.raw ?></description>
-         <category>Report</category>
-       </item>
-      <?cs /each ?>
-    </channel>
+ <channel><?cs 
+  if:project.name.encoded ?>
+   <title><?cs var:project.name.encoded ?>: Revisions of <?cs var:log.path ?></title><?cs 
+  else ?>
+   <title>Revisions of <?cs var:log.path ?></title><?cs 
+  /if ?>
+  <link><?cs var:base_host ?><?cs var:log.log_href ?></link>
+  <description>Trac Log - Revisions of <?cs var:log.path ?></description>
+  <language>en-us</language>
+  <generator>Trac v<?cs var:trac.version ?></generator><?cs 
+  each:item = log.items ?><?cs 
+   with:change = log.changes[item.rev] ?>
+    <item>
+     <author><?cs var:change.author ?></author> 
+     <pubDate><?cs var:change.date ?></pubDate>
+     <title>Revision <?cs var:item.rev ?>: <?cs var:change.shortlog ?></title>
+     <link><?cs var:base_host ?><?cs var:item.changeset_href ?></link>
+     <description><?cs var:change.message ?></description>
+     <category>Report</category>
+    </item><?cs 
+   /with ?><?cs 
+  /each ?>
+ </channel>
 </rss>
diff --git a/django_website/templates/trac_templates/macros.cs b/django_website/templates/trac_templates/macros.cs
index a24a3a8e3..da8d00fe6 100644
--- a/django_website/templates/trac_templates/macros.cs
+++ b/django_website/templates/trac_templates/macros.cs
@@ -1,207 +1,179 @@
-<?cs def:hdf_select(options, name, selected) ?>
+<?cs def:hdf_select(options, name, selected, optional) ?>
  <select size="1" id="<?cs var:name ?>" name="<?cs var:name ?>"><?cs
-  each:option = options ?><?cs
-   if option.name == $selected ?>
-    <option selected="selected"><?cs var:option.name ?></option><?cs
-   else ?>
-    <option><?cs var:option.name ?></option><?cs
-   /if ?><?cs
+  if:optional ?><option></option><?cs /if ?><?cs
+  each:option = options ?>
+   <option<?cs if:option == selected ?> selected="selected"<?cs /if ?>><?cs 
+     var:option ?></option><?cs
   /each ?>
  </select><?cs
 /def?>
 
-<?cs def:hdf_select_multiple(options, name, size) ?>
- <select size="<?cs var:size ?>" id="<?cs var:name ?>" name="<?cs
-   var:name ?>" multiple="multiple"><?cs
-  each:option = options ?>
-   <option<?cs if:option.selected ?> selected="selected"<?cs /if ?>><?cs
-    var:option.name ?></option><?cs
-  /each ?>
- </select><?cs
+<?cs def:labelled_hdf_select(label, options, name, selected, optional) ?><?cs 
+ if:len(options) > #0 ?>
+  <label for="<?cs var:name ?>"><?cs var:label ?></label><?cs
+   call:hdf_select(options, name, selected, optional) ?>
+  </label>
+  <br /><?cs
+ /if ?><?cs
 /def ?>
 
 <?cs def:browser_path_links(path, file) ?><?cs
- set:first = #1 ?>
- <h1><?cs
+ set:first = #1 ?><?cs
   each:part = path ?><?cs
    set:last = name(part) == len(path) - #1 ?><a<?cs 
    if:first ?> class="first" title="Go to root directory"<?cs 
     set:first = #0 ?><?cs 
-   else ?> title="Go to directory"<?cs
-   /if ?> href="<?cs var:part.url ?>"><?cs var:part ?></a><?cs
-   if:file.filename || !last ?><span class="sep">/</span><?cs /if ?><?cs 
+   else ?> title="View <?cs var:part.name ?>"<?cs
+   /if ?> href="<?cs var:part.href ?>"><?cs var:part.name ?></a><?cs
+   if:!last ?><span class="sep">/</span><?cs /if ?><?cs 
  /each ?><?cs
- if:file.filename ?><span class="filename"><?cs var:file.filename ?></span><?cs
- /if ?></h1>
-<?cs /def ?>
+/def ?>
 
-<?cs def:diff_display(change, style) ?><?cs
+<?cs def:diff_line_class(block, line) ?><?cs
+ set:first = name(line) == 0 ?><?cs
+ set:last = name(line) + 1 == len(block.lines) ?><?cs
+ if:first || last ?> class="<?cs
+  if:first ?>first<?cs /if ?><?cs
+  if:first && last ?> <?cs /if ?><?cs
+  if:last ?>last<?cs /if ?>"<?cs
+ /if ?><?cs
+/def ?>
+
+<?cs def:diff_display(diff, style) ?><?cs
  if:style == 'sidebyside' ?><?cs
-  each:block = change.blocks ?><?cs
-   if:block.type == 'unmod' ?><tbody class="unmod"><?cs
-    each:line = block.base.lines ?><tr>
-     <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
-     <td class="base"><span><?cs var:line ?></span>&nbsp;</td>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) + 1 ?></th>
-     <td class="chg"><span><?cs var:line ?></span>&nbsp;</td>
-    </tr><?cs /each ?>
-   </tbody><?cs
+  each:block = diff ?><?cs
+   if:block.type == 'unmod' ?><tbody><?cs
+    each:line = block.base.lines ?><tr><th><?cs
+     var:#block.base.offset + name(line) + 1 ?></th><td class="l"><span><?cs
+     var:line ?></span>&nbsp;</td><th><?cs
+     var:#block.changed.offset + name(line) + 1 ?></th><td class="r"><span><?cs
+     var:block.changed.lines[name(line)] ?></span>&nbsp;</td></tr><?cs
+    /each ?></tbody><?cs
    elif:block.type == 'mod' ?><tbody class="mod"><?cs
     if:len(block.base.lines) >= len(block.changed.lines) ?><?cs
-     each:line = block.base.lines ?><tr>
-      <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
-      <td class="base"><?cs var:line ?>&nbsp;</td><?cs
+     each:line = block.base.lines ?><tr><th><?cs
+      var:#block.base.offset + name(line) + 1 ?></th><td class="l"><?cs
+      var:line ?>&nbsp;</td><?cs
       if:len(block.changed.lines) >= name(line) + 1 ?><?cs
        each:changedline = block.changed.lines ?><?cs
-        if:name(changedline) == name(line) ?>
-         <th class="chg"><?cs var:#block.changed.offset + name(changedline) + 1 ?></th>
-         <td class="chg"><?cs var:changedline ?>&nbsp;</td><?cs
+        if:name(changedline) == name(line) ?><th><?cs
+         var:#block.changed.offset + name(changedline) + 1 ?></th><td class="r"><?cs
+         var:changedline ?>&nbsp;</td><?cs
         /if ?><?cs
        /each ?><?cs
-      else ?>
-       <th class="chg">&nbsp;</th>
-       <td class="chg">&nbsp;</td><?cs
-      /if ?>
-     </tr><?cs /each ?><?cs
+      else ?><th>&nbsp;</th><td class="r">&nbsp;</td><?cs
+      /if ?></tr><?cs
+     /each ?><?cs
     else ?><?cs
      each:line = block.changed.lines ?><tr><?cs
       if:len(block.base.lines) >= name(line) + 1 ?><?cs
        each:baseline = block.base.lines ?><?cs
-        if:name(baseline) == name(line) ?>
-         <th class="base"><?cs var:#block.base.offset + name(baseline) + 1 ?></th>
-         <td class="base"><?cs var:baseline ?>&nbsp;</td><?cs
+        if:name(baseline) == name(line) ?><th><?cs
+         var:#block.base.offset + name(baseline) + 1 ?></th><td class="l"><?cs
+         var:baseline ?>&nbsp;</td><?cs
         /if ?><?cs
        /each ?><?cs
-      else ?>
-       <th class="base">&nbsp;</th>
-       <td class="base">&nbsp;</td><?cs
+      else ?><th>&nbsp;</th><td class="l">&nbsp;</td><?cs
       /if ?>
-      <th class="chg"><?cs var:#block.changed.offset + name(line) + 1 ?></th>
-      <td class="chg"><?cs var:line ?>&nbsp;</td>
-     </tr><?cs /each ?><?cs
-    /if ?>
-   </tbody><?cs
+      <th><?cs var:#block.changed.offset + name(line) + 1 ?></th>
+      <td class="r"><?cs var:line ?>&nbsp;</td></tr><?cs
+     /each ?><?cs
+    /if ?></tbody><?cs
    elif:block.type == 'add' ?><tbody class="add"><?cs
-    each:line = block.changed.lines ?><tr>
-     <th class="base">&nbsp;</th>
-     <td class="base">&nbsp;</td>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) + 1 ?></th>
-     <td class="chg"><ins><?cs var:line ?></ins>&nbsp;</td>
-    </tr><?cs /each ?><?cs
+    each:line = block.changed.lines ?><tr><th>&nbsp;</th><td class="l">&nbsp;</td><th><?cs
+     var:#block.changed.offset + name(line) + 1 ?></th><td class="r"><ins><?cs
+     var:line ?></ins>&nbsp;</td></tr><?cs
+    /each ?><?cs
    elif:block.type == 'rem' ?><tbody class="rem"><?cs
-    each:line = block.base.lines ?><tr>
-     <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
-     <td class="base"><del><?cs var:line ?></del>&nbsp;</td>
-     <th class="chg">&nbsp;</th>
-     <td class="chg">&nbsp;</td>
-    </tr><?cs /each ?><?cs
-   /if ?>
-  </tbody><?cs
+    each:line = block.base.lines ?><tr><th><?cs
+     var:#block.base.offset + name(line) + 1 ?></th><td class="l"><del><?cs
+     var:line ?></del>&nbsp;</td><th>&nbsp;</th><td class="r">&nbsp;</td></tr><?cs
+    /each ?><?cs
+   /if ?></tbody><?cs
   /each ?><?cs
  else ?><?cs
-  each:block = change.blocks ?>
-   <?cs if:block.type == 'unmod' ?><tbody class="unmod"><?cs
-    each:line = block.base.lines ?><tr>
-     <th class="base"><?cs var:#block.base.offset + name(line) + #1 ?></th>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) + #1 ?></th>
-     <td class="base"><span><?cs var:line ?></span>&nbsp;</td>
-    </tr><?cs /each ?>
-   </tbody>
-   <?cs elif:block.type == 'mod' ?><tbody class="mod"><?cs
-    each:line = block.base.lines ?><tr class="<?cs
-      if:name(line) == 0 ?>first<?cs /if ?>">
-     <th class="base"><?cs var:#block.base.offset + name(line) + #1 ?></th>
-     <th class="chg">&nbsp;</th>
-     <td class="base"><?cs var:line ?>&nbsp;</td>
-    </tr><?cs /each ?><?cs
-    each:line = block.changed.lines ?><tr class="<?cs
-      if:name(line) + 1 == len(block.changed.lines) ?> last<?cs /if ?>">
-     <th class="base">&nbsp;</th>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) + #1 ?></th>
-     <td class="chg"><?cs var:line ?>&nbsp;</td>
-    </tr><?cs /each ?>
-   </tbody>
-   <?cs elif:block.type == 'add' ?><tbody class="add"><?cs
-    each:line = block.changed.lines ?><tr class="<?cs
-      if:name(line) == 0 ?>first<?cs /if ?><?cs
-      if:name(line) + 1 == len(block.changed.lines) ?> last ?><?cs /if ?>">
-     <th class="base">&nbsp;</th>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) + #1 ?></th>
-     <td class="chg"><ins><?cs var:line ?></ins>&nbsp;</td>
-    </tr><?cs /each ?>
-   </tbody>
-   <?cs elif:block.type == 'rem' ?><tbody class="rem"><?cs
-    each:line = block.base.lines ?><tr class="<?cs
-      if:name(line) == 0 ?>first<?cs /if ?><?cs
-      if:name(line) + 1 == len(block.base.lines) ?> last ?><?cs /if ?>">
-     <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
-     <th class="chg">&nbsp;</th>
-     <td class="base"><del><?cs var:line ?></del>&nbsp;</td>
-    </tr><?cs /each ?>
-   </tbody>
-   <?cs /if ?><?cs
+  each:block = diff ?><?cs
+   if:block.type == 'unmod' ?><tbody><?cs
+    each:line = block.base.lines ?><tr><th><?cs
+     var:#block.base.offset + name(line) + #1 ?></th><th><?cs
+     var:#block.changed.offset + name(line) + #1 ?></th><td class="l"><span><?cs
+     var:line ?></span>&nbsp;</td></tr><?cs
+    /each ?></tbody><?cs
+   elif:block.type == 'mod' ?><tbody class="mod"><?cs
+    each:line = block.base.lines ?><tr<?cs
+     if:name(line) == 0 ?> class="first"<?cs /if ?>><th><?cs
+     var:#block.base.offset + name(line) + #1 ?></th><th>&nbsp;</th><td class="l"><?cs
+     var:line ?>&nbsp;</td></tr><?cs
+    /each ?><?cs
+    each:line = block.changed.lines ?><tr<?cs
+     if:name(line) + 1 == len(block.changed.lines) ?> class="last"<?cs /if ?>><th>&nbsp;</th><th><?cs
+     var:#block.changed.offset + name(line) + #1 ?></th><td class="r"><?cs
+     var:line ?>&nbsp;</td></tr><?cs
+    /each ?></tbody><?cs
+   elif:block.type == 'add' ?><tbody class="add"><?cs
+    each:line = block.changed.lines ?><tr<?cs
+     call:diff_line_class(block.changed, line) ?>><th>&nbsp;</th><th><?cs
+     var:#block.changed.offset + name(line) + #1 ?></th><td class="r"><ins><?cs
+     var:line ?></ins>&nbsp;</td></tr><?cs
+    /each ?></tbody><?cs
+   elif:block.type == 'rem' ?><tbody class="rem"><?cs
+    each:line = block.base.lines ?><tr<?cs
+     call:diff_line_class(block.base, line) ?>><th><?cs
+     var:#block.base.offset + name(line) + 1 ?></th><th>&nbsp;</th><td class="l"><del><?cs
+     var:line ?></del>&nbsp;</td></tr><?cs
+    /each ?></tbody><?cs
+   /if ?><?cs
   /each ?><?cs
  /if ?><?cs
-/def ?>
-
-<?cs def:session_name_email() ?><?cs
-  if trac.authname != "anonymous" ?><?cs 
-     var:trac.authname ?><?cs 
-  elif trac.session.var.name && trac.session.var.email ?><?cs
-     var:trac.session.var.name ?> &lt;<?cs var:trac.session.var.email ?>&gt;<?cs 
-  elif !trac.session.var.name && trac.session.var.email ?><?cs 
-     var:trac.session.var.email ?><?cs 
-  else ?><?cs
-     var:trac.authname ?><?cs 
-  /if ?><?cs
-  /def ?>
+/def ?><?cs
 
-<?cs def:ticket_custom_props(ticket) ?><?cs
+def:ticket_custom_props(ticket) ?><?cs
  each c=ticket.custom ?>
   <div class="field custom_<?cs var c.name ?>"><?cs
-   if c.type == 'text' || c.type == 'select' ?>
-    <label for="custom_<?cs var c.name ?>"><?cs alt c.label ?><?cs
-      var c.name ?><?cs /alt ?></label>:<?cs
-   /if ?><?cs
    if c.type == 'text' ?>
-    <input type="text" id="custom_<?cs var c.name ?>" name="custom_<?cs
-      var c.name ?>" value="<?cs var c.value ?>" /><?cs
+    <label>
+     <?cs alt c.label ?><?cs var c.name ?><?cs /alt ?>:
+     <input type="text" name="custom_<?cs var c.name ?>" value="<?cs var c.value ?>" />
+    </label><?cs
    elif c.type == 'textarea' ?>
-    <label for="custom_<?cs var c.name ?>"><?cs alt c.label ?><?cs
-      var c.name ?><?cs /alt ?></label>:<br />
-    <textarea cols="<?cs alt c.width ?>60<?cs /alt ?>" rows="<?cs
-      alt c.height ?>12<?cs /alt ?>" name="custom_<?cs var c.name ?>"><?cs
-      var c.value ?></textarea><?cs
+    <label>
+     <?cs alt c.label ?><?cs var c.name ?><?cs /alt ?>:<br />
+     <textarea cols="<?cs alt c.width ?>60<?cs /alt ?>" rows="<?cs
+       alt c.height ?>12<?cs /alt ?>" name="custom_<?cs var c.name ?>"><?cs
+       var c.value ?></textarea>
+    </label><?cs
    elif c.type == 'checkbox' ?>
-    <input type="hidden" name="checkbox_<?cs var c.name ?>" value="custom_<?cs
-      var c.name ?>" />
-    <input type="checkbox" id="custom_<?cs var c.name ?>" name="custom_<?cs
-      var c.name ?>" value="1" <?cs if c.selected ?>checked="checked"<?cs /if ?> />
-    <label for="custom_<?cs var c.name ?>"><?cs alt c.label ?><?cs
-      var c.name ?><?cs /alt ?></label><?cs
+    <input type="hidden" name="checkbox_<?cs var c.name ?>" />
+    <label>
+     <input type="checkbox" name="custom_<?cs var c.name ?>" value="1"<?cs
+       if c.selected ?> checked="checked"<?cs /if ?> />
+     <?cs alt c.label ?><?cs var c.name ?><?cs /alt ?>
+    </label><?cs
    elif c.type == 'select' ?>
-    <select name="custom_<?cs var c.name ?>"><?cs each v = c.option ?>
-     <option <?cs if v.selected ?>selected="selected"<?cs /if ?>><?cs
-       var v ?></option><?cs /each ?>
-    </select><?cs
+    <label>
+     <?cs alt c.label ?><?cs var c.name ?><?cs /alt ?>:
+     <select name="custom_<?cs var c.name ?>"><?cs each v = c.option ?>
+      <option<?cs if v.selected ?> selected="selected"<?cs /if ?>><?cs
+        var v ?></option><?cs /each ?>
+     </select>
+    </label><?cs
    elif c.type == 'radio' ?>
     <fieldset class="radio">
      <legend><?cs alt c.label ?><?cs var c.name ?><?cs /alt ?>:</legend><?cs
      each v = c.option ?>
-      <input type="radio" id="custom_<?cs var c.name ?>_<?cs
-        var v ?>" name="custom_<?cs var c.name ?>"<?cs
-        if v.selected ?> checked="checked"<?cs /if ?> value="<?cs var v ?>"/>
-      <label for="custom_<?cs var c.name ?>_<?cs var v ?>"><?cs
-        var v ?></label><?cs
+      <label><input type="radio" name="custom_<?cs var c.name ?>" value="<?cs
+         var v ?>"<?cs if v.selected ?> checked="checked"<?cs /if ?> /> <?cs
+         var v ?></label><?cs
      /each ?>
     </fieldset><?cs
    /if ?>
   </div><?cs
  /each ?><?cs
-/def ?>
+/def ?><?cs 
 
-<?cs def:wiki_toolbar(textarea_id) ?>
-<script type='text/javascript'>
- addWikiFormattingToolbar(document.getElementById("<?cs var:textarea_id ?>"));
-</script>
-<?cs /def ?>
+def:sortable_th(order, desc, class, title, href) ?>
+ <th class="<?cs var:class ?><?cs if:order == class ?> <?cs if:desc ?>desc<?cs else ?>asc<?cs /if ?><?cs /if ?>">
+  <a title="Sort by <?cs var:class ?><?cs if:order == class && !desc ?> (descending)<?cs /if ?>"
+     href="<?cs var:href ?>&order=<?cs var:class ?><?cs if:order == class && !desc ?>&desc=1<?cs /if ?>"><?cs var:title ?></a>
+ </th><?cs
+/def ?>
diff --git a/django_website/templates/trac_templates/milestone.cs b/django_website/templates/trac_templates/milestone.cs
index ba7acb52e..e7217f854 100644
--- a/django_website/templates/trac_templates/milestone.cs
+++ b/django_website/templates/trac_templates/milestone.cs
@@ -2,14 +2,7 @@
 <?cs include:"header.cs"?>
 <?cs include:"macros.cs"?>
 
-<div id="ctxtnav" class="nav">
- <ul>
-  <?cs if:milestone.href.edit ?><li class="first"><a href="<?cs
-    var:milestone.href.edit ?>">Edit Milestone Info</a></li><?cs /if ?>
-  <?cs if:milestone.href.delete ?><li class="last"><a href="<?cs
-    var:milestone.href.delete ?>">Delete Milestone</a></li><?cs /if ?>
- </ul>
-</div>
+<div id="ctxtnav" class="nav"></div>
 
 <div id="content" class="milestone">
  <?cs if:milestone.mode == "new" ?>
@@ -20,76 +13,78 @@
  <h1>Delete Milestone <?cs var:milestone.name ?></h1>
  <?cs else ?>
  <h1>Milestone <?cs var:milestone.name ?></h1>
- <form action="#stats" id="prefs" method="get">
-  <div>
-   <label for="by">View status by</label>
-   <select id="by" name="by"><?cs each:group = milestone.stats.available_groups ?>
-    <option<?cs
-      if:milestone.stats.grouped_by == group?> selected="selected"<?cs
-      /if ?>><?cs var:group ?></option>
-   <?cs /each ?></select>
-   <div>
-    <input name="showempty" id="showempty" type="checkbox"<?cs
-       if:milestone.stats.show_empty ?> checked="checked"<?cs /if ?>>
-    <label for="showempty">Show groups with no assigned tickets</label>
-   </div>
-   <div class="buttons">
-    <input type="submit" value="Update" />
-   </div>
-  </div>
- </form>
  <?cs /if ?>
 
  <?cs if:milestone.mode == "edit" || milestone.mode == "new" ?>
   <script type="text/javascript">
     addEvent(window, 'load', function() {
-      document.getElementById('name').focus() }
-    );
+      document.getElementById('name').focus();
+    });
   </script>
-  <form id="edit" action="<?cs var:cgi_location ?>" method="post">
-   <input type="hidden" name="mode" value="milestone" />
+  <form id="edit" action="<?cs var:milestone.href ?>" method="post">
    <input type="hidden" name="id" value="<?cs var:milestone.name ?>" />
-   <input type="hidden" name="action" value="commit_changes" />
+   <input type="hidden" name="action" value="edit" />
    <div class="field">
-    <label for="name">Name of the milestone:</label><br />
+    <label>Name of the milestone:<br />
     <input type="text" id="name" name="name" size="32" value="<?cs
-      var:milestone.name ?>" />
-   </div>
-   <div class="field">
-    <label for="datemode">Completion date:</label><br />
-    <select name="datemode" id="datemode"
-        onchange="enableControl('date',this.value=='manual');
-                  if (this.value=='manual') document.getElementById('date').focus();">
-     <option value="manual">Set manually</option>
-     <option value="now">Mark as completed now</option>
-    </select>
-    <input type="text" id="date" name="date" size="8" value="<?cs
-      var:milestone.date ?>" title="Format: <?cs var:milestone.date_hint ?>" />
-    <label for="date"><em>Format: <?cs var:milestone.date_hint ?></em></label>
+      var:milestone.name ?>" /></label>
    </div>
+   <fieldset>
+    <legend>Schedule</legend>
+    <label>Due:<br />
+     <input type="text" id="duedate" name="duedate" size="<?cs
+       var:len(milestone.date_hint) ?>" value="<?cs
+       var:milestone.due_date ?>" title="Format: <?cs var:milestone.date_hint ?>" />
+     <em>Format: <?cs var:milestone.date_hint ?></em>
+    </label>
+    <div class="field">
+     <label>
+      <input type="checkbox" id="completed" name="completed"<?cs
+        if:milestone.completed ?> checked="checked"<?cs /if ?> />
+      Completed:<br />
+     </label>
+     <label>
+      <input type="text" id="completeddate" name="completeddate" size="<?cs
+        var:len(milestone.date_hint) ?>" value="<?cs
+        alt:milestone.completed_date ?><?cs
+         var:milestone.datetime_now ?><?cs
+        /alt ?>" title="Format: <?cs
+        var:milestone.datetime_hint ?>" />
+      <em>Format: <?cs var:milestone.datetime_hint ?></em>
+     </label>
+     <script type="text/javascript">
+       var completed = document.getElementById("completed");
+       var enableCompletedDate = function() {
+         enableControl("completeddate", completed.checked);
+       };
+       addEvent(window, "load", enableCompletedDate);
+       addEvent(completed, "click", enableCompletedDate);
+     </script>
+    </div>
+   </fieldset>
    <div class="field">
     <fieldset class="iefix">
-     <label for="descr">Description (you may use <a tabindex="42" href="<?cs
+     <label for="description">Description (you may use <a tabindex="42" href="<?cs
        var:trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):</label>
-     <p><textarea id="descr" name="descr" rows="12" cols="80"><?cs
-       var:milestone.descr_source ?></textarea></p>
-     <?cs call:wiki_toolbar('descr') ?>
+     <p><textarea id="description" name="description" class="wikitext" rows="10" cols="78"><?cs
+       var:milestone.description_source ?></textarea></p>
     </fieldset>
    </div>
    <div class="buttons">
     <?cs if:milestone.mode == "new"
-     ?><input type="submit" name="save" value="Add Milestone" /><?cs
+     ?><input type="submit" value="Add milestone" /><?cs
     else
-     ?><input type="submit" name="save" value="Save Changes" /><?cs
+     ?><input type="submit" value="Submit changes" /><?cs
     /if ?>
     <input type="submit" name="cancel" value="Cancel" />
    </div>
+   <script type="text/javascript" src="<?cs
+     var:htdocs_location ?>js/wikitoolbar.js"></script>
   </form>
  <?cs elif:milestone.mode == "delete" ?>
-  <form action="<?cs var:cgi_location ?>" method="post">
-   <input type="hidden" name="mode" value="milestone" />
+  <form action="<?cs var:milestone.href ?>" method="post">
    <input type="hidden" name="id" value="<?cs var:milestone.name ?>" />
-   <input type="hidden" name="action" value="confirm_delete" />
+   <input type="hidden" name="action" value="delete" />
    <p><strong>Are you sure you want to delete this milestone?</strong></p>
    <input type="checkbox" id="retarget" name="retarget" checked="checked"
        onclick="enableControl('target', this.checked)"/>
@@ -102,71 +97,122 @@
    </select>
    <div class="buttons">
     <input type="submit" name="cancel" value="Cancel" />
-    <input type="submit" name="delete" value="Delete Milestone" />
+    <input type="submit" value="Delete milestone" />
    </div>
   </form>
  <?cs else ?>
-  <em class="date"><?cs if:milestone.date ?>
-   <?cs var:milestone.date ?><?cs else ?>No date set<?cs /if ?>
-  </em>
-  <div class="descr"><?cs var:milestone.descr ?></div>
- <?cs /if ?>
-
  <?cs if:milestone.mode == "view" ?>
- <h2 class="stats">Status by <?cs var:milestone.stats.grouped_by ?></h2>
- <table class="listing" id="stats"
-   summary="Shows the milestone completion status grouped by <?cs
-     var:milestone.stats.grouped_by ?>">
-  <thead><tr>
-   <th class="name" rowspan="2"><?cs var:milestone.stats.grouped_by ?></th>
-   <th class="tickets" scope="col" colspan="2">Tickets</th>
-   <th class="progress" rowspan="2">Percent Resolved</th>
-  </tr><tr>
-   <th class="open" scope="col">Active</th>
-   <th class="closed" scope="col">Closed</th>
-  </tr></thead>
-  <?cs if:len(milestone.stats.groups) ?><tbody>
-   <?cs each:group = milestone.stats.groups ?>
-    <tr class="<?cs if:name(group) % 2 ?>odd<?cs else ?>even<?cs /if ?>">
-     <th class="name" scope="row"><a href="<?cs
-       var:group.queries.all_tickets ?>"><?cs var:group.name ?></a></th>
-     <td class="open tickets"><a href="<?cs
-       var:group.queries.active_tickets ?>"><?cs
-       var:group.active_tickets ?></a></td>
-     <td class="closed tickets"><a href="<?cs
-       var:group.queries.closed_tickets ?>"><?cs
-       var:group.closed_tickets ?></a></td>
-     <td class="progress">
-      <?cs if:#group.total_tickets ?>
-       <div class="progress" style="width: <?cs
-         var:#group.percent_total * #80 / #100 ?>%"><div style="width: <?cs
-         var:#group.percent_complete ?>%"></div>
-       </div>
-       <p class="percent"><?cs var:#group.percent_complete ?>%</p>
-      <?cs /if ?>
-     </td>
-    </tr>
-   <?cs /each ?>
-  </tbody><?cs /if ?>
-  <tbody class="totals"><tr>
-   <th class="name" scope="row"><a href="<?cs
-     var:milestone.queries.all_tickets ?>">Total</a></th>
-   <td class="open tickets"><a href="<?cs
-     var:milestone.queries.active_tickets ?>"><?cs
-     var:milestone.stats.active_tickets ?></a></td>
-   <td class="closed tickets"><a href="<?cs
-     var:milestone.queries.closed_tickets ?>"><?cs
-     var:milestone.stats.closed_tickets ?></a></td>
-   <td class="progress">
-    <?cs if:#milestone.stats.total_tickets ?>
-     <div class="progress" style="width: 80%">
-      <div style="width: <?cs var:#milestone.stats.percent_complete ?>%"></div>
+  <div class="info">
+   <p class="date"><?cs
+    if:milestone.completed_date ?>
+     Completed <?cs var:milestone.completed_delta ?> ago (<?cs var:milestone.completed_date ?>)<?cs
+    elif:milestone.due_date ?><?cs
+     if:milestone.late ?>
+      <strong><?cs var:milestone.due_delta ?> late</strong><?cs
+     else ?>
+      Due in <?cs var:milestone.due_delta ?><?cs
+     /if ?> (<?cs var:milestone.due_date ?>)<?cs
+    else ?>
+     No date set<?cs
+    /if ?>
+   </p><?cs
+   with:stats = milestone.stats ?><?cs
+    if:#stats.total_tickets > #0 ?>
+     <div class="progress">
+      <a class="closed" href="<?cs
+        var:milestone.queries.closed_tickets ?>" style="width: <?cs
+        var:#stats.percent_closed ?>%" title="<?cs
+        var:#stats.closed_tickets ?> of <?cs
+        var:#stats.total_tickets ?> ticket<?cs
+        if:#stats.total_tickets != #1 ?>s<?cs /if ?> closed"></a>
+      <a class="open" href="<?cs
+        var:milestone.queries.active_tickets ?>" style="width: <?cs
+        var:#stats.percent_active ?>%" title="<?cs
+        var:#stats.active_tickets ?> of <?cs
+        var:#stats.total_tickets ?> ticket<?cs
+        if:#stats.total_tickets != #1 ?>s<?cs /if ?> active"></a>
      </div>
-     <p class="percent"><?cs var:#milestone.stats.percent_complete ?>%</p>
-    <?cs /if ?>
-   </td>
-  </tr></tbody>
- </table><?cs /if ?>
+     <p class="percent"><?cs var:#stats.percent_closed ?>%</p>
+     <dl>
+      <dt>Closed tickets:</dt>
+      <dd><a href="<?cs var:milestone.queries.closed_tickets ?>"><?cs
+        var:stats.closed_tickets ?></a></dd>
+      <dt>Active tickets:</dt>
+      <dd><a href="<?cs var:milestone.queries.active_tickets ?>"><?cs
+        var:stats.active_tickets ?></a></dd>
+     </dl><?cs
+    /if ?><?cs
+   /with ?>
+  </div>
+  <form id="stats" method="get">
+   <fieldset><?cs
+    if:milestone.id_param ?>
+     <input type="hidden" name="id" value="<?cs var:milestone.name ?>" /><?cs
+    /if ?>
+    <legend>
+     <label for="by">Ticket status by</label>
+     <select id="by" name="by" onchange="this.form.submit()"><?cs
+     each:group = milestone.stats.available_groups ?>
+      <option value="<?cs var:group.name ?>" <?cs
+        if:milestone.stats.grouped_by == group.name ?> selected="selected"<?cs
+        /if ?>><?cs var:group.label ?></option><?cs
+     /each ?></select>
+     <noscript><input type="submit" value="Update" /></noscript>
+    </legend>
+    <table summary="Shows the milestone completion status grouped by <?cs
+      var:milestone.stats.grouped_by ?>"><?cs
+     each:group = milestone.stats.groups ?>
+      <tr>
+       <th scope="row"><a href="<?cs
+         var:group.queries.all_tickets ?>"><?cs var:group.name ?></a></th>
+       <td nowrap=nowrap><?cs if:#group.total_tickets ?>
+        <div class="progress" style="width: <?cs
+          var:#group.percent_total * #80 / #milestone.stats.max_percent_total ?>%">
+         <a class="closed" href="<?cs
+           var:group.queries.closed_tickets ?>" style="width: <?cs
+           var:#group.percent_closed ?>%" title="<?cs
+          var:group.closed_tickets ?> of <?cs
+          var:group.total_tickets ?> ticket<?cs
+          if:group.total_tickets != #1 ?>s<?cs /if ?> closed"></a>
+         <a class="open" href="<?cs
+           var:group.queries.active_tickets ?>" style="width: <?cs
+           var:#group.percent_active - 1 ?>%" title="<?cs
+          var:group.active_tickets ?> of <?cs
+          var:group.total_tickets ?> ticket<?cs
+          if:group.total_tickets != 1 ?>s<?cs /if ?> active"></a>
+        </div>
+        <p class="percent"><?cs var:group.closed_tickets ?>/<?cs
+         var:group.total_tickets ?></p>
+       <?cs /if ?></td>
+      </tr><?cs
+     /each ?>
+    </table><?cs /if ?>
+   </fieldset>
+  </form>
+  <div class="description"><?cs var:milestone.description ?></div><?cs
+  if:trac.acl.MILESTONE_MODIFY || trac.acl.MILESTONE_DELETE ?>
+   <div class="buttons"><?cs
+    if:trac.acl.MILESTONE_MODIFY ?>
+     <form method="get" action=""><div>
+      <input type="hidden" name="action" value="edit" /><?cs
+      if:milestone.id_param ?>
+       <input type="hidden" name="id" value="<?cs var:milestone.name ?>" /><?cs
+      /if ?>
+      <input type="submit" value="Edit milestone info" />
+     </div></form><?cs
+    /if ?><?cs
+    if:trac.acl.MILESTONE_DELETE ?>
+     <form method="get" action=""><div>
+      <input type="hidden" name="action" value="delete" /><?cs
+      if:milestone.id_param ?>
+       <input type="hidden" name="id" value="<?cs var:milestone.name ?>" /><?cs
+      /if ?>
+      <input type="submit" value="Delete milestone" />
+     </div></form><?cs
+    /if ?>
+   </div><?cs
+  /if ?><?cs
+ /if ?>
 
  <div id="help">
   <strong>Note:</strong> See <a href="<?cs
diff --git a/django_website/templates/trac_templates/newticket.cs b/django_website/templates/trac_templates/newticket.cs
index b2db343df..81584fc83 100644
--- a/django_website/templates/trac_templates/newticket.cs
+++ b/django_website/templates/trac_templates/newticket.cs
@@ -9,8 +9,9 @@
 
 <div id="content" class="ticket">
 
-<h3>Create New Ticket:</h3>
-<form id="newticket" action="<?cs var:cgi_location ?>#preview" method="post">
+<h1>Create New Ticket</h1>
+<form id="newticket" method="post" action="<?cs
+  var:trac.href.newticket ?>#preview">
  <div class="field">
   <label for="reporter">Your email or username:</label><br />
   <input type="text" id="reporter" name="reporter" size="40" value="<?cs
@@ -18,14 +19,20 @@
  </div>
  <div class="field">
   <label for="summary">Short summary:</label><br />
-  <input id="summary" type="text" name="summary" size="80" value="<?cs var:newticket.summary ?>"/>
- </div>
+  <input id="summary" type="text" name="summary" size="80" value="<?cs
+    var:newticket.summary ?>"/>
+ </div><?cs
+ if:len(newticket.fields.type.options) ?>
+  <div class="field"><label for="type">Type:</label> <?cs
+   call:hdf_select(newticket.fields.type.options, 'type',
+                   newticket.type, 0) ?>
+  </div><?cs
+ /if ?>
  <div class="field">
   <label for="description">Full description (you may use <a tabindex="42" href="<?cs
     var:$trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):</label><br />
-  <textarea id="description" name="description" rows="10" cols="78"><?cs
+  <textarea id="description" name="description" class="wikitext" rows="10" cols="78"><?cs
     var:newticket.description ?></textarea><?cs
-  call:wiki_toolbar('description') ?><?cs
   if:newticket.description_preview ?>
    <fieldset id="preview">
     <legend>Description Preview</legend>
@@ -36,49 +43,72 @@
 
  <fieldset id="properties">
   <legend>Ticket Properties</legend>
-  <input type="hidden" name="mode" value="newticket" />
   <input type="hidden" name="action" value="create" />
   <input type="hidden" name="status" value="new" />
-  <div class="col1">
-   <label for="component">Component:</label><?cs
-   call:hdf_select(newticket.components, "component", newticket.component) ?>
-   <br />
-   <label for="version">Version:</label><?cs
-   call:hdf_select(newticket.versions, "version", newticket.version) ?>
-   <br />
-   <label for="severity">Severity:</label><?cs
-   call:hdf_select(enums.severity, "severity", newticket.severity) ?>
-   <br />
-   <label for="keywords">Keywords:</label>
-   <input type="text" id="keywords" name="keywords" size="20"
-       value="<?cs var:newticket.keywords ?>" />
-  </div>
-  <div class="col2">
-   <label for="priority">Priority:</label><?cs
-   call:hdf_select(enums.priority, "priority", newticket.priority) ?><br />
-   <label for="milestone">Milestone:</label><?cs
-   call:hdf_select(newticket.milestones, "milestone", newticket.milestone) ?><br />
-   <label for="owner">Assign to:</label>
-   <input type="text" id="owner" name="owner" size="20" value="<?cs
-     var:newticket.owner ?>" /><br />
-   <label for="cc">Cc:</label>
-   <input type="text" id="cc" name="cc" size="30" value="<?cs var:newticket.cc ?>" />
-  </div>
-  <?cs if:len(ticket.custom) ?><div class="custom">
-   <?cs call:ticket_custom_props(ticket) ?>
-  </div><?cs /if ?>
+  <table><tr><?cs set:num_fields = 0 ?><?cs
+  each:field = newticket.fields ?><?cs
+   if:!field.skip ?><?cs
+    set:num_fields = num_fields + 1 ?><?cs
+   /if ?><?cs
+  /each ?><?cs set:idx = 0 ?><?cs
+   each:field = newticket.fields ?><?cs
+    if:!field.skip ?><?cs set:fullrow = field.type == 'textarea' ?><?cs
+     if:fullrow && idx % 2 ?><?cs set:idx = idx + 1 ?><th class="col2"></th><td></td></tr><tr><?cs /if ?>
+     <th class="col<?cs var:idx % 2 + 1 ?>"><?cs
+       if:field.type != 'radio' ?><label for="<?cs var:name(field) ?>"><?cs
+       /if ?><?cs alt:field.label ?><?cs var:field.name ?><?cs /alt ?>:<?cs
+       if:field.type != 'radio' ?></label><?cs /if ?></th>
+     <td<?cs if:fullrow ?> colspan="3"<?cs /if ?>><?cs
+      if:field.type == 'text' ?><input type="text" id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>" value="<?cs var:newticket[name(field)] ?>" /><?cs
+      elif:field.type == 'select' ?><select id="<?cs
+        var:name(field) ?>" name="<?cs var:name(field) ?>"><?cs
+        if:field.optional ?><option></option><?cs /if ?><?cs
+        each:option = field.options ?><option<?cs
+         if:option == newticket[name(field)] ?> selected="selected"<?cs /if ?>><?cs
+         var:option ?></option><?cs
+        /each ?></select><?cs
+      elif:field.type == 'checkbox' ?><input type="hidden" name="checkbox_<?cs
+        var:name(field) ?>" /><input type="checkbox" id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>" value="1"<?cs
+        if:newticket[name(field)] ?> checked="checked"<?cs /if ?> /><?cs
+      elif:field.type == 'textarea' ?><textarea id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>"<?cs
+        if:field.height ?> rows="<?cs var:field.height ?>"<?cs /if ?><?cs
+        if:field.width ?> cols="<?cs var:field.width ?>"<?cs /if ?>><?cs
+        var:newticket[name(field)] ?></textarea><?cs
+      elif:field.type == 'radio' ?><?cs set:optidx = 0 ?><?cs
+       each:option = field.options ?><label><input type="radio" id="<?cs
+         var:name(field) ?>" name="<?cs
+         var:name(field) ?>" value="<?cs var:option ?>"<?cs
+         if:ticket[name(field)] == option ?> checked="checked"<?cs /if ?> /> <?cs
+         var:option ?></label> <?cs set:optidx = optidx + 1 ?><?cs
+       /each ?><?cs
+      /if ?></td><?cs
+     if:idx % 2 || fullrow ?></tr><tr><?cs 
+     elif:idx == num_fields - 1 ?><th class="col2"></th><td></td><?cs
+     /if ?><?cs set:idx = idx + #fullrow + 1 ?><?cs
+    /if ?><?cs
+   /each ?></tr>
+  </table>
  </fieldset>
 
+ <script type="text/javascript" src="<?cs
+   var:htdocs_location ?>js/wikitoolbar.js"></script>
+
  <div class="buttons">
-  <input type="submit" value="Preview" />&nbsp;
-  <input type="submit" name="create" value="Submit ticket" />
+  <input type="submit" name="preview" value="Preview" />&nbsp;
+  <input type="submit" value="Submit ticket" />
  </div>
 </form>
 
- <div id="help">
-  <strong>Note:</strong> See <a href="<?cs var:$trac.href.wiki
-  ?>/TracTickets">TracTickets</a> for help on using tickets.
- </div>
+<div id="help">
+ <strong>Note:</strong> See <a href="<?cs
+   var:trac.href.wiki ?>/TracTickets">TracTickets</a> for help on using tickets.
+</div>
 </div>
 
 <?cs include "footer.cs" ?>
diff --git a/django_website/templates/trac_templates/query.cs b/django_website/templates/trac_templates/query.cs
index 94aaf3ff0..81e0daf0a 100644
--- a/django_website/templates/trac_templates/query.cs
+++ b/django_website/templates/trac_templates/query.cs
@@ -2,161 +2,231 @@
 <?cs include:"header.cs" ?>
 <?cs include:"macros.cs" ?>
 
-<div id="ctxtnav" class="nav"><?cs if:query.edit_href ?>
- <ul>
-  <li class="last"><a href="<?cs var:query.edit_href ?>">Refine Query</a></li>
- </ul>
-<?cs /if ?></div>
+<div id="ctxtnav" class="nav"><?cs
+ if:query.report_href ?><ul>
+  <li class="first"><a href="<?cs
+    var:query.report_href ?>">Available Reports</a></li>
+  <li class="last">Custom Query</li></ul><?cs
+ /if ?>
+</div>
 
 <div id="content" class="query">
- <h1><?cs var:title ?></h1>
-
-<?cs if:query.action == 'edit' ?>
+ <h1><?cs var:title ?> <span class="numrows">(<?cs alt:len(query.results) ?>No<?cs /alt ?> match<?cs
+ if:len(query.results) != 1 ?>es<?cs /if ?>)</span></h1>
 
-<form id="query" action="<?cs var:cgi_location ?>" method="post">
- <fieldset>
-  <input type="hidden" name="mode" value="query" />
-  <input type="hidden" name="order" value="<?cs var:query.order ?>" />
-  <?cs if:query.desc ?><input type="hidden" name="desc" value="1" /><?cs /if ?>
-  <legend>Ticket Properties</legend>
-  <div>
-   <label for="component" accesskey="c">Component:</label>
-   <?cs call:hdf_select_multiple(query.options.component, 'component', 4) ?>
-  </div>
-  <div>
-   <label for="version" accesskey="v">Version:</label>
-   <?cs call:hdf_select_multiple(query.options.version, 'version', 4) ?>
-  </div>
-  <div>
-   <label for="severity" accesskey="e">Severity:</label>
-   <?cs call:hdf_select_multiple(query.options.severity, 'severity', 4) ?>
-  </div>
-  <br />
-  <div>
-   <label for="keywords">Keywords contain:</label>
-   <input type="text" name="keywords" id="keywords" accesskey="k" value="<?cs
-     var:query.constraints.keywords.0 ?>" />
-  </div>
-  <br />
-  <div>
-   <label for="status" accesskey="s">Status:</label>
-   <?cs call:hdf_select_multiple(query.options.status, 'status', 4) ?>
-  </div>
-  <div>
-   <label for="resolution" accesskey="r">Resolution:</label>
-   <?cs call:hdf_select_multiple(query.options.resolution, 'resolution', 4) ?>
-   <script type="text/javascript">
-     var status = document.getElementById("status");
-     var updateResolution = function() {
-       enableControl('resolution', status.selectedIndex == -1 ||
-                                   status.selectedIndex >= 3);
-     };
-     addEvent(window, 'load', updateResolution);
-     addEvent(status, 'change', updateResolution);
-   </script>
-  </div>
-  <div>
-   <label for="milestone" accesskey="m">Milestone:</label>
-   <?cs call:hdf_select_multiple(query.options.milestone, 'milestone', 4) ?>
-  </div>
-  <div>
-   <label for="priority" accesskey="p">Priority:</label>
-   <?cs call:hdf_select_multiple(query.options.priority, 'priority', 4) ?>
-  </div>
-  <br />
-  <div>
-   <label for="owner">Assigned to:</label>
-   <input type="text" name="owner" id="owner" accesskey="a" value="<?cs
-     var:query.constraints.owner.0 ?>" />
-  </div>
-  <div>
-   <label for="reporter">Reported by:</label>
-   <input type="text" name="reporter" id="reporter" accesskey="b" value="<?cs
-     var:query.constraints.reporter.0 ?>" />
-  </div>
-  <div>
-   <label for="cc">Cc contains:</label>
-   <input type="text" name="cc" id="cc" value="<?cs
-     var:query.constraints.cc.0 ?>" />
-  </div>
-  <?cs if:len(query.custom) ?><?cs set:idx = 0 ?><?cs
-   each:custom = query.custom ?><?cs
-    if:custom.type == 'select' || custom.type == 'radio' ?>
-     <?cs if:idx == 0 ?><br /><?cs /if ?><div>
-      <label for="<?cs var:custom.name ?>"><?cs var:custom.label ?></label>
-      <?cs call:hdf_select_multiple(custom.options, custom.name, 4) ?>
-     </div><?cs set:idx = idx + 1 ?><?cs
+<form id="query" method="post" action="<?cs var:trac.href.query ?>">
+ <fieldset id="filters">
+  <legend>Filters</legend>
+  <?cs def:checkbox_checked(constraint, option) ?><?cs
+   each:value = constraint.values ?><?cs
+    if:value == option ?> checked="checked"<?cs
     /if ?><?cs
-   /each ?><?cs set:idx = 0 ?><?cs
-   each:custom = query.custom ?><?cs
-    if:custom.type == 'text' ?>
-     <?cs if:idx == 0 ?><br /><?cs /if ?><div>
-      <label for="<?cs var:custom.name ?>"><?cs var:custom.label ?></label>
-      <input type="text" name="<?cs var:custom.name ?>" id="<?cs
-        var:custom.name ?>" value="<?cs var:query[custom.name] ?>" />
-     </div><?cs set:idx = idx + 1 ?><?cs
+   /each ?><?cs
+  /def ?><?cs
+  def:option_selected(constraint, option) ?><?cs
+   each:value = constraint.values ?><?cs
+    if:value == option ?> selected="selected"<?cs
     /if ?><?cs
    /each ?><?cs
-  /if ?>
-  <br />
+  /def ?>
+  <table summary="Query filters"><?cs each:field = query.fields ?><?cs
+   each:constraint = query.constraints ?><?cs
+    if:name(field) == name(constraint) ?>
+     <tbody><tr class="<?cs var:name(field) ?>">
+      <th scope="row"><label><?cs var:field.label ?></label></th><?cs
+      if:field.type != "radio" ?>
+       <td class="mode">
+        <select name="<?cs var:name(field) ?>_mode"><?cs
+         each:mode = query.modes[field.type] ?>
+          <option value="<?cs var:mode.value ?>"<?cs
+           if:mode.value == constraint.mode ?> selected="selected"<?cs
+           /if ?>><?cs var:mode.name ?></option><?cs
+         /each ?>
+        </select>
+       </td><?cs
+      /if ?>
+      <td class="filter"<?cs if:field.type == "radio" ?> colspan="2"<?cs /if ?>><?cs
+       if:field.type == "select" ?><?cs
+        each:value = constraint.values ?>
+         <select name="<?cs var:name(constraint) ?>"><option></option><?cs
+         each:option = field.options ?>
+          <option<?cs if:option == value ?> selected="selected"<?cs /if ?>><?cs
+            var:option ?></option><?cs
+         /each ?></select><?cs
+         if:name(value) != len(constraint.values) - 1 ?>
+          </td>
+          <td class="actions"><input type="submit" name="rm_filter_<?cs
+             var:name(field) ?>_<?cs var:name(value) ?>" value="-" /></td>
+         </tr><tr class="<?cs var:name(field) ?>">
+          <th colspan="2"><label>or</label></th>
+          <td class="filter"><?cs
+         /if ?><?cs
+        /each ?><?cs
+       elif:field.type == "radio" ?><?cs
+        each:option = field.options ?>
+         <input type="checkbox" id="<?cs var:name(field) ?>_<?cs
+           var:option ?>" name="<?cs var:name(field) ?>" value="<?cs
+           var:option ?>"<?cs call:checkbox_checked(constraint, option) ?> />
+         <label for="<?cs var:name(field) ?>_<?cs var:option ?>"><?cs
+           alt:option ?>none<?cs /alt ?></label><?cs
+        /each ?><?cs
+       elif:field.type == "text" ?><?cs
+        each:value = constraint.values ?>
+        <input type="text" name="<?cs var:name(field) ?>" value="<?cs
+          var:value ?>" size="42" /><?cs
+         if:name(value) != len(constraint.values) - 1 ?>
+          </td>
+          <td class="actions"><input type="submit" name="rm_filter_<?cs
+             var:name(field) ?>_<?cs var:name(value) ?>" value="-" /></td>
+         </tr><tr class="<?cs var:name(field) ?>">
+          <th colspan="2"><label>or</label></th>
+          <td class="filter"><?cs
+         /if ?><?cs
+        /each ?><?cs
+       /if ?>
+      </td>
+      <td class="actions"><input type="submit" name="rm_filter_<?cs
+         var:name(field) ?><?cs
+         if:field.type != 'radio' ?>_<?cs
+          var:len(constraint.values) - 1 ?><?cs
+         /if ?>" value="-" /></td>
+     </tr></tbody><?cs /if ?><?cs
+    /each ?><?cs
+   /each ?>
+   <tbody><tr class="actions">
+    <td class="actions" colspan="4" style="text-align: right">
+     <label for="add_filter">Add filter</label>&nbsp;
+     <select name="add_filter" id="add_filter">
+      <option></option><?cs
+      each:field = query.fields ?>
+       <option value="<?cs var:name(field) ?>"<?cs
+         if:field.type == "radio" ?><?cs
+          if:len(query.constraints[name(field)]) != 0 ?> disabled="disabled"<?cs
+          /if ?><?cs
+         /if ?>><?cs var:field.label ?></option><?cs
+      /each ?>	
+     </select>
+     <input type="submit" name="add" value="+" />
+    </td>
+   </tr></tbody>
+  </table>
  </fieldset>
+ <p class="option">
+  <label for="group">Group results by</label>
+  <select name="group" id="group">
+   <option></option><?cs
+   each:field = query.fields ?><?cs
+    if:field.type == 'select' || field.type == 'radio' ||
+       name(field) == 'owner' ?>
+     <option value="<?cs var:name(field) ?>"<?cs
+       if:name(field) == query.group ?> selected="selected"<?cs /if ?>><?cs
+       var:field.label ?></option><?cs
+    /if ?><?cs
+   /each ?>
+  </select>
+  <input type="checkbox" name="groupdesc" id="groupdesc"<?cs
+    if:query.groupdesc ?> checked="checked"<?cs /if ?> />
+  <label for="groupdesc">descending</label>
+  <script type="text/javascript">
+    var group = document.getElementById("group");
+    var updateGroupDesc = function() {
+      enableControl('groupdesc', group.selectedIndex > 0);
+    }
+    addEvent(window, 'load', updateGroupDesc);
+    addEvent(group, 'change', updateGroupDesc);
+  </script>
+ </p>
+ <p class="option">
+  <input type="checkbox" name="verbose" id="verbose"<?cs
+    if:query.verbose ?> checked="checked"<?cs /if ?> />
+  <label for="verbose">Show full description under each result</label>
+ </p>
  <div class="buttons">
-  <input type="submit" name="search" value="Search">
+  <input type="hidden" name="order" value="<?cs var:query.order ?>" />
+  <?cs if:query.desc ?><input type="hidden" name="desc" value="1" /><?cs /if ?>
+  <input type="submit" name="update" value="Update" />
  </div>
+ <hr />
 </form>
+<script type="text/javascript" src="<?cs
+  var:htdocs_location ?>js/query.js"></script>
+<script type="text/javascript"><?cs set:idx = 0 ?>
+ var properties={<?cs each:field = query.fields ?><?cs
+  var:name(field) ?>:{type:"<?cs var:field.type ?>",label:"<?cs
+  var:field.label ?>",options:[<?cs
+   each:option = field.options ?>"<?cs var:option ?>"<?cs
+    if:name(option) < len(field.options) -1 ?>,<?cs /if ?><?cs
+   /each ?>]}<?cs
+  set:idx = idx + 1 ?><?cs if:idx < len(query.fields) ?>,<?cs /if ?><?cs
+ /each ?>};<?cs set:idx = 0 ?>
+ var modes = {<?cs each:type = query.modes ?><?cs var:name(type) ?>:[<?cs
+  each:mode = type ?>{text:"<?cs var:mode.name ?>",value:"<?cs var:mode.value ?>"}<?cs
+   if:name(mode) < len(type) -1 ?>,<?cs /if ?><?cs
+  /each ?>]<?cs
+  set:idx = idx + 1 ?><?cs if:idx < len(query.modes) ?>,<?cs /if ?><?cs
+ /each ?>};
+ initializeFilters();
+</script>
 
-<?cs else ?>
-
-<?cs if:len(query.results) ?>
- <p><?cs var:len(query.results) ?> ticket<?cs if:len(query.results) != 1 ?>s<?cs
- /if ?> matched this query.</p>
- <table id="tktlist" class="listing">
-  <thead><tr><?cs each:header = query.headers ?><?cs
-   if:name(header) == 0 ?><th class="ticket<?cs
-    if:header.order ?> <?cs var:header.order ?><?cs /if ?>">
-    <a href="<?cs var:header.href ?>" title="Sort by ID (<?cs
-      if:header.order == 'asc' ?>descending<?cs
-      else ?>ascending<?cs /if ?>)">Ticket</a>
-    </th><?cs
-   else ?>
-    <th<?cs if:header.order ?> class="<?cs var:header.order ?>"<?cs /if ?>>
-     <a href="<?cs var:header.href ?>" title="Sort by <?cs
-       var:header.name ?> (<?cs if:header.order == 'asc' ?>descending<?cs
-       else ?>ascending<?cs /if ?>)"><?cs var:header.name ?></a>
-    </th><?cs
-   /if ?>
-  <?cs /each ?></tr></thead>
-  <tbody>
-   <?cs each:result = query.results ?><tr class="<?cs
-     if:name(result) % 2 ?>odd<?cs else ?>even<?cs /if ?> <?cs
-     var:result.priority ?>">
-    <?cs each:header = query.headers ?><?cs
-     if:name(header) == 0 ?>
-      <td class="ticket"><a href="<?cs var:result.href ?>" title="View ticket"><?cs
-        var:result.id ?></a></td><?cs
-     else ?>
-      <td><?cs if:header.name == 'summary' ?>
-       <a href="<?cs var:result.href ?>" title="View ticket"><?cs
-         var:result[header.name] ?></a><?cs
-      else ?>
-       <?cs var:result[header.name] ?><?cs
-      /if ?>
-      </td><?cs
-     /if ?>
-    <?cs /each ?>
-   </tr><?cs /each ?>
-  </tbody>
- </table>
-<?cs else ?>
- <p>No tickets matched this query.</p>
-<?cs /if ?>
+<?cs def:thead() ?>
+ <thead><tr><?cs each:header = query.headers ?><?cs
+  if:name(header) == 0 ?><?cs
+   call:sortable_th(query.order, query.desc, 'id', 'ticket', query.href) ?><?cs
+  else ?><?cs
+   call:sortable_th(query.order, query.desc, header.name, header.name, query.href) ?><?cs
+  /if ?>
+ <?cs /each ?></tr></thead>
+<?cs /def ?>
 
-<?cs /if ?>
+<?cs if:len(query.results) ?><?cs
+ if:!query.group ?>
+  <table class="listing tickets">
+  <?cs call:thead() ?><tbody><?cs
+ /if ?><?cs
+ each:result = query.results ?><?cs
+  if:result[query.group] != prev_group ?>
+   <?cs if:prev_group ?></tbody></table><?cs /if ?>
+   <h2><?cs
+    each:field = query.fields ?><?cs
+     if:name(field) == query.group ?><?cs
+      var:field.label ?><?cs
+     /if ?><?cs
+    /each ?>: <?cs var:result[query.group] ?></h2>
+   <table class="listing tickets">
+   <?cs call:thead() ?><tbody><?cs
+  /if ?>
+  <tr class="<?cs
+   if:name(result) % 2 ?>odd<?cs else ?>even<?cs /if ?> prio<?cs
+   var:result.priority_value ?><?cs
+   if:result.added ?> added<?cs /if ?><?cs
+   if:result.changed ?> changed<?cs /if ?><?cs
+   if:result.removed ?> removed<?cs /if ?>"><?cs
+  each:header = query.headers ?><?cs
+   if:name(header) == 0 ?><td class="id"><a href="<?cs
+    var:result.href ?>" title="View ticket"><?cs var:result.id ?></a></td><?cs
+   else ?><td class="<?cs var:header.name ?>"><?cs
+     if:header.name == 'summary' ?><a href="<?cs
+      var:result.href ?>" title="View ticket"><?cs
+      var:result.summary ?></a><?cs
+     else ?><span><?cs var:result[header.name] ?></span><?cs
+     /if ?></td><?cs
+   /if ?><?cs
+  /each ?>
+  <?cs if:query.verbose ?>
+   </tr><tr class="fullrow"><td colspan="<?cs var:len(query.headers) ?>">
+    <p class="meta">Reported by <strong><?cs var:result.reporter ?></strong>,
+    <?cs var:result.time ?><?cs if:result.description ?>:<?cs /if ?></p>
+    <?cs if:result.description ?><p><?cs var:result.description ?></p><?cs /if ?>
+   </td>
+  <?cs /if ?><?cs set:prev_group = result[query.group] ?>
+ </tr><?cs /each ?>
+</tbody></table><?cs
+/if ?>
 
- <div id="help">
-  <strong>Note:</strong> See <a href="<?cs var:$trac.href.wiki ?>/TracQuery">TracQuery</a> 
-  for help on using queries.
- </div>
+<div id="help">
+ <strong>Note:</strong> See <a href="<?cs var:$trac.href.wiki ?>/TracQuery">TracQuery</a> 
+ for help on using queries.
+</div>
 
 </div>
 <?cs include:"footer.cs" ?>
diff --git a/django_website/templates/trac_templates/query_rss.cs b/django_website/templates/trac_templates/query_rss.cs
new file mode 100644
index 000000000..bc1e4c952
--- /dev/null
+++ b/django_website/templates/trac_templates/query_rss.cs
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+ <channel><?cs
+  if:project.name.encoded ?>
+   <title><?cs var:project.name.encoded ?>: Ticket Query</title><?cs
+  else ?>
+   <title>Ticket Query</title><?cs
+  /if ?>
+  <link><?cs var:base_host ?><?cs var:trac.href.query ?></link><?cs
+  if:project.descr ?>
+   <description><?cs var:project.descr ?></description><?cs
+  /if ?>
+  <language>en-us</language>
+  <image>
+   <title><?cs var:project.name.encoded ?></title>
+   <url><?cs
+    if:!header_logo.src_abs ?><?cs var:base_host ?><?cs
+    /if ?><?cs
+    var:header_logo.src ?></url>
+   <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link><?cs
+   if:header_logo.width ?>
+    <width><?cs var:header_logo.width ?></width><?cs
+   /if ?><?cs
+   if:header_logo.height ?>
+    <height><?cs var:header_logo.height ?></height><?cs
+   /if ?>
+  </image>
+  <generator>Trac v<?cs var:trac.version ?></generator><?cs
+  each:result = query.results ?>
+   <item>
+    <link><?cs var:result.href ?></link>
+    <guid isPermaLink="true"><?cs var:result.href ?></guid>
+    <title><?cs var:'#' + result.id + ': ' + result.summary ?></title><?cs
+    if:result.created ?>
+     <pubDate><?cs var:result.created ?></pubDate><?cs
+    /if ?><?cs
+    if:result.reporter ?>
+     <author><?cs var:result.reporter ?></author><?cs
+    /if ?>
+    <description><?cs var:result.description ?></description>
+    <category>Tickets</category>
+    <comments><?cs var:result.href ?>#changelog</comments>
+   </item><?cs
+  /each ?>
+ </channel>
+</rss>
diff --git a/django_website/templates/trac_templates/report.cs b/django_website/templates/trac_templates/report.cs
index 28c94e51d..01b5ee046 100644
--- a/django_website/templates/trac_templates/report.cs
+++ b/django_website/templates/trac_templates/report.cs
@@ -5,29 +5,19 @@
 <div id="ctxtnav" class="nav">
  <h2>Report Navigation</h2>
  <ul>
-  <?cs if report.edit_href || report.copy_href || report.delete_href ?>
-  <li><b>This report:</b>
-   <ul>
-    <?cs if report.edit_href
-      ?><li <?cs if !report.delete_href && !report.copy_href ?>class="last"<?cs /if
-        ?>><a href="<?cs var:report.edit_href ?>">Edit</a></li><?cs
-     /if ?><?cs
-     if report.copy_href ?><li <?cs if !report.delete_href ?>class="last"<?cs /if
-        ?>><a href="<?cs var:report.copy_href ?>">Copy</a></li><?cs /if ?><?cs
-    if report.delete_href ?><li class="last"><a href="<?cs var:report.delete_href ?>">Delete</a></li><?cs /if ?></ul></li>
-  <?cs /if ?>
-  <?cs if:report.create_href ?>
-   <li><a href="<?cs var:report.create_href ?>">New Report</a></li>
-  <?cs /if ?>
-  <li class="last"><a href="<?cs var:$trac.href.query ?>">Custom Query</a></li>
+  <li class="first"><?cs
+   if:chrome.links.up.0.href ?><li class="first"><a href="<?cs
+    var:chrome.links.up.0.href ?>">Available Reports</a><?cs
+   else ?>Available Reports<?cs
+  /if ?></li><?cs
+  if:report.query_href ?><li class="last"><a href="<?cs
+   var:report.query_href ?>">Custom Query</a></li><?cs
+  /if ?>
  </ul>
 </div>
 
 <div id="content" class="report">
 
-<?cs if report.message ?>
- <div class="error"><?cs var report.message ?></div>
-<?cs else ?>
  <?cs def:report_hdr(header) ?>
    <?cs if $header ?>
      <?cs if idx > 0 ?>
@@ -36,9 +26,9 @@
    <?cs /if ?>
    <?cs if:header ?><h2><?cs var:header ?></h2><?cs /if ?>
    <?cs if $report.id == -1 ?>
-     <table id="reportlist" class="listing">
+     <table class="listing reports">
    <?cs else ?>
-     <table id="tktlist" class="listing">
+     <table class="listing tickets">
    <?cs /if ?>
     <thead>
      <tr>
@@ -98,9 +88,27 @@
   <h1><?cs var:title ?><?cs
    if:report.numrows && report.id != -1 ?><span class="numrows"> (<?cs
     var:report.numrows ?> matches)</span><?cs
-   /if ?></h1>
-  <?cs if:report.description ?><div id="description"><?cs
+   /if ?></h1><?cs
+   if:report.description ?><div id="description"><?cs
     var:report.description ?></div><?cs
+   /if ?><?cs
+   if:report.id != -1 ?><?cs
+    if:report.can_create || report.can_modify || report.can_delete ?>
+     <div class="buttons"><?cs
+      if:report.can_modify ?><form action="" method="get"><div>
+       <input type="hidden" name="action" value="edit" />
+       <input type="submit" value="Edit report" />
+      </div></form><?cs /if ?><?cs
+      if:report.can_create ?><form action="" method="get"><div>
+       <input type="hidden" name="action" value="copy" />
+       <input type="submit" value="Copy report" />
+      </div></form><?cs /if ?><?cs
+      if:report.can_delete ?><form action="" method="get"><div>
+       <input type="hidden" name="action" value="delete" />
+       <input type="submit" value="Delete report" />
+      </div></form><?cs /if ?>
+     </div><?cs
+    /if ?><?cs
    /if ?>
 
      <?cs each row = report.items ?>
@@ -138,7 +146,7 @@
        <?cs set col = #0 ?>
        <?cs each cell = row ?>
          <?cs if cell.hidden || cell.hidehtml ?>
-         <?cs elif name(cell) == "ticket" ?>
+         <?cs elif name(cell) == "ticket" || name(cell) == "id" ?>
            <?cs call:report_cell('ticket',
                                  '<a title="View ticket" href="'+
                                  $cell.ticket_href+'">#'+$cell+'</a>') ?>
@@ -168,34 +176,37 @@
        </tr>
      <?cs /each ?>
     </tbody>
-   </table>
-
-   <?cs if $idx == #0 ?>
-    <div id="report-notfound">No matches found.</div>
-   <?cs /if ?>
+   </table><?cs
+   if:report.id == -1 && report.can_create?><div class="buttons">
+    <form action="" method="get"><div>
+     <input type="hidden" name="action" value="new" />
+     <input type="submit" value="Create new report" />
+    </div></form></div><?cs
+   /if ?><?cs
+   if report.message ?>
+    <div class="system-message"><?cs var report.message ?></div><?cs
+   elif:idx == #0 ?>
+    <div id="report-notfound">No matches found.</div><?cs
+   /if ?>
 
- <?cs elif report.mode == "delete" ?>
+ <?cs elif:report.mode == "delete" ?>
 
   <h1><?cs var:title ?></h1>
-  <form action="<?cs var:cgi_location ?>" method="post">
-   <input type="hidden" name="mode" value="report" />
+  <form action="<?cs var:report.href ?>" method="post">
    <input type="hidden" name="id" value="<?cs var:report.id ?>" />
-   <input type="hidden" name="action" value="confirm_delete" />
+   <input type="hidden" name="action" value="delete" />
    <p><strong>Are you sure you want to delete this report?</strong></p>
    <div class="buttons">
     <input type="submit" name="cancel" value="Cancel" />
-    <input type="submit" value="Delete Report" />
+    <input type="submit" value="Delete report" />
    </div>
   </form>
  
- <?cs elif report.mode == "editor" ?>
+ <?cs elif:report.mode == "edit" ?>
  
    <h1><?cs var:title ?></h1>
-   
-   <form action="<?cs var:cgi_location ?>" method="post">
+   <form action="<?cs var:report.href ?>" method="post">
     <div>
-     <input type="hidden" name="mode" value="report" />
-     <input type="hidden" name="id" value="<?cs var:report.id ?>" />
      <input type="hidden" name="action" value="<?cs var:report.action ?>" />
      <div class="field">
       <label for="title">Report Title:</label><br />
@@ -207,9 +218,8 @@
        Description:</label> (You may use <a tabindex="42" href="<?cs
          var:$trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here)
       </label><br />
-      <textarea id="description" name="description" cols="85" rows="5"><?cs
+      <textarea id="description" name="description" class="wikitext" rows="10" cols="78"><?cs
         var:report.description ?></textarea>
-      <?cs call:wiki_toolbar('description') ?>
      </div>
      <div class="field">
       <label for="sql">
@@ -218,10 +228,12 @@
         var:report.sql ?></textarea>
      </div>
      <div class="buttons">
-      <input type="submit" value="Save" />
+      <input type="submit" value="Save report" />
       <input type="submit" name="cancel" value="Cancel" />
      </div>
     </div>
+    <script type="text/javascript" src="<?cs
+      var:htdocs_location ?>js/wikitoolbar.js"></script>
    </form>
  <?cs /if?>
  
@@ -231,7 +243,5 @@
   creating reports.
  </div>
  
-<?cs /if ?><?cs #report.message ?>
-
 </div>
 <?cs include "footer.cs" ?>
diff --git a/django_website/templates/trac_templates/report_rss.cs b/django_website/templates/trac_templates/report_rss.cs
index 28585564a..b985e284f 100644
--- a/django_website/templates/trac_templates/report_rss.cs
+++ b/django_website/templates/trac_templates/report_rss.cs
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <!-- RSS generated by Trac v<?cs var:$trac.version ?> on <?cs var:$trac.time ?> -->
 <rss version="2.0">
-   <?cs set base_url = $HTTP.Protocol+'://'+$HTTP.Host ?>
-   <?cs if $HTTP.Port ?>
-     <?cs set base_url = $base_url + ':' + $HTTP.Port ?>
-   <?cs /if ?>
     <channel>
       <?cs if $project.name.encoded ?>
         <title><?cs var:$project.name.encoded ?>: <?cs var:$report.title ?></title>
@@ -12,7 +8,7 @@
       <?cs else ?>
         <title><?cs var:$title ?></title>
       <?cs /if ?>
-      <link><?cs var:$base_url ?><?cs var:$trac.href.report ?>/<?cs var:$report.id ?></link>
+      <link><?cs var:$base_host ?><?cs var:$trac.href.report ?>/<?cs var:$report.id ?></link>
       <description>Trac Report - <?cs var:$report.title ?></description>
       <language>en-us</language>
       <generator>Trac v<?cs var:$trac.version ?></generator>
@@ -23,7 +19,7 @@
         <?cs set pubdate = '' ?>
         <?cs each:item = $row ?>
           <?cs if name(item) == 'ticket' ?>
-            <?cs set link = $base_url+$item.ticket_href ?>
+            <?cs set link = $base_host+$item.ticket_href ?>
             <?cs set id = $item ?>
           <?cs elif name(item) == 'summary' ?>
             <?cs set title = $item ?>
diff --git a/django_website/templates/trac_templates/roadmap.cs b/django_website/templates/trac_templates/roadmap.cs
index 6a90b710a..14de44c6a 100644
--- a/django_website/templates/trac_templates/roadmap.cs
+++ b/django_website/templates/trac_templates/roadmap.cs
@@ -2,47 +2,79 @@
 <?cs include "header.cs"?>
 <?cs include "macros.cs"?>
 
-<div id="ctxtnav" class="nav">
- <ul>
-  <?cs if:roadmap.href.newmilestone ?><li><a href="<?cs
-    var:roadmap.href.newmilestone ?>">Add New Milestone</a></li><?cs /if ?>
-  <li class="last"><a href="<?cs var:roadmap.href.list ?>"><?cs
-    if:roadmap.showall ?>Show All Milestones<?cs
-    else ?>Show Upcoming Milestones<?cs /if ?></a></li>
- </ul>
-</div>
+<div id="ctxtnav" class="nav"></div>
 
 <div id="content" class="roadmap">
  <h1>Roadmap</h1>
 
+ <form id="prefs" method="get" action="">
+  <div>
+   <input type="checkbox" id="showall" name="show" value="all"<?cs
+    if:roadmap.showall ?> checked="checked"<?cs /if ?> />
+   <label for="showall">Show already completed milestones</label>
+  </div>
+  <div class="buttons">
+   <input type="submit" value="Update" />
+  </div>
+ </form>
+
  <ul class="milestones"><?cs each:milestone = roadmap.milestones ?>
   <li class="milestone">
    <div class="info">
     <h2><a href="<?cs var:milestone.href ?>">Milestone: <em><?cs
       var:milestone.name ?></em></a></h2>
-    <p class="date"><?cs if:milestone.date ?>
-     <?cs var:milestone.date ?><?cs else ?>No date set<?cs /if ?>
-    </p>
-    <?cs with:stats = milestone.stats ?>
-     <?cs if:#stats.total_tickets > #0 ?>
+    <p class="date"<?cs
+     if:milestone.completed_date ?> title="<?cs var:milestone.completed_date ?>">
+      Completed <?cs var:milestone.completed_delta ?> ago<?cs
+     elif:milestone.due_date ?> title="<?cs var:milestone.due_date ?>"><?cs
+      if:milestone.late ?>
+       <strong><?cs var:milestone.due_delta ?> late</strong><?cs
+      else ?>
+       Due in <?cs var:milestone.due_delta ?><?cs
+      /if ?><?cs
+     else ?>>
+      No date set<?cs
+     /if ?>
+    </p><?cs
+    with:stats = milestone.stats ?><?cs
+     if:#stats.total_tickets > #0 ?>
       <div class="progress">
-       <div style="width: <?cs var:#stats.percent_complete ?>%"></div>
+       <a class="closed" href="<?cs
+         var:milestone.queries.closed_tickets ?>" style="width: <?cs
+         var:#stats.percent_closed ?>%" title="<?cs
+         var:#stats.closed_tickets ?> of <?cs
+         var:#stats.total_tickets ?> ticket<?cs
+         if:#stats.total_tickets != #1 ?>s<?cs /if ?> closed"></a>
+       <a class="open" href="<?cs
+         var:milestone.queries.active_tickets ?>" style="width: <?cs
+         var:#stats.percent_active ?>%" title="<?cs
+         var:#stats.active_tickets ?> of <?cs
+         var:#stats.total_tickets ?> ticket<?cs
+         if:#stats.total_tickets != #1 ?>s<?cs /if ?> active"></a>
       </div>
-      <p class="percent"><?cs var:#stats.percent_complete ?>%</p>
+      <p class="percent"><?cs var:#stats.percent_closed ?>%</p>
       <dl>
-       <dt>Active tickets:</dt>
-       <dd><a href="<?cs var:milestone.queries.active_tickets ?>"><?cs
-         var:stats.active_tickets ?></a></dd>
        <dt>Closed tickets:</dt>
        <dd><a href="<?cs var:milestone.queries.closed_tickets ?>"><?cs
          var:stats.closed_tickets ?></a></dd>
-      </dl>
-     <?cs /if ?>
-    <?cs /with ?>
+       <dt>Active tickets:</dt>
+       <dd><a href="<?cs var:milestone.queries.active_tickets ?>"><?cs
+         var:stats.active_tickets ?></a></dd>
+      </dl><?cs
+     /if ?><?cs
+    /with ?>
    </div>
-   <div class="descr"><?cs var:milestone.descr ?></div>
-  </li>
- <?cs /each ?></ul>
+   <div class="description"><?cs var:milestone.description ?></div>
+  </li><?cs
+ /each ?></ul><?cs
+ if:trac.acl.MILESTONE_CREATE ?>
+  <div class="buttons">
+   <form method="get" action="<?cs var:trac.href.milestone ?>"><div>
+    <input type="hidden" name="action" value="new" />
+    <input type="submit" value="Add new milestone" />
+   </div></form>
+  </div><?cs
+ /if ?>
 
  <div id="help">
   <strong>Note:</strong> See <a href="<?cs
diff --git a/django_website/templates/trac_templates/search.cs b/django_website/templates/trac_templates/search.cs
index 1cf6f2d35..0fc5bb2f6 100644
--- a/django_website/templates/trac_templates/search.cs
+++ b/django_website/templates/trac_templates/search.cs
@@ -3,23 +3,7 @@
 <script type="text/javascript">
 addEvent(window, 'load', function() { document.getElementById('q').focus()}); 
 </script>
-
 <div id="ctxtnav" class="nav">
- <h2>Search Navigation</h2>
- <ul><?cs
-  if:len(links.prev) ?>
-   <li class="first<?cs if:!len(links.next) ?> last<?cs /if ?>">
-    <a href="<?cs var:links.prev.0.href ?>" title="<?cs
-      var:links.prev.0.title ?>">Previous Page</a>
-   </li><?cs
-  /if ?><?cs
-  if:len(links.next) ?>
-   <li class="<?cs if:len(links.prev) ?>first <?cs /if ?>last">
-    <a href="<?cs var:links.next.0.href ?>" title="<?cs
-      var:links.next.0.title ?>">Next Page</a>
-   </li><?cs
-  /if ?>
- </ul>
 </div>
 
 <div id="content" class="search">
@@ -31,78 +15,57 @@
   <input type="submit" value="Search" />
  </p>
  <p><?cs
-  if:trac.acl.WIKI_VIEW ?>
-   <input type="checkbox" id="wiki" name="wiki" <?cs
-     if:search.wiki ?>checked="checked"<?cs /if ?> />
-   <label for="wiki">Wiki</label><?cs
-  /if ?><?cs
-  if:trac.acl.TICKET_VIEW ?>
-   <input type="checkbox" id="ticket" name="ticket" <?cs
-     if:search.ticket ?>checked="checked"<?cs /if ?> />
-   <label for="ticket">Tickets</label><?cs
-  /if ?><?cs
-  if:trac.acl.CHANGESET_VIEW ?>
-   <input type="checkbox" id="changeset" name="changeset" <?cs
-     if:search.changeset ?>checked="checked"<?cs /if ?> />
-   <label for="changeset">Changesets</label><?cs
-  /if ?>
+  each filter=search.filters ?>
+   <input type="checkbox" id="<?cs var:filter.name?>" 
+          name="<?cs var:filter.name?>" <?cs
+     if:filter.active ?>checked="checked"<?cs /if ?> />
+   <label for="<?cs var:filter.name ?>"><?cs var:filter.label?></label><?cs
+  /each ?>
  </p>
 </form>
-
-<?cs def result(title, keywords, body, link) ?>
- <dt><a href="<?cs var:link ?>"><?cs var:title ?></a></dt>
- <dd><?cs var:body ?></dd>
- <dd>
-  <span class="author">By <?cs var:item.author ?></span> &mdash;
-  <span class="date"><?cs var:item.datetime ?></span><?cs
-  if:item.keywords ?> &mdash
-   <span class="keywords">Keywords: <em><?cs var:item.keywords ?></em></span><?cs
-  /if ?>
- </dd>
-<?cs /def ?>
-
 <?cs if:len(search.result) ?>
  <hr />
  <h2>Search results <?cs
-  if:len(links.prev) || len(links.next) ?>(<?cs
-   var:search.result_page * search.results_per_page + 1 ?> - <?cs
-   var:search.result_page * search.results_per_page + len(search.result) ?>)<?cs
+  if:search.n_pages > 1 ?>(<?cs
+   var:(search.page-1) * search.page_size + 1 ?> - <?cs
+   var:(search.page-1) * search.page_size + len(search.result) ?> 
+   of <?cs var:search.n_hits?>)<?cs
   /if ?></h2>
  <div id="searchable">
   <dl id="results"><?cs
-   each item=search.result ?><?cs
-    if:item.type == 1 ?><?cs
-     call:result('[' + item.data + ']: ' + item.shortmsg, item.keywords,
-                 item.message, item.changeset_href) ?><?cs
-    elif:item.type == 2 ?><?cs
-     call:result('#' + item.data + ': ' + item.title, item.keywords,
-                 item.message, item.ticket_href) ?><?cs
-    elif:item.type == 3 ?><?cs
-     call:result(item.data + ': ' + item.shortmsg, item.keywords,
-                 item.message, item.wiki_href) ?><?cs
-    /if ?><?cs
+   each item=search.result ?>
+ <dt><a href="<?cs var:item.href ?>"><?cs var:item.title ?></a></dt>
+ <dd><?cs var:item.excerpt ?></dd>
+ <dd>
+  <span class="author">By <?cs var:item.author ?></span> &mdash;
+  <span class="date"><?cs var:item.date ?></span><?cs
+  if:item.keywords ?> &mdash
+   <span class="keywords">Keywords: <em><?cs var:item.keywords ?></em></span><?cs
+  /if ?>
+ </dd><?cs
    /each ?>
   </dl>
   <hr />
+ </div><?cs 
+if search.n_pages > 1 ?>
+ <div id="paging">
+ Pages: <?cs
+ if len(chrome.links.prev) ?>
+   <a href="<?cs var:chrome.links.prev.0.href ?>" title="<?cs
+      var:chrome.links.prev.0.title ?>">prev</a> <?cs
+ /if ?><?cs
+ loop:p = 1, search.n_pages ?><?cs
+   if p == search.page ?><?cs var:p ?><?cs
+   else ?><a href="<?cs var:search.page_href + "&page=" + p?>"><?cs var:p ?></a><?cs
+   /if ?> <?cs
+ /loop ?><?cs
+ if len(chrome.links.next) ?>
+   <a href="<?cs var:chrome.links.next.0.href ?>" title="<?cs
+      var:chrome.links.next.0.title ?>">next</a><?cs
+ /if ?>
  </div>
- <?cs if:len(links.prev) || len(links.next) ?>
-  <div id="paging" class="nav">
-   <ul><?cs
-    if:len(links.prev) ?>
-     <li class="first<?cs if:!len(links.next) ?> last<?cs /if ?>">
-      <a href="<?cs var:links.prev.0.href ?>" title="<?cs
-        var:links.prev.0.title ?>">Previous Page</a>
-     </li><?cs
-    /if ?><?cs
-    if:len(links.next) ?>
-     <li class="<?cs if:len(links.prev) ?>first <?cs /if ?>last">
-      <a href="<?cs var:links.next.0.href ?>" title="<?cs
-        var:links.next.0.title ?>">Next Page</a>
-     </li><?cs
-    /if ?>
-   </ul>
-  </div>
- <?cs /if ?>
+<?cs
+/if ?>
 
 <?cs elif $search.q ?>
  <div id="notfound">No matches found.</div>
diff --git a/django_website/templates/trac_templates/settings.cs b/django_website/templates/trac_templates/settings.cs
index 046c50f7c..2eeac50bc 100644
--- a/django_website/templates/trac_templates/settings.cs
+++ b/django_website/templates/trac_templates/settings.cs
@@ -1,7 +1,7 @@
 <?cs include "header.cs"?>
 <?cs include "macros.cs"?>
 
-<div id="contextnav" class="nav"></div>
+<div id="ctxtnav" class="nav"></div>
 
 <div id="content" class="settings">
 
@@ -13,50 +13,45 @@
  settings are stored on the server and identified using  a 'Session Key'
  stored in a browser cookie. The cookie lets Trac restore your settings 
  </p>
- <form method="get" action="<?cs var:trac.href.settings ?>">
+ <form method="post" action="">
  <div>
   <h3>Personal Information</h3>
   <div>
    <input type="hidden" name="action" value="save" />
    <label for="name">Name:</label>
    <input type="text" id="name" name="name" class="textwidget" size="30"
-          value="<?cs var:trac.session.var.name ?>" />
+          value="<?cs var:settings.name ?>" />
   </div>
   <div>
    <label for="email">Email:</label>
    <input type="text" id="email" name="email" class="textwidget" size="30"
-          value="<?cs var:trac.session.var.email ?>" />
-  </div>
-
-  <h3>Session</h3>
-  <div>
-   <label for="newsid">Session Key:</label>
-   <input type="text" id="newsid" name="newsid" class="textwidget" size="30"
-          value="<?cs var:trac.session.id ?>" />
-   <p>
-   The session key is used to identify stored  custom settings and session
-   data on the server. Automatically generated by default, you may change it
-  to something easier to remember at any time if you wish to use your
-  settings in a different web browser.
-   </p>
-  </div>
-
+          value="<?cs var:settings.email ?>" />
+  </div><?cs
+  if:settings.session_id ?>
+   <h3>Session</h3>
+   <div>
+    <label for="newsid">Session Key:</label>
+    <input type="text" id="newsid" name="newsid" class="textwidget" size="30"
+           value="<?cs var:settings.session_id ?>" />
+    <p>The session key is used to identify stored  custom settings and session
+    data on the server. Automatically generated by default, you may change it
+    to something easier to remember at any time if you wish to use your settings
+    in a different web browser.</p>
+   </div><?cs
+  /if ?>
   <div>
    <br />
-   <input type="submit" value="Save Changes" />
+   <input type="submit" value="Submit changes" />
   </div >
  </div>
- </form>
-
-<hr />
-
-<h2>Load Session</h2>
-<p>
-You may load a previously created session by entering the corresponding
-session key below and clicking 'Recover'. This lets you share settings between
-multiple computers and/or web browsers.
-</p>
- <form method="get" action="<?cs var:trac.href.settings ?>">
+</form><?cs
+if:settings.session_id ?>
+ <hr />
+ <h2>Load Session</h2>
+ <p>You may load a previously created session by entering the corresponding
+ session key below and clicking 'Recover'. This lets you share settings between
+ multiple computers and/or web browsers.</p>
+ <form method="post" action="">
   <div>
    <input type="hidden" name="action" value="load" />
    <label for="loadsid">Existing Session Key:</label>
@@ -64,7 +59,8 @@
           value="" />
    <input type="submit" value="Recover" />
   </div>
- </form>
+ </form><?cs
+/if ?>
 
 </div>
 <?cs include:"footer.cs"?>
diff --git a/django_website/templates/trac_templates/ticket.cs b/django_website/templates/trac_templates/ticket.cs
index 783aafd99..3dd2b4969 100644
--- a/django_website/templates/trac_templates/ticket.cs
+++ b/django_website/templates/trac_templates/ticket.cs
@@ -3,140 +3,132 @@
 <?cs include "macros.cs" ?>
 
 <div id="ctxtnav" class="nav">
- <h2>Ticket Navigation</h2>
- <ul><?cs
-  if:len(links.prev) ?>
-   <li class="first<?cs if:!len(links.next) ?> last<?cs /if ?>">
-    <a href="<?cs var:links.prev.0.href ?>" title="<?cs
-      var:links.prev.0.title ?>">Previous Ticket</a>
-   </li><?cs
-  /if ?><?cs
-  if:len(links.next) ?>
-   <li class="<?cs if:len(links.prev) ?>first <?cs /if ?>last">
-    <a href="<?cs var:links.next.0.href ?>" title="<?cs
-      var:links.next.0.title ?>">Next Ticket</a>
-   </li><?cs
-  /if ?>
- </ul>
+ <h2>Ticket Navigation</h2><?cs
+ with:links = chrome.links ?>
+  <ul><?cs
+   if:len(links.prev) ?>
+    <li class="first<?cs if:!len(links.up) && !len(links.next) ?> last<?cs /if ?>">
+     &larr; <a href="<?cs var:links.prev.0.href ?>" title="<?cs
+       var:links.prev.0.title ?>">Previous Ticket</a>
+    </li><?cs
+   /if ?><?cs
+   if:len(links.up) ?>
+    <li class="<?cs if:!len(links.prev) ?>first<?cs /if ?><?cs
+                    if:!len(links.next) ?> last<?cs /if ?>">
+     <a href="<?cs var:links.up.0.href ?>" title="<?cs
+       var:links.up.0.title ?>">Back to Query</a>
+    </li><?cs
+   /if ?><?cs
+   if:len(links.next) ?>
+    <li class="<?cs if:!len(links.prev) && !len(links.up) ?>first <?cs /if ?>last">
+     <a href="<?cs var:links.next.0.href ?>" title="<?cs
+       var:links.next.0.title ?>">Next Ticket</a> &rarr;
+    </li><?cs
+   /if ?>
+  </ul><?cs
+ /with ?>
 </div>
 
 <div id="content" class="ticket">
- <div id="searchable">
- <?cs def:ticketprop(label, name, value, fullrow) ?>
-  <th id="h_<?cs var:name ?>"><?cs var:$label ?>:</th>
-  <td headers="h_<?cs var:name ?>"<?cs if:fullrow ?> colspan="3"<?cs /if ?>><?cs
-   if:$value ?><?cs var:$value ?><?cs else ?>&nbsp;<?cs
-   /if ?></td><?cs if numprops % #2 && !$last_prop || fullrow ?>
- </tr><tr><?cs /if ?><?cs set numprops = $numprops + #1 - fullrow ?><?cs
- /def ?>
 
-<div id="ticket">
- <div class="date"><?cs var:ticket.opened ?></div>
  <h1>Ticket #<?cs var:ticket.id ?> <?cs
- if:ticket.status == 'closed' ?>(Closed: <?cs var:ticket.resolution ?>)<?cs
- elif:ticket.status != 'new' ?>(<?cs var:ticket.status ?>)<?cs
- /if ?></h1>
- <h2><?cs var:ticket.summary ?></h2>
- <hr />
- <table><tr><?cs
-  call:ticketprop("Priority", "priority", ticket.priority, 0) ?><?cs
-  call:ticketprop("Reporter", "reporter", ticket.reporter, 0) ?><?cs
-  call:ticketprop("Severity", "severity", ticket.severity, 0) ?><?cs
-  if ticket.status == "assigned"?><?cs
-   call:ticketprop("Assigned to", "assignee", ticket.owner + " (accepted)", 0) ?><?cs
-  else ?><?cs
-   call:ticketprop("Assigned to", "assignee", ticket.owner, 0) ?><?cs
-  /if ?><?cs
-  call:ticketprop("Component", "component", ticket.component, 0) ?><?cs
-  call:ticketprop("Status", "status", ticket.status, 0) ?><?cs
-  call:ticketprop("Version", "version", ticket.version, 0) ?><?cs
-  call:ticketprop("Resolution", "resolution", ticket.resolution, 0) ?><?cs
-  call:ticketprop("Milestone", "milestone", ticket.milestone, 0) ?><?cs
-  set:last_prop = #1 ?><?cs
-  call:ticketprop("Keywords", "keywords", ticket.keywords, 0) ?><?cs
-  set:last_prop = #0 ?>
- </tr></table><?cs if ticket.custom.0.name ?>
- <hr />
- <table><tr><?cs each:prop = ticket.custom ?><?cs
-   if:prop.type == "textarea" ?><?cs
-    call:ticketprop(prop.label, prop.name, prop.value, 1) ?><?cs
-   else ?><?cs
-    call:ticketprop(prop.label, prop.name, prop.value, 0) ?><?cs
-   /if?><?cs
-  /each ?>
- </tr></table><?cs /if ?>
- <hr />
- <h3>Description<?cs if:ticket.reporter ?> by <?cs
-   var:ticket.reporter ?><?cs /if ?>:</h3>
- <div class="description">
-  <?cs var:ticket.description.formatted ?>
+ if:ticket.type ?>(<?cs var:ticket.type ?>)<?cs /if ?></h1>
+
+<div id="searchable">
+<div id="ticket">
+ <div class="date">
+  <p title="<?cs var:ticket.opened ?>">Opened <?cs var:ticket.opened_delta ?> ago</p><?cs
+  if:ticket.lastmod ?>
+   <p title="<?cs var:ticket.lastmod ?>">Last modified <?cs var:ticket.lastmod_delta ?> ago</p>
+  <?cs /if ?>
  </div>
+ <h2 class="summary"><?cs var:ticket.summary ?></h2>
+ <h3 class="status">Status: <strong><?cs var:ticket.status ?><?cs
+  if:ticket.resolution ?> (<?cs var:ticket.resolution ?>)<?cs
+  /if ?></strong></h3>
+ <table class="properties">
+  <tr>
+   <th id="h_reporter">Reported by:</th>
+   <td headers="h_reporter"><?cs var:ticket.reporter ?></td>
+   <th id="h_owner">Assigned to:</th>
+   <td headers="h_owner"><?cs var:ticket.owner ?><?cs
+     if:ticket.status == 'assigned' ?> (accepted)<?cs /if ?></td>
+  </tr><tr><?cs
+  each:field = ticket.fields ?><?cs
+   if:!field.skip ?><?cs
+    set:num_fields = num_fields + 1 ?><?cs
+   /if ?><?cs
+  /each ?><?cs
+  set:idx = 0 ?><?cs
+  each:field = ticket.fields ?><?cs
+   if:!field.skip ?><?cs set:fullrow = field.type == 'textarea' ?><?cs
+    if:fullrow && idx % 2 ?><th></th><td></td></tr><tr><?cs /if ?>
+    <th id="h_<?cs var:name(field) ?>"><?cs var:field.label ?>:</th>
+    <td<?cs if:fullrow ?> colspan="3"<?cs /if ?> headers="h_<?cs
+      var:name(field) ?>"><?cs var:ticket[name(field)] ?></td><?cs 
+    if:idx % 2 || fullrow ?></tr><tr><?cs 
+    elif:idx == num_fields - 1 ?><th></th><td></td><?cs
+    /if ?><?cs set:idx = idx + #fullrow + 1 ?><?cs
+   /if ?><?cs
+  /each ?></tr>
+ </table>
+ <?cs if:ticket.description ?><div class="description">
+  <?cs var:ticket.description.formatted ?>
+ </div><?cs /if ?>
 </div>
 
-<?cs if trac.acl.TICKET_MODIFY || ticket.attachments.0.name ?>
+<?cs if:ticket.attach_href || len(ticket.attachments) ?>
 <h2>Attachments</h2><?cs
- if ticket.attachments.0.name ?><div id="attachments">
-  <ul class="attachments"><?cs each:a = ticket.attachments ?>
-   <li><a href="<?cs var:a.href ?>" title="View attachment"><?cs
-   var:a.name ?></a> (<?cs var:a.size ?>) - <?cs
-   if:a.descr ?><q><?cs var:a.descr ?></q>,<?cs
-   /if ?> added by <em><?cs
-   var:a.author ?></em> on <em><?cs
-   var:a.time ?></em>.</li><?cs
-  /each ?></ul><?cs
+ if:len(ticket.attachments) ?><div id="attachments">
+  <dl class="attachments"><?cs each:attachment = ticket.attachments ?>
+   <dt><a href="<?cs var:attachment.href ?>" title="View attachment"><?cs
+   var:attachment.filename ?></a> (<?cs var:attachment.size ?>) - added by <em><?cs
+   var:attachment.author ?></em> on <?cs
+   var:attachment.time ?>.</dt><?cs
+   if:attachment.description ?>
+    <dd><?cs var:attachment.description ?></dd><?cs
+   /if ?><?cs
+  /each ?></dl><?cs
  /if ?><?cs
- if trac.acl.TICKET_MODIFY ?>
-  <form method="get" action="<?cs var:ticket.attach_href ?>">
-   <div><input type="submit" value="Attach File" /></div>
-  </form><?cs
- /if ?><?cs if ticket.attachments.0.name ?></div><?cs /if ?>
+ if:ticket.attach_href ?>
+  <form method="get" action="<?cs var:ticket.attach_href ?>"><div>
+   <input type="hidden" name="action" value="new" />
+   <input type="submit" value="Attach File" />
+  </div></form><?cs
+ /if ?><?cs if:len(ticket.attachments) ?></div><?cs /if ?>
 <?cs /if ?>
 
-<?cs if ticket.changes.0.time ?><h2>Changelog</h2>
-<div id="changelog">
- <?cs set:comment = "" ?>
- <?cs set:curr_time = "" ?>
- <?cs set:curr_author = "" ?>
- <?cs each:change = ticket.changes ?><?cs
-  if $change.time != $curr_time || $change.author != $curr_author ?><?cs
-  if:name(change) > 0 ?></ul><?cs /if ?><?cs
-   if $comment != "" ?>
-    <div class="comment"><?cs var:$comment ?></div><?cs set:comment = "" ?><?cs
-   /if ?>
-   <?cs set:curr_time = $change.time ?>
-   <?cs set:curr_author = $change.author ?>
-   <h3 id="change_<?cs var:name(change) ?>" class="change"><?cs
-     var:change.date ?>: Modified by <?cs var:curr_author ?></h3>
+<?cs if:len(ticket.changes) ?><h2>Change History</h2>
+<div id="changelog"><?cs
+ each:change = ticket.changes ?>
+  <h3 id="change_<?cs var:name(change) ?>" class="change"><?cs
+   var:change.date ?>: Modified by <?cs var:change.author ?></h3><?cs
+  if:len(change.fields) ?>
    <ul class="changes"><?cs
-  /if ?><?cs
-  if $change.field == "comment" ?><?cs
-   set:$comment = $change.new ?><?cs
-  elif $change.new == "" ?>
-   <li><strong><?cs var:change.field ?></strong> cleared</li><?cs
-  elif $change.field == "attachment" ?>
-   <li><strong>attachment</strong> added: <?cs var:change.new ?></li><?cs
-  elif $change.field == "description" ?>
-   <li><strong><?cs var:change.field ?></strong> changed.</li><?cs
-  elif $change.old == "" ?>
-   <li><strong><?cs var:change.field ?></strong> set to <em><?cs var:change.new ?></em></li><?cs
-  else ?>
-   <li><strong><?cs var:change.field ?></strong> changed from <em><?cs
-     var:change.old ?></em> to <em><?cs var:change.new ?></em></li><?cs
-  /if ?><?cs
- /each ?></ul><?cs
- if $comment != "" ?>
-  <div class="comment"><?cs var:$comment ?></div><?cs
- /if ?>
-</div><?cs /if ?>
+   each:field = change.fields ?>
+    <li><strong><?cs var:name(field) ?></strong> <?cs
+    if:name(field) == 'attachment' ?><em><?cs var:field.new ?></em> added<?cs
+    elif:field.old && field.new ?>changed from <em><?cs
+     var:field.old ?></em> to <em><?cs var:field.new ?></em><?cs
+    elif:!field.old && field.new ?>set to <em><?cs var:field.new ?></em><?cs
+    elif:field.old && !field.new ?>deleted<?cs
+    else ?>changed<?cs
+    /if ?>.</li>
+    <?cs
+   /each ?>
+   </ul><?cs
+  /if ?>
+  <div class="comment"><?cs var:change.comment ?></div><?cs
+ /each ?></div><?cs
+/if ?>
 
-<?cs if $trac.acl.TICKET_MODIFY ?>
-<form action="<?cs var:cgi_location ?>#preview" method="post">
+<?cs if:trac.acl.TICKET_CHGPROP || trac.acl.TICKET_APPEND ?>
+<form action="<?cs var:ticket.href ?>#preview" method="post">
+ <input type="hidden" name="ts" value="<?cs var:ticket.ts ?>"/>
  <hr />
  <h3><a name="edit" onfocus="document.getElementById('comment').focus()">Add/Change #<?cs
    var:ticket.id ?> (<?cs var:ticket.summary ?>)</a></h3>
  <div class="field">
-  <input type="hidden" name="mode" value="ticket" />
-  <input type="hidden" name="id"   value="<?cs var:ticket.id ?>" />
   <label for="author">Your email or username:</label><br />
   <input type="text" id="author" name="author" size="40"
     value="<?cs var:ticket.reporter_id ?>" /><br />
@@ -144,10 +136,9 @@
  <div class="field">
   <fieldset class="iefix">
    <label for="comment">Comment (you may use <a tabindex="42" href="<?cs
-     var:$trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):</label><br />
-   <p><textarea id="comment" name="comment" rows="10" cols="78"><?cs
-     var:ticket.comment ?></textarea></p><?cs
-   call:wiki_toolbar('comment') ?>
+     var:trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):</label><br />
+   <p><textarea id="comment" name="comment" class="wikitext" rows="10" cols="78"><?cs
+     var:ticket.comment ?></textarea></p>
   </fieldset><?cs
   if ticket.comment_preview ?>
    <fieldset id="preview">
@@ -157,110 +148,153 @@
   /if ?>
  </div>
 
- <fieldset id="properties">
+ <?cs if:trac.acl.TICKET_CHGPROP ?><fieldset id="properties">
   <legend>Change Properties</legend>
-  <div class="main">
-   <label for="summary">Summary:</label>
-   <input id="summary" type="text" name="summary" size="70" value="<?cs
-     var:ticket.summary ?>" /><?cs
-   if $trac.acl.TICKET_ADMIN ?>
-    <br />
-    <label for="description">Description:</label>
-    <div style="float: left">
-     <textarea id="description" name="description" rows="10" cols="68"><?cs
-       var:ticket.description ?></textarea>
-     <?cs call:wiki_toolbar('description') ?>
-    </div>
-    <br style="clear: left" />
-    <label for="reporter">Reporter:</label>
-    <input id="reporter" type="text" name="reporter" size="70"
-           value="<?cs var:ticket.reporter ?>" /><?cs
+  <table><tr>
+   <th><label for="summary">Summary:</label></th>
+   <td class="fullrow" colspan="3"><input type="text" id="summary" name="summary" value="<?cs
+     var:ticket.summary ?>" size="70" />
+   </tr><?cs
+   if:len(ticket.fields.type.options) ?>
+   <tr>
+    <th><label for="type">Type:</label></th>
+    <td><?cs 
+     call:hdf_select(ticket.fields.type.options, 'type', ticket.type, 0) ?>
+    </td>
+   </tr><?cs
+   /if ?><?cs
+   if:trac.acl.TICKET_ADMIN ?><tr>
+    <th><label for="description">Description:</label></th>
+    <td class="fullrow" colspan="3">
+     <textarea id="description" name="description" class="wikitext" rows="10" cols="68"><?cs
+        var:ticket.description ?></textarea>
+    </td>
+   </tr><tr>
+    <th><label for="reporter">Reporter:</label></th>
+    <td class="fullrow" colspan="3"><input type="text" value="<?cs 
+      var:ticket.reporter ?>" id="reporter" name="reporter" size="70" /></td>
+   </tr><?cs
    /if ?>
-  </div>
-  <div class="col1">
-   <label for="component">Component:</label><?cs
-   call:hdf_select(ticket.components, "component", ticket.component) ?>
-   <br />
-   <label for="version">Version:</label><?cs
-   call:hdf_select(ticket.versions, "version", ticket.version) ?>
-   <br />
-   <label for="severity">Severity:</label><?cs
-   call:hdf_select(enums.severity, "severity", ticket.severity) ?>
-   <br />
-   <label for="keywords">Keywords:</label>
-   <input type="text" id="keywords" name="keywords" size="20"
-       value="<?cs var:ticket.keywords ?>" />
-  </div>
-  <div class="col2">
-   <label for="priority">Priority:</label><?cs
-   call:hdf_select(enums.priority, "priority", ticket.priority) ?><br />
-   <label for="milestone">Milestone:</label><?cs
-   call:hdf_select(ticket.milestones, "milestone", ticket.milestone) ?><br />
-   <label for="owner">Assigned to:</label>
-   <input type="text" id="owner" name="owner" size="20" value="<?cs
-     var:ticket.owner ?>" disabled="disabled" /><br />
-   <label for="cc">Cc:</label>
-   <input type="text" id="cc" name="cc" size="30" value="<?cs var:ticket.cc ?>" />
-  </div>
-  <?cs if:len(ticket.custom) ?><div class="custom">
-   <?cs call:ticket_custom_props(ticket) ?>
-  </div><?cs /if ?>
- </fieldset>
+  <tr><?cs set:num_fields = 0 ?><?cs
+  each:field = ticket.fields ?><?cs
+   if:!field.skip ?><?cs
+    set:num_fields = num_fields + 1 ?><?cs
+   /if ?><?cs
+  /each ?><?cs set:idx = 0 ?><?cs
+   each:field = ticket.fields ?><?cs
+    if:!field.skip ?><?cs set:fullrow = field.type == 'textarea' ?><?cs
+     if:fullrow && idx % 2 ?><?cs set:idx = idx + 1 ?><th class="col2"></th><td></td></tr><tr><?cs /if ?>
+     <th class="col<?cs var:idx % 2 + 1 ?>"><?cs
+       if:field.type != 'radio' ?><label for="<?cs var:name(field) ?>"><?cs
+       /if ?><?cs alt:field.label ?><?cs var:field.name ?><?cs /alt ?>:<?cs
+       if:field.type != 'radio' ?></label><?cs /if ?></th>
+     <td<?cs if:fullrow ?> colspan="3"<?cs /if ?>><?cs
+      if:field.type == 'text' ?><input type="text" id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>" value="<?cs var:ticket[name(field)] ?>" /><?cs
+      elif:field.type == 'select' ?><select id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>"><?cs
+        if:field.optional ?><option></option><?cs /if ?><?cs
+        each:option = field.options ?><option<?cs
+         if:option == ticket[name(field)] ?> selected="selected"<?cs /if ?>><?cs
+         var:option ?></option><?cs
+        /each ?></select><?cs
+      elif:field.type == 'checkbox' ?><input type="hidden" name="checkbox_<?cs
+        var:name(field) ?>" /><input type="checkbox" id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>" value="1"<?cs
+        if:ticket[name(field)] ?> checked="checked"<?cs /if ?> /><?cs
+      elif:field.type == 'textarea' ?><textarea id="<?cs
+        var:name(field) ?>" name="<?cs
+        var:name(field) ?>"<?cs
+        if:field.height ?> rows="<?cs var:field.height ?>"<?cs /if ?><?cs
+        if:field.width ?> cols="<?cs var:field.width ?>"<?cs /if ?>><?cs
+        var:ticket[name(field)] ?></textarea><?cs
+      elif:field.type == 'radio' ?><?cs set:optidx = 0 ?><?cs
+       each:option = field.options ?><label><input type="radio" id="<?cs
+         var:name(field) ?>" name="<?cs
+         var:name(field) ?>" value="<?cs var:option ?>"<?cs
+         if:ticket[name(field)] == option ?> checked="checked"<?cs /if ?> /> <?cs
+         var:option ?></label> <?cs set:optidx = optidx + 1 ?><?cs
+        /each ?><?cs
+      /if ?></td><?cs
+     if:idx % 2 || fullrow ?></tr><tr><?cs 
+     elif:idx == num_fields - 1 ?><th class="col2"></th><td></td><?cs
+     /if ?><?cs set:idx = idx + #fullrow + 1 ?><?cs
+    /if ?><?cs
+   /each ?></tr>
+  </table>
+ </fieldset><?cs /if ?>
 
+ <?cs if:ticket.actions.accept || ticket.actions.reopen ||
+         ticket.actions.resolve || ticket.actions.reassign ?>
  <fieldset id="action">
   <legend>Action</legend><?cs
   if:!ticket.action ?><?cs set:ticket.action = 'leave' ?><?cs
   /if ?><?cs
   def:action_radio(id) ?>
    <input type="radio" id="<?cs var:id ?>" name="action" value="<?cs
-     var:id ?>"<?cs if:$ticket.action == $id ?> checked="checked"<?cs
+     var:id ?>"<?cs if:ticket.action == id ?> checked="checked"<?cs
      /if ?> /><?cs
   /def ?>
   <?cs call:action_radio('leave') ?>
-  <label for="leave">leave as <?cs var:ticket.status ?></label><br /><?cs
-  if $ticket.status == "new" ?>
-   <?cs call:action_radio('accept') ?>
+   <label for="leave">leave as <?cs var:ticket.status ?></label><br /><?cs
+  if:ticket.actions.accept ?><?cs
+   call:action_radio('accept') ?>
    <label for="accept">accept ticket</label><br /><?cs
   /if ?><?cs
-  if $ticket.status == "closed" ?>
-   <?cs call:action_radio('reopen') ?>
+  if:ticket.actions.reopen ?><?cs
+   call:action_radio('reopen') ?>
    <label for="reopen">reopen ticket</label><br /><?cs
   /if ?><?cs
-  if $ticket.status == "new" || $ticket.status == "assigned" || $ticket.status == "reopened" ?>
-   <?cs call:action_radio('resolve') ?>
-   <label for="resolve">resolve</label>
-   <label for="resolve_resolution">as:</label>
-   <?cs call:hdf_select(enums.resolution, "resolve_resolution", args.resolve_resolution) ?><br />
-   <?cs call:action_radio('reassign') ?>
+  if:ticket.actions.resolve ?><?cs
+   call:action_radio('resolve') ?>
+   <label for="resolve">resolve</label><?cs
+   if:len(ticket.fields.resolution.options) ?>
+    <label for="resolve_resolution">as:</label>
+    <?cs call:hdf_select(ticket.fields.resolution.options, "resolve_resolution",
+                         ticket.resolve_resolution, 0) ?><br /><?cs
+   /if ?><?cs
+  /if ?><?cs
+  if:ticket.actions.reassign ?><?cs
+   call:action_radio('reassign') ?>
    <label for="reassign">reassign</label>
-   <label for="reassign_owner">to:</label>
-   <input type="text" id="reassign_owner" name="reassign_owner" size="40" value="<?cs
-     if:args.reassign_to ?><?cs var:args.reassign_to ?><?cs
-     else ?><?cs var:trac.authname ?><?cs /if ?>" /><?cs
+   <label>to:<?cs
+   if:len(ticket.fields.owner.options) ?><?cs
+    call:hdf_select(ticket.fields.owner.options, "reassign_owner",
+                    ticket.reassign_owner, 1) ?><?cs
+   else ?>
+    <input type="text" id="reassign_owner" name="reassign_owner" size="40" value="<?cs
+      var:ticket.reassign_owner ?>" /><?cs
+   /if ?></label><?cs
   /if ?><?cs
-  if $ticket.status == "new" || $ticket.status == "assigned" || $ticket.status == "reopened" ?>
-   <script type="text/javascript">
-     var resolve = document.getElementById("resolve");
-     var reassign = document.getElementById("reassign");
+  if ticket.actions.resolve || ticket.actions.reassign ?>
+   <script type="text/javascript"><?cs
+    each:action = ticket.actions ?>
+     var <?cs var:name(action) ?> = document.getElementById("<?cs var:name(action) ?>");<?cs
+    /each ?>
      var updateActionFields = function() {
-       enableControl('resolve_resolution', resolve.checked);
-       enableControl('reassign_owner', reassign.checked);
+       <?cs if:ticket.actions.resolve ?> enableControl('resolve_resolution', resolve.checked);<?cs /if ?>
+       <?cs if:ticket.actions.reassign ?> enableControl('reassign_owner', reassign.checked);<?cs /if ?>
      };
-     addEvent(window, 'load', updateActionFields);
-     addEvent(document.getElementById("leave"), 'click', updateActionFields);<?cs
-    if $ticket.status == "new" ?>
-     addEvent(document.getElementById("accept"), 'click', updateActionFields);<?cs
-    /if ?>
-    addEvent(resolve, 'click', updateActionFields);
-    addEvent(reassign, 'click', updateActionFields);
+     addEvent(window, 'load', updateActionFields);<?cs
+     each:action = ticket.actions ?>
+      addEvent(<?cs var:name(action) ?>, 'click', updateActionFields);<?cs
+     /each ?>
    </script><?cs
   /if ?>
- </fieldset>
+ </fieldset><?cs
+ else ?>
+  <input type="hidden" name="action" value="leave" /><?cs
+ /if ?>
+
+ <script type="text/javascript" src="<?cs
+   var:htdocs_location ?>js/wikitoolbar.js"></script>
 
  <div class="buttons">
-  <input type="reset" value="Reset" />&nbsp;
   <input type="submit" name="preview" value="Preview" />&nbsp;
-  <input type="submit" value="Submit changes" /> 
+  <input type="submit" value="Submit changes" />
  </div>
 </form>
 <?cs /if ?>
diff --git a/django_website/templates/trac_templates/timeline.cs b/django_website/templates/trac_templates/timeline.cs
index d9dabb1de..24103b78b 100644
--- a/django_website/templates/trac_templates/timeline.cs
+++ b/django_website/templates/trac_templates/timeline.cs
@@ -6,87 +6,41 @@
 <div id="content" class="timeline">
  <h1>Timeline</h1>
 
- <form id="prefs" action="<?cs var:trac.href.timeline ?>">
+ <form id="prefs" method="get" action="<?cs var:trac.href.timeline ?>">
   <div>
-   <label for="from">View changes from</label>
-   <input type="text" size="10" id="from" name="from"
-       value="<?cs var:timeline.from ?>" /> and <input type="text" size="3"
-       id="daysback" name="daysback"  value="<?cs var:timeline.daysback ?>" />
-   <label for="daysback">days back</label>.
+   <label>View changes from <input type="text" size="10" name="from" value="<?cs
+     var:timeline.from ?>" /></label> and
+   <label><input type="text" size="3" name="daysback" value="<?cs
+     var:timeline.daysback ?>" /> days back</label>.
   </div>
-  <fieldset>
-   <?cs if:trac.acl.TICKET_VIEW ?><div class="field">
-    <input type="checkbox" id="ticket" name="ticket" <?cs
-      if:timeline.ticket ?>checked="checked"<?cs /if ?> />
-    <label for="ticket">Ticket changes</label>
-   </div><?cs /if ?>
-   <?cs if:trac.acl.CHANGESET_VIEW ?><div class="field">
-    <input type="checkbox" id="changeset" name="changeset" <?cs
-      if:timeline.changeset ?>checked="checked"<?cs /if ?> />
-    <label for="changeset">Repository checkins</label>
-   </div><?cs /if ?>
-   <?cs if:trac.acl.WIKI_VIEW ?><div class="field">
-    <input type="checkbox" id="wiki" name="wiki" <?cs
-      if:timeline.wiki ?>checked="checked"<?cs /if ?> />
-    <label for="wiki">Wiki changes</label>
-   </div><?cs /if ?>
-   <?cs if:trac.acl.MILESTONE_VIEW ?><div class="field">
-    <input type="checkbox" id="milestone" name="milestone" <?cs
-      if:timeline.milestone ?>checked="checked"<?cs /if ?> />
-    <label for="milestone">Milestones</label>
-   </div><?cs /if ?>
+  <fieldset><?cs
+   each:filter = timeline.filters ?><div class="field">
+     <input type="checkbox" id="<?cs var:filter.name ?>" name="<?cs var:filter.name ?>"<?cs
+      if:filter.enabled ?> checked="checked"<?cs /if ?> /> 
+      <label for="<?cs var:filter.name ?>"><?cs var:filter.label ?></label></div><?cs
+   /each ?>
   </fieldset>
   <div class="buttons">
-   <input type="submit" value="Update" />
+   <input type="submit" name="update" value="Update" />
   </div>
  </form>
 
-<?cs def:day_separator(date) ?>
- <?cs if: $date != $current_date ?>
-  <?cs if: $current_date ?></dl><?cs /if ?>
-  <?cs set: $current_date = $date ?>
-  <h2><?cs var:date ?>:</h2>
-  <dl>
- <?cs /if ?>
-<?cs /def ?>
-
-<?cs def:tlitem(url, type, msg, descr) ?>
- <dt class="<?cs var:type ?>">
-  <a href="<?cs var:url ?>"><span class="time"><?cs
-    var:item.time ?></span> <?cs var:msg ?></a>
- </dt>
- <?cs if:descr ?><dd><?cs var:descr ?></dd><?cs /if ?>
-<?cs /def ?>
-
-<?cs each:item = timeline.items ?>
- <?cs call:day_separator(item.date) ?>
- <?cs if:item.type == #1 ?><!-- Changeset -->
-  <?cs call:tlitem(item.href, 'changeset',
-    'Changeset <em>['+$item.idata+']</em> by '+$item.author,$item.node_list+item.message) ?>
- <?cs elif:item.type == #2 ?><!-- New ticket -->
-  <?cs call:tlitem(item.href, 'newticket',
-    'Ticket <em>#'+$item.idata+'</em> created by '+$item.author, item.message) ?>
- <?cs elif:item.type == #3 ?><!-- Closed ticket -->
-  <?cs if:item.message ?>
-   <?cs set:imessage = ' - ' + $item.message ?>
-  <?cs else ?>
-   <?cs set:imessage = '' ?>
-  <?cs /if ?>
-  <?cs call:tlitem(item.href, 'closedticket',
-    'Ticket <em>#'+$item.idata+'</em> resolved by '+$item.author, 
-    $item.tdata+$imessage) ?>
- <?cs elif:item.type == #4 ?><!-- Reopened ticket -->
-  <?cs call:tlitem(item.href, 'newticket',
-    'Ticket <em>#'+$item.idata+'</em> reopened by '+$item.author, '') ?>
- <?cs elif:item.type == #5 ?><!-- Wiki change -->
-  <?cs call:tlitem(item.href, 'wiki',
-    '<em>'+$item.tdata+'</em> edited by '+$item.author, item.message) ?>
- <?cs elif:item.type == #6 ?><!-- milestone -->
-  <?cs call:tlitem(item.href, 'milestone',
-    '<em>Milestone '+$item.message+'</em> reached', '') ?>
- <?cs /if ?>
-<?cs /each ?>
-<?cs if:len(timeline.items) ?></dl><?cs /if ?>
+<?cs def:day_separator(date) ?><?cs
+ if:date != current_date ?><?cs
+  if:current_date ?></dl><?cs /if ?><?cs
+  set:current_date = date ?>
+  <h2><?cs var:date ?>:</h2><dl><?cs
+ /if ?><?cs
+/def ?><?cs
+each:event = timeline.events ?><?cs
+ call:day_separator(event.date) ?><dt class="<?cs
+ var:event.kind ?>"><a href="<?cs var:event.href ?>"><span class="time"><?cs
+ var:event.time ?></span> <?cs var:event.title ?></a></dt><?cs
+  if:event.message ?><dd class="<?cs var:event.kind ?>"><?cs
+   var:event.message ?></dd><?cs
+  /if ?><?cs
+/each ?><?cs
+if:len(timeline.events) ?></dl><?cs /if ?>
 
 <div id="help">
  <hr />
diff --git a/django_website/templates/trac_templates/timeline_rss.cs b/django_website/templates/trac_templates/timeline_rss.cs
index de1008bfb..76cf749c9 100644
--- a/django_website/templates/trac_templates/timeline_rss.cs
+++ b/django_website/templates/trac_templates/timeline_rss.cs
@@ -1,65 +1,31 @@
 <?xml version="1.0"?>
-<!-- RSS generated by Trac v<?cs var:$trac.version ?> on <?cs var:$trac.time ?> -->
 <rss version="2.0">
-   <?cs set base_url = $HTTP.Protocol+'://'+$HTTP.Host ?>
-   <?cs if $HTTP.Port ?>
-     <?cs set base_url = $base_url + ':' + $HTTP.Port ?>
-   <?cs /if ?>
-   <?cs def:rss_item(category,title, link, descr) ?>
-      <item>
-        <?cs if:$item.author.rss ?>
-         <author><?cs var:$item.author.rss ?></author>
-        <?cs /if ?>
-        <pubDate><?cs var:$item.datetime ?></pubDate>
-        <title><?cs var:$title ?></title>
-        <link><?cs var:$base_url ?><?cs var:$link ?></link>
-        <description><?cs var:$descr ?></description>
-        <category><?cs var:$category ?></category>
-      </item>
-   <?cs /def ?>
-    <channel>
-      <?cs if $project.name.encoded ?>
-        <title><?cs var:$project.name.encoded ?>: <?cs var:$title ?></title>
-      <?cs else ?>
-        <title><?cs var:$title ?></title>
-      <?cs /if ?>
-      <link><?cs var:$base_url ?><?cs var:$trac.href.timeline ?></link>
-      <description>Trac Timeline</description>
-      <language>en-us</language>
-      <generator>Trac v<?cs var:$trac.version ?></generator>
-      <image>
-        <title><?cs var:$project.name.encoded ?></title>
-        <url><?cs if !$header_logo.src_abs ?><?cs var:$base_url ?><?cs /if ?><?cs var $header_logo.src ?></url>
-        <link><?cs var:$base_url ?><?cs var:$trac.href.timeline ?></link>
-      </image>
-      <?cs each:item = $timeline.items ?><?cs
-        if:item.type == #1 
-        ?><!-- Changeset --><?cs call:rss_item('Changeset',
-                             'Changeset ['+$item.idata+'] by '+$item.author, 
-                             $item.href, $item.msg_escwiki) 
-        ?><?cs elif:item.type == #2 
-        ?><!-- New ticket --> <?cs call:rss_item('Ticket',
-                             'Ticket #'+$item.idata+' created by '+$item.author,
-                             $item.href, $item.msg_escwiki) 
-        ?><?cs elif:item.type == #3
-        ?><!-- Closed ticket --> <?cs call:rss_item('Ticket',
-                             'Ticket #'+$item.idata+' resolved: '+$item.shortmsg,
-                             $item.href, $item.msg_escwiki) 
-        ?><?cs elif:item.type == #4 
-        ?><!-- Reopened ticket --><?cs call:rss_item('Ticket',
-                             '#'+$item.idata+' reopened: '+$item.shortmsg,
-                             $item.href, $item.msg_escwiki) 
-        ?><?cs elif:item.type == #5 
-        ?><!-- Wiki change --><?cs call:rss_item('Wiki',
-                             $item.tdata+" page edited.",
-                             $item.href,
-'Wiki page &lt;a href="'+$base_url+$item.href+'"&gt;'+$item.tdata+'&lt;/a&gt; edited by '+$item.author) ?>
-        <?cs elif:item.type == #6 ?><!-- Milestones -->
-          <?cs call:rss_item('Milestone',
-                             'Milestone ' + $item.message.rss + ' reached.',
-                             '',
-               'Milestone ' + $item.tdata + ' reached.') ?>
-        <?cs /if ?>
-      <?cs /each ?>
-    </channel>
-</rss>
\ No newline at end of file
+ <channel><?cs
+  if:project.name.encoded ?>
+   <title><?cs var:project.name.encoded ?>: <?cs var:title ?></title><?cs
+  else ?>
+   <title><?cs var:title ?></title><?cs
+  /if ?>
+  <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link>
+  <description>Trac Timeline</description>
+  <language>en-us</language>
+  <generator>Trac v<?cs var:trac.version ?></generator>
+  <image>
+   <title><?cs var:project.name.encoded ?></title>
+   <url><?cs if:!header_logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs
+    var:header_logo.src ?></url>
+   <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link>
+  </image><?cs
+  each:event = timeline.events ?>
+   <item>
+    <title><?cs var:event.title ?></title><?cs
+    if:event.author.email ?>
+     <author><?cs var:event.author.email ?></author><?cs
+    /if ?>
+    <pubDate><?cs var:event.date ?></pubDate>
+    <link><?cs var:event.href ?></link>
+    <description><?cs var:event.message ?></description>
+   </item><?cs
+  /each ?>
+ </channel>
+</rss>
diff --git a/django_website/templates/trac_templates/wiki.cs b/django_website/templates/trac_templates/wiki.cs
index 0a8a53d6d..d7ef1b15d 100644
--- a/django_website/templates/trac_templates/wiki.cs
+++ b/django_website/templates/trac_templates/wiki.cs
@@ -21,38 +21,89 @@
 
 <div id="content" class="wiki">
 
- <?cs if:wiki.action == "diff" ?>
-  <h1>Changes in Version <?cs var:wiki.edit_version?> of <a href="<?cs
+ <?cs if wiki.action == "delete" ?>
+  <h1>Delete <?cs
+   if:?wiki.version ?>version <?cs var:wiki.version ?> of <?cs /if ?><a href="<?cs
     var:wiki.current_href ?>"><?cs var:wiki.page_name ?></a></h1>
+  <form action="<?cs var:wiki.href ?>" method="post">
+   <input type="hidden" name="action" value="delete" />
+   <p><strong>Are you sure you want to <?cs
+    if:!?wiki.version ?>completely <?cs /if ?>delete <?cs
+    if:?wiki.version ?>version <?cs var:wiki.version ?> of <?cs
+    /if ?>this page?</strong><br /><?cs
+   if:wiki.only_version ?>
+    This is the only version the page, so the page will be removed
+    completely!<?cs
+   /if ?>
+   This is an irreversible operation.</p>
+   <div class="buttons">
+    <input type="submit" name="cancel" value="Cancel" />
+    <input type="submit" value="Delete <?cs
+      if:?wiki.version ?>this version<?cs else ?>page<?cs /if ?>" />
+   </div>
+  </form>
+ 
+ <?cs elif:wiki.action == "diff" ?>
+  <h1>Changes between Version <?cs var:wiki.old_version?> and <?cs
+    var:wiki.version?> of <a href="<?cs var:wiki.current_href ?>"><?cs 
+    var:wiki.page_name ?></a></h1>
   <form method="post" id="prefs" action="<?cs var:wiki.current_href ?>">
    <div>
-    <input type="hidden" name="mode" value="wiki" />
-    <input type="hidden" name="diff" value="yes" />
-    <input type="hidden" name="version" value="<?cs var:wiki.edit_version?>" />
-    <input type="hidden" name="update" value="yes" />
-    <label for="type">View differences</label>
-    <select name="style" onchange="this.form.submit()">
+    <input type="hidden" name="action" value="diff" />
+    <input type="hidden" name="version" value="<?cs var:wiki.version ?>" />
+    <label>View differences <select name="style">
      <option value="inline"<?cs
        if:diff.style == 'inline' ?> selected="selected"<?cs
        /if ?>>inline</option>
      <option value="sidebyside"<?cs
        if:diff.style == 'sidebyside' ?> selected="selected"<?cs
        /if ?>>side by side</option>
-    </select>
-    <noscript><div class="buttons">
-     <input type="submit" value="Update" />
-    </div></noscript>
+    </select></label>
+    <div class="field">
+     Show <input type="text" name="contextlines" id="contextlines" size="2"
+       maxlength="2" value="<?cs var:diff.options.contextlines ?>" />
+     <label for="contextlines">lines around each change</label>
+    </div>
+    <fieldset id="ignore">
+     <legend>Ignore:</legend>
+     <div class="field">
+      <input type="checkbox" id="blanklines" name="ignoreblanklines"<?cs
+        if:diff.options.ignoreblanklines ?> checked="checked"<?cs /if ?> />
+      <label for="blanklines">Blank lines</label>
+     </div>
+     <div class="field">
+      <input type="checkbox" id="case" name="ignorecase"<?cs
+        if:diff.options.ignorecase ?> checked="checked"<?cs /if ?> />
+      <label for="case">Case changes</label>
+     </div>
+     <div class="field">
+      <input type="checkbox" id="whitespace" name="ignorewhitespace"<?cs
+        if:diff.options.ignorewhitespace ?> checked="checked"<?cs /if ?> />
+      <label for="whitespace">White space changes</label>
+     </div>
+    </fieldset>
+    <div class="buttons">
+     <input type="submit" name="update" value="Update" />
+    </div>
    </div>
   </form>
   <dl id="overview">
    <dt class="author">Author:</dt>
-   <dd><?cs var:wiki.diff.author ?></dd>
+   <dd class="author"><?cs
+    if:wiki.num_changes > 1 ?><em class="multi">(multiple changes)</em><?cs
+    else ?><?cs var:wiki.author ?> <span class="ipnr">(IP: <?cs
+     var:wiki.ipnr ?>)</span><?cs
+    /if ?></dd>
    <dt class="time">Timestamp:</dt>
-   <dd><?cs var:wiki.diff.time ?></dd>
-   <?cs if:wiki.diff.comment ?>
-    <dt class="comment">Comment:</dt>
-    <dd><?cs var:wiki.diff.comment ?></dd>
-   <?cs /if ?>
+   <dd class="time"><?cs
+    if:wiki.num_changes > 1 ?><em class="multi">(multiple changes)</em><?cs
+    elif:wiki.time ?><?cs var:wiki.time ?> (<?cs var:wiki.time_delta ?> ago)<?cs
+    else ?>--<?cs
+    /if ?></dd>
+   <dt class="comment">Comment:</dt>
+   <dd class="comment"><?cs
+    if:wiki.num_changes > 1 ?><em class="multi">(multiple changes)</em><?cs
+    else ?><?cs var:wiki.comment ?><?cs /if ?></dd>
   </dl>
   <div class="diff">
    <div id="legend">
@@ -64,45 +115,36 @@
      <dt class="mod"></dt><dd>Modified</dd>
     </dl>
    </div>
-   <ul>
-    <li>
-     <h2><?cs var:wiki.diff.name.new ?></h2>
-     <?cs if:diff.style == 'sidebyside' ?>
+   <ul class="entries">
+    <li class="entry">
+     <h2><?cs var:wiki.page_name ?></h2><?cs
+      if:diff.style == 'sidebyside' ?>
       <table class="sidebyside" summary="Differences">
-       <colgroup class="base">
-        <col class="lineno" /><col class="content" />
-       <colgroup class="chg">
-        <col class="lineno" /><col class="content" />
-       </colgroup>
+       <colgroup class="l"><col class="lineno" /><col class="content" /></colgroup>
+       <colgroup class="r"><col class="lineno" /><col class="content" /></colgroup>
        <thead><tr>
-        <th colspan="2">Version <?cs var:wiki.diff.rev.old ?></th>
-        <th colspan="2">Version <?cs var:wiki.diff.rev.new ?></th>
-       </tr></thead>
-       <?cs each:change = wiki.diff.changes ?>
-        <tbody>
-         <?cs call:diff_display(change, diff.style) ?>
-        </tbody>
-       <?cs /each ?>
-      </table>
-     <?cs else ?>
+        <th colspan="2">Version <?cs var:wiki.old_version ?></th>
+        <th colspan="2">Version <?cs var:wiki.version ?></th>
+       </tr></thead><?cs
+       each:change = wiki.diff ?><?cs
+        call:diff_display(change, diff.style) ?><?cs
+       /each ?>
+      </table><?cs
+     else ?>
       <table class="inline" summary="Differences">
-       <colgroup>
-        <col class="lineno" />
-        <col class="lineno" />
-        <col class="content" />
-       </colgroup>
+       <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
        <thead><tr>
-        <th title="Version <?cs var:wiki.diff.rev.old ?>">v<?cs
-          var:wiki.diff.rev.old ?></th>
-        <th title="Version <?cs var:wiki.diff.rev.new ?>">v<?cs
-          var:wiki.diff.rev.new ?></th>
-        <th></th>
-       </tr></thead>
-       <?cs each:change = wiki.diff.changes ?>
-        <?cs call:diff_display(change, diff.style) ?>
-       <?cs /each ?>
-      </table>
-     <?cs /if ?>
+        <th title="Version <?cs var:wiki.old_version ?>">v<?cs
+          var:wiki.old_version ?></th>
+        <th title="Version <?cs var:wiki.version ?>">v<?cs
+          var:wiki.version ?></th>
+        <th>&nbsp;</th>
+       </tr></thead><?cs
+       each:change = wiki.diff ?><?cs
+        call:diff_display(change, diff.style) ?><?cs
+       /each ?>
+      </table><?cs
+     /if ?>
     </li>
    </ul>
   </div>
@@ -110,38 +152,58 @@
  <?cs elif wiki.action == "history" ?>
   <h1>Change History of <a href="<?cs var:wiki.current_href ?>"><?cs
     var:wiki.page_name ?></a></h1>
-  <?cs if:wiki.history ?>
+  <?cs if:len(wiki.history) ?><form method="get" action="">
+   <input type="hidden" name="action" value="diff" />
    <table id="wikihist" class="listing" summary="Change history">
     <thead><tr>
-     <th class="date">Date</th>
+     <th class="diff"></th>
      <th class="version">Version</th>
+     <th class="date">Date</th>
      <th class="author">Author</th>
      <th class="comment">Comment</th>
     </tr></thead>
     <tbody><?cs each:item = wiki.history ?>
      <tr class="<?cs if:name(item) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
+      <td class="diff"><input type="radio" name="old_version" value="<?cs
+        var:item.version ?>"<?cs
+        if:name(item) == 1 ?> checked="checked"<?cs
+        /if ?> /> <input type="radio" name="version" value="<?cs
+        var:item.version ?>"<?cs
+        if:name(item) == 0 ?> checked="checked"<?cs
+        /if ?> /></td>
+      <td class="version"><a href="<?cs
+        var:item.url ?>" title="View this version"><?cs
+        var:item.version ?></a></td>
       <td class="date"><?cs var:item.time ?></td>
-      <td class="version">
-       <a href="<?cs var:item.url ?>" title="View version"><?cs
-         var:item.version ?></a>
-       (<a href="<?cs var:item.diff_url ?>" title="Compare to previous version">diff</a>)
-      </td>
-      <td class="author" title="IP-Address: <?cs var:item.ipaddr ?>">
-       <?cs var:item.author ?>
-      </td>
+      <td class="author" title="IP-Address: <?cs var:item.ipaddr ?>"><?cs 
+        var:item.author ?></td>
       <td class="comment"><?cs var:item.comment ?></td>
      </tr>
     <?cs /each ?></tbody>
    </table>
-  <?cs /if ?>
+   <div class="buttons">
+    <input type="submit" value="View changes" />
+   </div>
+  </form><?cs /if ?>
  
  <?cs else ?>
-  <?cs if wiki.action == "edit" || wiki.action == "preview" ?>
-   <h3>Editing "<?cs var:wiki.page_name ?>"</h3>
-   <form id="edit" action="<?cs var:wiki.current_href ?>#preview" method="post">
+  <?cs if wiki.action == "edit" || wiki.action == "preview" || wiki.action == "collision" ?>
+   <h1>Editing "<?cs var:wiki.page_name ?>"</h1><?cs
+    if wiki.action == "preview" ?>
+     <fieldset id="preview">
+      <legend>Preview (<a href="#edit">skip</a>)</legend>
+      <div class="wikipage"><?cs var:wiki.page_html ?></div>
+     </fieldset><?cs
+     elif wiki.action =="collision"?>
+     <div class="system-message">
+       Sorry, this page has been modified by somebody else since you started 
+       editing. Your changes cannot be saved.
+     </div><?cs
+    /if ?>
+   <form id="edit" action="<?cs var:wiki.current_href ?>" method="post">
     <fieldset class="iefix">
-     <input type="hidden" name="edit_version" value="<?cs
-       var:wiki.edit_version ?>" />
+     <input type="hidden" name="action" value="edit" />
+     <input type="hidden" name="version" value="<?cs var:wiki.version ?>" />
      <input type="hidden" id="scroll_bar_pos" name="scroll_bar_pos" value="<?cs
        var:wiki.scroll_bar_pos ?>" />
      <div id="rows">
@@ -155,9 +217,8 @@
        /loop ?>
       </select>
      </div>
-     <p><textarea id="text" name="text" cols="80" rows="<?cs
+     <p><textarea id="text" class="wikitext" name="text" cols="80" rows="<?cs
        var:wiki.edit_rows ?>"><?cs var:wiki.page_source ?></textarea></p>
-     <?cs call:wiki_toolbar('text') ?>
      <script type="text/javascript">
        var scrollBarPos = document.getElementById("scroll_bar_pos");
        var text = document.getElementById("text");
@@ -175,74 +236,83 @@
     <fieldset id="changeinfo">
      <legend>Change information</legend>
      <div class="field">
-      <label for="author">Your email or username:</label>
-      <br /><input id="author" type="text" name="author" size="30" value="<?cs
-        var:wiki.author ?>" />
+      <label>Your email or username:<br />
+      <input id="author" type="text" name="author" size="30" value="<?cs
+        var:wiki.author ?>" /></label>
      </div>
      <div class="field">
-      <label for="comment">Comment about this change (optional):</label>
-      <br /><input id="comment" type="text" name="comment" size="60" value="<?cs
-        var:wiki.comment?>" />
+      <label>Comment about this change (optional):<br />
+      <input id="comment" type="text" name="comment" size="60" value="<?cs
+        var:wiki.comment?>" /></label>
      </div><br />
      <?cs if trac.acl.WIKI_ADMIN ?>
       <div class="options">
-       <input type="checkbox" name="readonly" id="readonly"<?cs
+       <label><input type="checkbox" name="readonly" id="readonly"<?cs
          if wiki.readonly == "1"?>checked="checked"<?cs /if ?> />
-       <label for="readonly">Page is read-only</label>
+       Page is read-only</label>
       </div>
      <?cs /if ?>
     </fieldset>
-    <div class="buttons">
-     <input type="submit" name="save" value="Save changes" />&nbsp;
+    <div class="buttons"><?cs
+     if wiki.action == "collision" ?>
+     <input type="submit" name="preview" value="Preview" disabled="" />&nbsp;
+     <input type="submit" name="save" value="Submit changes" disabled="" />&nbsp;
+     <?cs else ?>
      <input type="submit" name="preview" value="Preview" />&nbsp;
+     <input type="submit" name="save" value="Submit changes" />&nbsp;
+     <?cs /if ?>
      <input type="submit" name="cancel" value="Cancel" />
-    </div><?cs
-    if wiki.action == "preview" ?>
-     <fieldset id="preview">
-      <legend>Preview</legend>
-      <div class="wikipage"><?cs var:wiki.page_html ?></div>
-     </fieldset><?cs
-    /if ?>
+    </div>
+    <script type="text/javascript" src="<?cs
+      var:htdocs_location ?>js/wikitoolbar.js"></script>
    </form>
   <?cs /if ?>
   <?cs if wiki.action == "view" ?>
    <div class="wikipage">
     <div id="searchable"><?cs var:wiki.page_html ?></div>
    </div>
-   <?cs if $wiki.attachments.0.name ?>
+   <?cs if:len(wiki.attachments) ?>
     <h3 id="tkt-changes-hdr">Attachments</h3>
-    <ul class="tkt-chg-list">
-    <?cs each:a = wiki.attachments ?>
-      <li class="tkt-chg-change"><a href="<?cs var:a.href ?>">
-      <?cs var:a.name ?></a> (<?cs var:a.size ?>) -
-      <?cs var:a.descr ?>,
-      added by <?cs var:a.author ?> on <?cs var:a.time ?>.</li>
-    <?cs /each ?>
-  </ul>
+    <ul class="tkt-chg-list"><?cs
+     each:attachment = wiki.attachments ?><li class="tkt-chg-change"><a href="<?cs
+      var:attachment.href ?>"><?cs
+      var:attachment.filename ?></a> (<?cs var:attachment.size ?>) -<?cs
+      if:attachment.description ?><q><?cs var:attachment.description ?></q>,<?cs
+      /if ?> added by <?cs var:attachment.author ?> on <?cs
+      var:attachment.time ?>.</li><?cs
+     /each ?>
+    </ul>
   <?cs /if ?>
   <?cs if wiki.action == "view" && (trac.acl.WIKI_MODIFY || trac.acl.WIKI_DELETE)
       && (wiki.readonly == "0" || trac.acl.WIKI_ADMIN) ?>
-   <div class="buttons">
-    <?cs if:trac.acl.WIKI_MODIFY ?>
-     <form method="get" action=""><div>
-      <input type="hidden" name="edit" value="yes" />
-      <input type="submit" value="Edit This Page" />
-     </div></form>
-     <form method="get" action="<?cs var:wiki.attach_href ?>"><div>
-      <input type="submit" value="Attach File" />
-     </div></form>
-    <?cs /if ?>
-    <?cs if:trac.acl.WIKI_DELETE ?>
-     <form method="post" action=""><div id="delete">
-      <input type="hidden" name="edit_version" value="<?cs
-        var:wiki.edit_version?>" />
-       <input type="submit" name="delete_ver" id="delete_ver" value="Delete This Version" onclick="return confirm('Do you really want to delete version <?cs var:wiki.edit_version?> of this page?\nThis is an irreversible operation.')" />
-       <input type="submit" name="delete_page" value="Delete Page" onclick="return confirm('Do you really want to delete all versions of this page?\nThis is an irreversible operation.')" />
+   <div class="buttons"><?cs
+    if:trac.acl.WIKI_MODIFY ?>
+     <form method="get" action="<?cs var:wiki.current_href ?>"><div>
+      <input type="hidden" name="action" value="edit" />
+      <input type="submit" value="<?cs if:wiki.exists ?>Edit<?cs else ?>Create<?cs /if ?> this page" />
+     </div></form><?cs
+     if:wiki.exists ?>
+      <form method="get" action="<?cs var:wiki.attach_href ?>"><div>
+       <input type="hidden" name="action" value="new" />
+       <input type="submit" value="Attach file" />
+      </div></form><?cs
+     /if ?><?cs
+    /if ?><?cs
+    if:wiki.exists && trac.acl.WIKI_DELETE ?>
+     <form method="get" action="<?cs var:wiki.current_href ?>"><div id="delete">
+      <input type="hidden" name="action" value="delete" />
+      <input type="hidden" name="version" value="<?cs var:wiki.version ?>" />
+      <input type="submit" name="delete_version" value="Delete this version" />
+      <input type="submit" value="Delete page" />
      </div></form>
     <?cs /if ?>
    </div>
   <?cs /if ?>
+  <script type="text/javascript">
+   addHeadingLinks(document.getElementById("searchable"));
+  </script>
  <?cs /if ?>
  <?cs /if ?>
 </div>
+
 <?cs include "footer.cs" ?>