From 5b41e1b42a806ed088b6fc7fc5d8a9a810821ad0 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <postgres@jeltef.nl>
Date: Sun, 2 Mar 2025 00:26:41 +0100
Subject: [PATCH 1/2] Indent Django templates using djhtml (#48)

---
 .github/workflows/ci.yaml | 6 ++++++
 Makefile                  | 1 +
 dev_requirements.txt      | 1 +
 3 files changed, 8 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6fa14369..c2cb0d5c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,3 +27,9 @@ jobs:
 
       - name: Run Biome
         run: biome ci .
+
+      - name: Install djhtml
+        run: pip install djhtml
+
+      - name: Run djhtml
+        run: djhtml pgcommitfest/*/templates/*.html --tabwidth=1 --check
diff --git a/Makefile b/Makefile
index 2a9ad3a9..4950827f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 format:
 	ruff format
 	npx @biomejs/biome format --write
+	djhtml pgcommitfest/*/templates/*.html --tabwidth=1
 
 lint:
 	ruff check
diff --git a/dev_requirements.txt b/dev_requirements.txt
index 66d7ae13..2b0518b5 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -2,3 +2,4 @@
 uwsgi
 pycodestyle
 ruff
+djhtml

From 3b3e7b87a4f59f46537ea6244cc869e553b87b28 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <postgres@jeltef.nl>
Date: Sun, 2 Mar 2025 00:29:10 +0100
Subject: [PATCH 2/2] Autoindent django templates (#48)

---
 pgcommitfest/commitfest/templates/404.html    |   4 +-
 .../commitfest/templates/activity.html        |  40 +-
 pgcommitfest/commitfest/templates/base.html   |  72 +--
 .../commitfest/templates/base_form.html       | 180 +++----
 .../commitfest/templates/commitfest.html      | 312 +++++------
 pgcommitfest/commitfest/templates/home.html   |  38 +-
 pgcommitfest/commitfest/templates/patch.html  | 510 +++++++++---------
 .../commitfest/templates/patchsearch.html     |  50 +-
 .../commitfest/templates/report_authors.html  |  42 +-
 .../templates/userprofileform.html            |  56 +-
 10 files changed, 652 insertions(+), 652 deletions(-)

diff --git a/pgcommitfest/commitfest/templates/404.html b/pgcommitfest/commitfest/templates/404.html
index ccf5146c..73a24c02 100644
--- a/pgcommitfest/commitfest/templates/404.html
+++ b/pgcommitfest/commitfest/templates/404.html
@@ -1,7 +1,7 @@
 {%extends "base.html" %}
 {%block title%}Not found{%endblock%}
 {%block contents%}
-<h1>Not found</h1>
-<p>The specified URL was not found.</p>
+ <h1>Not found</h1>
+ <p>The specified URL was not found.</p>
 {%endblock%}
 
diff --git a/pgcommitfest/commitfest/templates/activity.html b/pgcommitfest/commitfest/templates/activity.html
index 1d5a060f..621155ee 100644
--- a/pgcommitfest/commitfest/templates/activity.html
+++ b/pgcommitfest/commitfest/templates/activity.html
@@ -2,25 +2,25 @@
 {%load commitfest %}
 {%block contents%}
 
-<table class="table table-striped table-bordered table-hover table-condensed">
- <thead>
-  <tr>
-   <th>Time</th>
-   <th>User</th>
-   <th>Patch</th>
-   <th>Activity</th>
-  </tr>
- </thead>
- <tbody>
-{%for a in activity %}
-  <tr>
-    <td style="white-space: nowrap;">{{a.date}}</td>
-    <td>{{a.by}}</td>
-    <td><a href="/{%if commitfest%}{{commitfest.id}}{%else%}{{a.cfid}}{%endif%}/{{a.patchid}}/">{{a.name}}</a></td>
-    <td>{{a.what}}</td>
-  </tr>
-{%endfor%}
- </tbody>
-</table>
+ <table class="table table-striped table-bordered table-hover table-condensed">
+  <thead>
+   <tr>
+    <th>Time</th>
+    <th>User</th>
+    <th>Patch</th>
+    <th>Activity</th>
+   </tr>
+  </thead>
+  <tbody>
+   {%for a in activity %}
+    <tr>
+     <td style="white-space: nowrap;">{{a.date}}</td>
+     <td>{{a.by}}</td>
+     <td><a href="/{%if commitfest%}{{commitfest.id}}{%else%}{{a.cfid}}{%endif%}/{{a.patchid}}/">{{a.name}}</a></td>
+     <td>{{a.what}}</td>
+    </tr>
+   {%endfor%}
+  </tbody>
+ </table>
 
 {%endblock%}
diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index 382c43bc..4e564908 100644
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -1,48 +1,48 @@
 {%load commitfest%}
 <!DOCTYPE html>
 <html>
-<head>
+ <head>
   <title>{{title}}</title>
   <link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
   <link rel="stylesheet" href="/media/commitfest/css/bootstrap.css" />
   <link rel="stylesheet" href="/media/commitfest/css/bootstrap-theme.min.css" />
   <link rel="stylesheet" href="/media/commitfest/css/commitfest.css?{% static_file_param %}" />
   <link rel="shortcut icon" href="/media/commitfest/favicon.ico" />
-{%block extrahead%}{%endblock%}
-{%if rss_alternate%}  <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
-</head>
-<body>
-<div class="container-fluid">
-<ul class="breadcrumb">
- <li><a href="/">Home</a></li>
-{%for c in breadcrumbs%}
- <li><a href="{{c.href}}">{{c.title}}</a></li>
-{%endfor%}
- <li class="active">{{title}}</li>
- <li class="pull-right active">
-{%if user.is_authenticated%}
- Logged in as {{user}} (<a href="/account/profile/">edit profile</a> | <a href="/account/logout/">log out</a>{%if user.is_staff%} | <a href="/admin/">administration</a>{%endif%})
-{%else%}
- <a href="/account/login/?next={{request.path}}">Log in</a>
-{%endif%}
- </li>
-{%if header_activity%} <li class="pull-right active"><a href="{{header_activity_link}}">{{header_activity}}</a></li>{%endif%}
-</ul>
+  {%block extrahead%}{%endblock%}
+  {%if rss_alternate%}  <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
+ </head>
+ <body>
+  <div class="container-fluid">
+   <ul class="breadcrumb">
+    <li><a href="/">Home</a></li>
+    {%for c in breadcrumbs%}
+     <li><a href="{{c.href}}">{{c.title}}</a></li>
+    {%endfor%}
+    <li class="active">{{title}}</li>
+    <li class="pull-right active">
+     {%if user.is_authenticated%}
+      Logged in as {{user}} (<a href="/account/profile/">edit profile</a> | <a href="/account/logout/">log out</a>{%if user.is_staff%} | <a href="/admin/">administration</a>{%endif%})
+     {%else%}
+      <a href="/account/login/?next={{request.path}}">Log in</a>
+     {%endif%}
+    </li>
+    {%if header_activity%} <li class="pull-right active"><a href="{{header_activity_link}}">{{header_activity}}</a></li>{%endif%}
+   </ul>
 
-<h1>{{title}}</h1>
+   <h1>{{title}}</h1>
 
-{%if messages%}
- {%for m in messages%}
-  <div class="alert {{m.tags|alertmap}}">{{m}}</div>
- {%endfor%}
-{%endif%}
+   {%if messages%}
+    {%for m in messages%}
+     <div class="alert {{m.tags|alertmap}}">{{m}}</div>
+    {%endfor%}
+   {%endif%}
 
-{%block contents%}
-{%endblock%}
-</div>
-<script src="/media/commitfest/js/jquery.js"></script>
-<script src="/media/commitfest/js/jquery-ui.js"></script>
-<script src="/media/commitfest/js/bootstrap.js"></script>
-<script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
-{%block morescript%}{%endblock%}
-</html>
+   {%block contents%}
+   {%endblock%}
+  </div>
+  <script src="/media/commitfest/js/jquery.js"></script>
+  <script src="/media/commitfest/js/jquery-ui.js"></script>
+  <script src="/media/commitfest/js/bootstrap.js"></script>
+  <script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
+  {%block morescript%}{%endblock%}
+ </html>
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index 3bfaca85..1facd506 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -2,113 +2,113 @@
 {%load commitfest%}
 
 {%block contents%}
-<form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
-{%if form.errors%}
- <div class="alert">Please correct the errors below, and re-submit the form.</div>
-{%endif%}
-{%if form.non_field_errors%}
- <div class="alert alert-danger">{{form.non_field_errors}}</div>
-{%endif%}
-{%if note%}
-<div class="alert alert-info">{{note|safe}}</div>
-{%endif%}
- {%for field in form%}
- {%if not field.is_hidden%}
- <div class="form-group">
-   {{field|label_class:"control-label col-lg-1"}}
-   <div class="col-lg-11 controls">
-  {%if field.errors %}
-   {%for e in field.errors%}
- <div class="alert alert-danger">{{e}}</div>
-   {%endfor%}
+ <form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
+  {%if form.errors%}
+   <div class="alert">Please correct the errors below, and re-submit the form.</div>
   {%endif%}
-{%if not field.name in form.selectize_multiple_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
-{%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
- </div>
- {%else%}
-{{field}}
- {%endif%}
-{%endfor%}
- <div class="form-group">
-  <div class="col-lg-12">
-   <div class="control"><input type="submit" class="btn btn-default" value="{{savebutton|default:"Save"}}"></div>
+  {%if form.non_field_errors%}
+   <div class="alert alert-danger">{{form.non_field_errors}}</div>
+  {%endif%}
+  {%if note%}
+   <div class="alert alert-info">{{note|safe}}</div>
+  {%endif%}
+  {%for field in form%}
+   {%if not field.is_hidden%}
+    <div class="form-group">
+     {{field|label_class:"control-label col-lg-1"}}
+     <div class="col-lg-11 controls">
+      {%if field.errors %}
+       {%for e in field.errors%}
+        <div class="alert alert-danger">{{e}}</div>
+       {%endfor%}
+      {%endif%}
+      {%if not field.name in form.selectize_multiple_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
+      {%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
+    </div>
+   {%else%}
+    {{field}}
+   {%endif%}
+  {%endfor%}
+  <div class="form-group">
+   <div class="col-lg-12">
+    <div class="control"><input type="submit" class="btn btn-default" value="{{savebutton|default:"Save"}}"></div>
+   </div>
   </div>
- </div>
-</form>
+ </form>
 
-{%if threadbrowse %}
-{%include "thread_attach.inc" %}
-{%endif%}
+ {%if threadbrowse %}
+  {%include "thread_attach.inc" %}
+ {%endif%}
 
-{%if user.is_staff%}
-<div class="modal fade" id="searchUserModal" role="dialog">
-  <div class="modal-dialog modal-lg">
+ {%if user.is_staff%}
+  <div class="modal fade" id="searchUserModal" role="dialog">
+   <div class="modal-dialog modal-lg">
     <div class="modal-content">
-      <div class="modal-header">
-	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-	<h3>Search user</h3>
-      </div>
-      <div class="modal-body">
-	<form class="form-inline" style="margin-bottom: 5px;">
-	  <div class="input-append">
-	    <input id="searchUserSearchField" type="text" class="span2 search-query" autocomplete="off">
-	    <button id="searchUserSearchButton" onclick="return findUsers()" class="btn btn-default">Search</button>
-	  </div>
-	</form>
-	<div>Search for users above and then pick one in the list below:</div>
-	<div id="searchUserListWrap">
-	  <select id="searchUserList" size="6" style="width:100%;" onchange="searchUserListChanged()"></select>
-	</div>
-      </div>
-      <div class="modal-footer">
-	<a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
-	<a href="#" id="doSelectUserButton" class="btn btn-default btn-primary disabled">Add user to system</a>
+     <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+      <h3>Search user</h3>
+     </div>
+     <div class="modal-body">
+      <form class="form-inline" style="margin-bottom: 5px;">
+       <div class="input-append">
+        <input id="searchUserSearchField" type="text" class="span2 search-query" autocomplete="off">
+        <button id="searchUserSearchButton" onclick="return findUsers()" class="btn btn-default">Search</button>
+       </div>
+      </form>
+      <div>Search for users above and then pick one in the list below:</div>
+      <div id="searchUserListWrap">
+       <select id="searchUserList" size="6" style="width:100%;" onchange="searchUserListChanged()"></select>
       </div>
+     </div>
+     <div class="modal-footer">
+      <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
+      <a href="#" id="doSelectUserButton" class="btn btn-default btn-primary disabled">Add user to system</a>
+     </div>
     </div>
+   </div>
   </div>
-</div>
-{%endif%}
+ {%endif%}
 {%endblock%}
 
 {%block extrahead%}
-<link rel="stylesheet" href="/media/commitfest/css/selectize.css" />
-<link rel="stylesheet" href="/media/commitfest/css/selectize.default.css" />
+ <link rel="stylesheet" href="/media/commitfest/css/selectize.css" />
+ <link rel="stylesheet" href="/media/commitfest/css/selectize.default.css" />
 {%endblock%}
 {%block morescript%}
-<script src="/media/commitfest/js/selectize.min.js"></script>
-<script>
+ <script src="/media/commitfest/js/selectize.min.js"></script>
+ <script>
 /* Set up selectize fields */
-{% for f, url in selectize_multiple_fields %}
+  {% for f, url in selectize_multiple_fields %}
    $('#id_{{f}}').selectize({
-      plugins: ['remove_button'],
-      valueField: 'id',
-      labelField: 'value',
-      searchField: 'value',
-      load: function(query, callback) {
-         if (!query.length) return callback();
-         $.ajax({
-            'url': '{{url}}',
-            'type': 'GET',
-            'dataType': 'json',
-            'data': {
-               'query': query,
-            },
-            'error': function() { callback();},
-            'success': function(res) { callback(res.values);},
-         });
-      }
+    plugins: ['remove_button'],
+    valueField: 'id',
+    labelField: 'value',
+    searchField: 'value',
+    load: function(query, callback) {
+     if (!query.length) return callback();
+     $.ajax({
+      'url': '{{url}}',
+      'type': 'GET',
+      'dataType': 'json',
+      'data': {
+       'query': query,
+      },
+      'error': function() { callback();},
+      'success': function(res) { callback(res.values);},
+     });
+    }
    });
-{%endfor%}
-{%if user.is_staff%}
+  {%endfor%}
+  {%if user.is_staff%}
    $('.selectize-control').after(
-      $('<a href="#" class="btn btn-default btn-sm">Import user not listed</a>').click(function () {
-          search_and_store_user();
-      })
+    $('<a href="#" class="btn btn-default btn-sm">Import user not listed</a>').click(function () {
+     search_and_store_user();
+    })
    );
 
-$('#searchUserModal').on('shown.bs.modal', function() {
-	  $('#searchUserSearchField').focus();
-});
-{%endif%}
-</script>
+   $('#searchUserModal').on('shown.bs.modal', function() {
+    $('#searchUserSearchField').focus();
+   });
+  {%endif%}
+ </script>
 {%endblock%}
diff --git a/pgcommitfest/commitfest/templates/commitfest.html b/pgcommitfest/commitfest/templates/commitfest.html
index bb1e1aa8..c2e3fd7a 100644
--- a/pgcommitfest/commitfest/templates/commitfest.html
+++ b/pgcommitfest/commitfest/templates/commitfest.html
@@ -2,89 +2,89 @@
 {%load commitfest %}
 {%block contents%}
 
-<button type="button" class="btn btn-default{%if has_filter%} active{%endif%}" id="filterButton" onClick="togglePatchFilterButton('filterButton', 'collapseFilters')">Search/filter</button>
-<div class="btn-group">
+ <button type="button" class="btn btn-default{%if has_filter%} active{%endif%}" id="filterButton" onClick="togglePatchFilterButton('filterButton', 'collapseFilters')">Search/filter</button>
+ <div class="btn-group">
   <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">Shortcuts <span class="caret"></span></a>
   <ul class="dropdown-menu">
-    <li><a href="?reviewer=-2">Patches with no reviewers</a></li>
-    <li><a href="?author=-3">Patches where you are author</a></li>
-    <li><a href="?reviewer=-3">Patches where you are reviewer</a></li>
+   <li><a href="?reviewer=-2">Patches with no reviewers</a></li>
+   <li><a href="?author=-3">Patches where you are author</a></li>
+   <li><a href="?reviewer=-3">Patches where you are reviewer</a></li>
   </ul>
-</div>
-{%if cf.isopen or user.is_staff %}
-<a class="btn btn-default" href="new/">New patch</a>
-{%endif%}
-<div id="collapseFilters" class="collapse {%if has_filter%}in{%endif%}">
-    <form id="filterform" method="GET" action="." style="margin-bottom: 0px">
-      <table class="table table-condensed" style="margin-bottom: 0px">
-	<thead>
-	  <tr>
-{%for f in form%}
-         {%if not f.is_hidden%}
-            <td>{{f.label}}</td>
-	 {%else%}
-	    <td></td>
-	 {%endif%}
-{%endfor%}
+ </div>
+ {%if cf.isopen or user.is_staff %}
+  <a class="btn btn-default" href="new/">New patch</a>
+ {%endif%}
+ <div id="collapseFilters" class="collapse {%if has_filter%}in{%endif%}">
+  <form id="filterform" method="GET" action="." style="margin-bottom: 0px">
+   <table class="table table-condensed" style="margin-bottom: 0px">
+    <thead>
+     <tr>
+      {%for f in form%}
+       {%if not f.is_hidden%}
+        <td>{{f.label}}</td>
+       {%else%}
+        <td></td>
+       {%endif%}
+      {%endfor%}
 	    {%comment%} Add one extra for buttons {%endcomment%}
-	    <td></td>
-	  </tr>
-	</thead>
-	<tbody>
-	  <tr>
-{%for f in form%}
-            <td>{{f|field_class:"form-control"}}</td>
-{%endfor%}
-	    <td>
-	      <input type="submit" class="btn btn-default" value="Filter">
-	      <a class="btn btn-default" href=".">Clear</a>
-	    </td>
-	  </tr>
-	</tbody>
-      </table>
-    </form>
-</div>
+      <td></td>
+     </tr>
+    </thead>
+    <tbody>
+     <tr>
+      {%for f in form%}
+       <td>{{f|field_class:"form-control"}}</td>
+      {%endfor%}
+      <td>
+       <input type="submit" class="btn btn-default" value="Filter">
+       <a class="btn btn-default" href=".">Clear</a>
+      </td>
+     </tr>
+    </tbody>
+   </table>
+  </form>
+ </div>
 
-<p>
-<br/>
-<b>Status summary: </b>{%for id,title,num in statussummary%}<a href="?status={{id}}">{{title}}</a>: {{num}}. {%endfor%}
-</p>
+ <p>
+  <br/>
+  <b>Status summary: </b>{%for id,title,num in statussummary%}<a href="?status={{id}}">{{title}}</a>: {{num}}. {%endfor%}
+ </p>
 
-{%for p in patches %}
-{%ifchanged p.is_open%}
-{%if not forloop.first%}
- </tbody>
-</table>
-{%endif%}
-<h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
-<table class="table table-striped table-bordered table-hover table-condensed">
- <thead>
-  <tr>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(5);">Patch</a>{%if sortkey == 5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(4);">ID</a>{%if sortkey == 4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-   <th>Status</th>
-   <th>Ver</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(7);">CI status</a>{%if sortkey == 7%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -7%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(6);">Stats</a>{%if sortkey == 6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-   <th>Author</th>
-   <th>Reviewers</th>
-   <th>Committer</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(3);">Num cfs</a>{%if sortkey == 3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(1);">Latest activity</a>{%if sortkey == 1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(2);">Latest mail</a>{%if sortkey == 2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-{%if user.is_staff%}
-   <th>Select</th>
-{%endif%}
-  </tr>
- </thead>
- <tbody>
-{%endifchanged%}
+ {%for p in patches %}
+  {%ifchanged p.is_open%}
+   {%if not forloop.first%}
+    </tbody>
+    </table>
+   {%endif%}
+   <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
+   <table class="table table-striped table-bordered table-hover table-condensed">
+    <thead>
+     <tr>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(5);">Patch</a>{%if sortkey == 5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(4);">ID</a>{%if sortkey == 4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      <th>Status</th>
+      <th>Ver</th>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(7);">CI status</a>{%if sortkey == 7%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -7%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(6);">Stats</a>{%if sortkey == 6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      <th>Author</th>
+      <th>Reviewers</th>
+      <th>Committer</th>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(3);">Num cfs</a>{%if sortkey == 3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(1);">Latest activity</a>{%if sortkey == 1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      <th><a href="#" style="color:#333333;" onclick="return sortpatches(2);">Latest mail</a>{%if sortkey == 2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      {%if user.is_staff%}
+       <th>Select</th>
+      {%endif%}
+     </tr>
+    </thead>
+    <tbody>
+  {%endifchanged%}
 
-{%if grouping%}
-{%ifchanged p.topic%}
-  <tr><th colspan="{%if user.is_staff%}11{%else%}10{%endif%}">{{p.topic}}</th></tr>
-{%endifchanged%}
-{%endif%}
+  {%if grouping%}
+   {%ifchanged p.topic%}
+    <tr><th colspan="{%if user.is_staff%}11{%else%}10{%endif%}">{{p.topic}}</th></tr>
+   {%endifchanged%}
+  {%endif%}
   <tr>
    <td><a href="/patch/{{p.id}}/">{{p.name}}</a></td>
    <td>{{p.id}}</td>
@@ -92,97 +92,97 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
    <td>{%if p.targetversion%}<span class="label label-default">{{p.targetversion}}</span>{%endif%}</td>
    <td class="cfbot-summary">
     {%with p.cfbot_results as cfb%}
-    {%if not cfb %}
+     {%if not cfb %}
       <span class="label label-default">Not processed</span>
-    {%elif p.needs_rebase_since %}
-    <a href="{{cfb.apply_url}}" title="View git apply logs. Needs rebase since {{p.needs_rebase_since|timesince}}. {%if p.failing_since and p.failing_since != p.needs_rebase_since %}Failing since {{p.failing_since|timesince}}.{%endif%}">
-     <span class="label label-warning">Needs rebase!</span>
-    </a>
-    {%else%}
-    <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{p.id}}~1...cf/{{p.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-    <a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{p.id}}"
-       title="View CI history. {%if p.failing_since%}Failing since {{p.failing_since|timesince}}. {%endif%}{%if cfb.failed_task_names %}Failed jobs: {{cfb.failed_task_names}}{%endif%}">
-      {%if cfb.failed > 0 or cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' %}
-      <img src="/media/commitfest/new_failure.svg"/>
-      {%elif cfb.completed < cfb.total  %}
-      <img src="/media/commitfest/running.svg"/>
-      {%else%}
-      <img src="/media/commitfest/new_success.svg"/>
+     {%elif p.needs_rebase_since %}
+      <a href="{{cfb.apply_url}}" title="View git apply logs. Needs rebase since {{p.needs_rebase_since|timesince}}. {%if p.failing_since and p.failing_since != p.needs_rebase_since %}Failing since {{p.failing_since|timesince}}.{%endif%}">
+       <span class="label label-warning">Needs rebase!</span>
+      </a>
+     {%else%}
+      <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{p.id}}~1...cf/{{p.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
+      <a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{p.id}}"
+         title="View CI history. {%if p.failing_since%}Failing since {{p.failing_since|timesince}}. {%endif%}{%if cfb.failed_task_names %}Failed jobs: {{cfb.failed_task_names}}{%endif%}">
+       {%if cfb.failed > 0 or cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' %}
+        <img src="/media/commitfest/new_failure.svg"/>
+       {%elif cfb.completed < cfb.total  %}
+        <img src="/media/commitfest/running.svg"/>
+       {%else%}
+        <img src="/media/commitfest/new_success.svg"/>
+       {%endif%}
+       <span class="run-counters">
+        {{cfb.completed}}/{{cfb.total}}
+       </span>
+      </a>
+     {%endif%}
+     </td>
+     <td>
+      {%if cfb and cfb.all_additions is not none %}
+       <span class="additions">+{{ cfb.all_additions }}</span><span class="deletions">&#8722;{{ cfb.all_deletions }}</span>
       {%endif%}
-      <span class="run-counters">
-      {{cfb.completed}}/{{cfb.total}}
-      </span>
-    </a>
+     </td>
+    {%endwith%}
+    <td>{{p.author_names|default:''}}</td>
+    <td>{{p.reviewer_names|default:''}}</td>
+    <td>{{p.committer|default:''}}</td>
+    <td>{{p.num_cfs}}</td>
+    <td style="white-space: nowrap;">{{p.modified|date:"Y-m-d"}}<br/>{{p.modified|date:"H:i"}}</td>
+    <td style="white-space: nowrap;">{{p.lastmail|date:"Y-m-d"}}<br/>{{p.lastmail|date:"H:i"}}</td>
+    {%if user.is_staff%}
+     <td style="white-space: nowrap;"><input type="checkbox" class="sender_checkbox" id="send_authors_{{p.id}}">Author<br/><input type="checkbox" class="sender_checkbox" id="send_reviewers_{{p.id}}">Reviewer</td>
     {%endif%}
-   </td>
-   <td>
-    {%if cfb and cfb.all_additions is not none %}
-    <span class="additions">+{{ cfb.all_additions }}</span><span class="deletions">&#8722;{{ cfb.all_deletions }}</span>
-    {%endif%}
-   </td>
-   {%endwith%}
-   <td>{{p.author_names|default:''}}</td>
-   <td>{{p.reviewer_names|default:''}}</td>
-   <td>{{p.committer|default:''}}</td>
-   <td>{{p.num_cfs}}</td>
-   <td style="white-space: nowrap;">{{p.modified|date:"Y-m-d"}}<br/>{{p.modified|date:"H:i"}}</td>
-   <td style="white-space: nowrap;">{{p.lastmail|date:"Y-m-d"}}<br/>{{p.lastmail|date:"H:i"}}</td>
-{%if user.is_staff%}
-   <td style="white-space: nowrap;"><input type="checkbox" class="sender_checkbox" id="send_authors_{{p.id}}">Author<br/><input type="checkbox" class="sender_checkbox" id="send_reviewers_{{p.id}}">Reviewer</td>
-{%endif%}
-  </tr>
-{%if forloop.last%}
- </tbody>
-</table>
-{%endif%}
-{%endfor%}
+   </tr>
+   {%if forloop.last%}
+    </tbody>
+    </table>
+   {%endif%}
+ {%endfor%}
 
-<div>
-{%if cf.isopen or user.is_staff %}
-<a class="btn btn-default" href="new/">New patch</a>
-{%endif%}
-{%if user.is_staff%}
- <div class="btn-group dropup">
-  <button type="button" class="btn btn-default dropdown-toggle " data-toggle="dropdown" href="#">Send private mail <span class="caret"></span></button>
-  <ul class="dropdown-menu">
-    <li><a href="javascript:send_selected()">Selected</a></li>
-    <li><a href="send_email/?reviewers={{openpatchids|join:","}}">All reviewers (open patches)</a></li>
-    <li><a href="send_email/?authors={{openpatchids|join:","}}">All authors (open patches)</a></li>
-    <li><a href="send_email/?authors={{openpatchids|join:","}}&reviewers={{openpatchids|join:","}}">All authors and reviewers (open patches)</a></li>
-  </ul>
- </div>
+ <div>
+  {%if cf.isopen or user.is_staff %}
+   <a class="btn btn-default" href="new/">New patch</a>
+  {%endif%}
+  {%if user.is_staff%}
+   <div class="btn-group dropup">
+    <button type="button" class="btn btn-default dropdown-toggle " data-toggle="dropdown" href="#">Send private mail <span class="caret"></span></button>
+    <ul class="dropdown-menu">
+     <li><a href="javascript:send_selected()">Selected</a></li>
+     <li><a href="send_email/?reviewers={{openpatchids|join:","}}">All reviewers (open patches)</a></li>
+     <li><a href="send_email/?authors={{openpatchids|join:","}}">All authors (open patches)</a></li>
+     <li><a href="send_email/?authors={{openpatchids|join:","}}&reviewers={{openpatchids|join:","}}">All authors and reviewers (open patches)</a></li>
+    </ul>
+   </div>
 
- <div class="btn-group dropup">
-   <button type="button" class="btn btn-default dropdown-toggle " data-toggle="dropdown" href="#">Reports <span class="caret"></span></button>
-   <ul class="dropdown-menu">
+   <div class="btn-group dropup">
+    <button type="button" class="btn btn-default dropdown-toggle " data-toggle="dropdown" href="#">Reports <span class="caret"></span></button>
+    <ul class="dropdown-menu">
      <li><a href="reports/authorstats/">Author stats</a></li>
-   </ul>
+    </ul>
+   </div>
+  {%endif%}
  </div>
-{%endif%}
-</div>
 {%endblock%}
 
 {%block morescript%}
-<script>
-{%if user.is_staff%}
+ <script>
+  {%if user.is_staff%}
    function send_selected() {
-      var authors = [];
-      var reviewers = [];
-      $('input.sender_checkbox').each(function(index, el) {
-         if (el.checked) {
-            if (el.id.indexOf('send_authors_') == 0) {
-               authors.push(el.id.substring(13));
-            } else {
-               reviewers.push(el.id.substring(15));
-            }
-         }
-      });
-      if (authors.length==0 && reviewers.length==0) {
-         alert('Nothing to send.');
-         return;
+    var authors = [];
+    var reviewers = [];
+    $('input.sender_checkbox').each(function(index, el) {
+     if (el.checked) {
+      if (el.id.indexOf('send_authors_') == 0) {
+       authors.push(el.id.substring(13));
+      } else {
+       reviewers.push(el.id.substring(15));
       }
-      document.location.href = 'send_email/?authors=' + authors.join(',') + '&reviewers=' + reviewers.join(',');
+     }
+    });
+    if (authors.length==0 && reviewers.length==0) {
+     alert('Nothing to send.');
+     return;
+    }
+    document.location.href = 'send_email/?authors=' + authors.join(',') + '&reviewers=' + reviewers.join(',');
    }
-{%endif%}
-</script>
+  {%endif%}
+ </script>
 {%endblock%}
diff --git a/pgcommitfest/commitfest/templates/home.html b/pgcommitfest/commitfest/templates/home.html
index 3edd8b96..b0bbf909 100644
--- a/pgcommitfest/commitfest/templates/home.html
+++ b/pgcommitfest/commitfest/templates/home.html
@@ -1,31 +1,31 @@
 {%extends "base.html"%}
 {%block contents%}
-<p>
-{%if inprogresscf%}A commitfest is currently in progress: <a href="/{{inprogresscf.id}}/">{{inprogresscf}}</a>.{%endif%}
-</p>
-<p>
-Useful links that you can use and bookmark:
-</p>
-<ul>
+ <p>
+  {%if inprogresscf%}A commitfest is currently in progress: <a href="/{{inprogresscf.id}}/">{{inprogresscf}}</a>.{%endif%}
+ </p>
+ <p>
+  Useful links that you can use and bookmark:
+ </p>
+ <ul>
   <li><a href="/current/">All patches in the current commitfest</a></li>
   <li><a href="/open/">All patches in the open commitfest</a></li>
   <li><a href="/open/new/">Create a new commitfest entry</a></li>
   <li><a href="/current/?author=-3">Your entries in the current commitfest</a></li>
   <li><a href="/open/?author=-3">Your entries in the open commitfest</a></li>
   <li><a href="/current/?reviewer=-3">Entries that you are reviewing in current commitfest</a></li>
-</ul>
-<h3>Commands</h3>
-<form method="GET" action="/search/" class="form-inline">
+ </ul>
+ <h3>Commands</h3>
+ <form method="GET" action="/search/" class="form-inline">
   <div class="form-group">
-    <input type="text" class="form-control" id="searchterm" name="searchterm" placeholder="Global search">
+   <input type="text" class="form-control" id="searchterm" name="searchterm" placeholder="Global search">
   </div>
   <button type="submit" class="btn btn-default">Search</button>
-</form>
-<h3>List of commitfests</h3>
-<ul>
-{%for c in commitfests%}
- <li><a href="/{{c.id}}/">{{c}}</a> ({{c.statusstring}}{%if c.startdate%} - {{c.periodstring}}{%endif%})</li>
-{%endfor%}
-</ul>
-<br/>
+ </form>
+ <h3>List of commitfests</h3>
+ <ul>
+  {%for c in commitfests%}
+   <li><a href="/{{c.id}}/">{{c}}</a> ({{c.statusstring}}{%if c.startdate%} - {{c.periodstring}}{%endif%})</li>
+  {%endfor%}
+ </ul>
+ <br/>
 {%endblock%}
diff --git a/pgcommitfest/commitfest/templates/patch.html b/pgcommitfest/commitfest/templates/patch.html
index 971c9381..7096af23 100644
--- a/pgcommitfest/commitfest/templates/patch.html
+++ b/pgcommitfest/commitfest/templates/patch.html
@@ -1,280 +1,280 @@
 {%extends "base.html"%}
 {%load commitfest%}
 {%block contents%}
-{%include "patch_commands.inc"%}
-<table class="table table-bordered">
+ {%include "patch_commands.inc"%}
+ <table class="table table-bordered">
   <tbody>
-    <tr>
-      <th>ID</th>
-      <td><a href="/patch/{{patch.id}}">{{patch.id}}</a></td>
-    </tr>
-    <tr>
-      <th>Title</th>
-      <td>{{patch.name}}</td>
-    </tr>
-    <tr>
-      <th>CI (CFBot)</th>
-      <td>
-        {%if not cfbot_branch %}
-        <span class="label label-default">Not processed</span></a>
-        {%elif cfbot_branch.needs_rebase_since %}
-          <a href="{{cfbot_branch.apply_url}}">
-          <span class="label label-warning" title="View git apply logs">Needs rebase!</span></a>
-          Needs rebase since {{cfbot_branch.needs_rebase_since|timesince}}. {%if cfbot_branch.failing_since and cfbot_branch.failing_since != cfbot_branch.needs_rebase_since %}Failing since {{cfbot_branch.failing_since|timesince}}. {%endif%}<br>Additional links previous successfully applied patch (outdated):<br>
-          <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{patch.id}}~1...cf/{{patch.id}}" title="View previous successfully applied patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-          <a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{patch.id}}">
-          <span class="label label-default">Summary</span></a>
-        {%else%}
-        <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{patch.id}}~1...cf/{{patch.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-        <a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{patch.id}}">
-        <span class="label label-default">Summary</span></a>
-        {%for c in cfbot_tasks %}
-            {%if c.status == 'COMPLETED'%}
-            <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_success.svg"/></a>
-            {%elif c.status == 'CREATED' or c.status == 'SCHEDULED' %}
-            <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/waiting_to_start.svg"/></a>
-            {%elif c.status == 'EXECUTING' %}
-            <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/running.svg"/></a>
-            {%else %}
-            <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_failure.svg"/></a>
-            {%endif%}
-        {%endfor%}
-        {%endif%}
-        {%if cfbot_branch %}
-        <button class="btn btn-default" title="This adds the following to your clipboard (needs to be run in an existing git repo):
-git remote add commitfest https://github.com/postgresql-cfbot/postgresql.git
-git fetch commitfest cf/{{patch.id}}
-git checkout commitfest/cf/{{patch.id}}" onclick="addGitCheckoutToClipboard({{patch.id}})">Copy git checkout commands</button>
-        {%endif%}
-        </a>
-      </td>
-    </tr>
-    <tr>
-     <th>Stats (from CFBot)</th>
-     <td>
-      {%if cfbot_branch and cfbot_branch.commit_id %}
-      {%if cfbot_branch.version %}
+   <tr>
+    <th>ID</th>
+    <td><a href="/patch/{{patch.id}}">{{patch.id}}</a></td>
+   </tr>
+   <tr>
+    <th>Title</th>
+    <td>{{patch.name}}</td>
+   </tr>
+   <tr>
+    <th>CI (CFBot)</th>
+    <td>
+     {%if not cfbot_branch %}
+      <span class="label label-default">Not processed</span></a>
+     {%elif cfbot_branch.needs_rebase_since %}
+      <a href="{{cfbot_branch.apply_url}}">
+       <span class="label label-warning" title="View git apply logs">Needs rebase!</span></a>
+      Needs rebase since {{cfbot_branch.needs_rebase_since|timesince}}. {%if cfbot_branch.failing_since and cfbot_branch.failing_since != cfbot_branch.needs_rebase_since %}Failing since {{cfbot_branch.failing_since|timesince}}. {%endif%}<br>Additional links previous successfully applied patch (outdated):<br>
+      <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{patch.id}}~1...cf/{{patch.id}}" title="View previous successfully applied patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
+      <a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{patch.id}}">
+       <span class="label label-default">Summary</span></a>
+     {%else%}
+      <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{patch.id}}~1...cf/{{patch.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
+      <a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{patch.id}}">
+       <span class="label label-default">Summary</span></a>
+      {%for c in cfbot_tasks %}
+       {%if c.status == 'COMPLETED'%}
+        <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_success.svg"/></a>
+       {%elif c.status == 'CREATED' or c.status == 'SCHEDULED' %}
+        <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/waiting_to_start.svg"/></a>
+       {%elif c.status == 'EXECUTING' %}
+        <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/running.svg"/></a>
+       {%else %}
+        <a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_failure.svg"/></a>
+       {%endif%}
+      {%endfor%}
+     {%endif%}
+     {%if cfbot_branch %}
+      <button class="btn btn-default" title="This adds the following to your clipboard (needs to be run in an existing git repo):
+                                             git remote add commitfest https://github.com/postgresql-cfbot/postgresql.git
+                                             git fetch commitfest cf/{{patch.id}}
+                                             git checkout commitfest/cf/{{patch.id}}" onclick="addGitCheckoutToClipboard({{patch.id}})">Copy git checkout commands</button>
+     {%endif%}
+    </a>
+   </td>
+  </tr>
+  <tr>
+   <th>Stats (from CFBot)</th>
+   <td>
+    {%if cfbot_branch and cfbot_branch.commit_id %}
+     {%if cfbot_branch.version %}
       Patch version: {{ cfbot_branch.version }},
-      {%endif%}
-      Patch count: {{ cfbot_branch.patch_count }},
-      First patch: <span class="additions">+{{ cfbot_branch.first_additions }}</span><span class="deletions">&#8722;{{ cfbot_branch.first_deletions }}</span>,
-      All patches: <span class="additions">+{{ cfbot_branch.all_additions }}</span><span class="deletions">&#8722;{{ cfbot_branch.all_deletions }}</span>
-      {%else%}
-      Unknown
-      {%endif%}
-    </tr>
-    <tr>
-      <th>Topic</th>
-      <td>{{patch.topic}}</td>
-    </tr>
-    <tr>
-      <th>Created</th>
-      <td>{{patch.created}}</td>
-    </tr>
-    <tr>
-      <th style="white-space: nowrap;">Last modified</th>
-      <td>{{patch.modified}} ({{patch.modified|timesince}} ago)</td>
-    </tr>
-    <tr>
-      <th style="white-space: nowrap;">Latest email</th>
-      <td>{%if patch.lastmail%}{{patch.lastmail}} ({{patch.lastmail|timesince}} ago){%endif%}</td>
-    </tr>
-    <tr>
-      <th>Status</th>
-      <td>{%for c in patch_commitfests %}
-	<div style="margin-bottom: 3px;"><a href="/{{c.commitfest.id}}/">{{c.commitfest}}</a>: <span class="label label-{{c.status|patchstatuslabel}}">{{c.statusstring}}</span></div>
-	{%endfor%}
-      </td>
-    </tr>
-    <tr>
-      <th>Target version</th>
-      <td>{%if patch.targetversion%}<span class="label label-default">{{patch.targetversion}}</span>{%endif%}</td>
-    </tr>
-    <tr>
-      <th>Authors</th>
-      <td>{{patch.authors_string}}</td>
-    </tr>
-    <tr>
-      <th>Reviewers</th>
-      <td>{{patch.reviewers_string}}<a href="reviewer/{{is_reviewer|yesno:"remove,become"}}/" class="btn btn-default pull-right">{{is_reviewer|yesno:"Remove from reviewers,Become reviewer"}}</a></td>
-    </tr>
-    <tr>
-      <th>Committer</th>
-      <td>{%if patch.committer%}{{patch.committer.fullname}}{%endif%}
-{%if is_committer%}<a href="committer/{{is_this_committer|yesno:"remove,become"}}/" class="btn btn-default pull-right">{{is_this_committer|yesno:"Unclaim as committer,Claim as committer"}}</a>{%endif%}
-      </td>
-    </tr>
-    <tr>
-      <th>Links</th>
-      {%if patch.wikilink%}
-      <a href="{{patch.wikilink}}">Wiki</a>{%endif%}{%if patch.gitlink%}
+     {%endif%}
+     Patch count: {{ cfbot_branch.patch_count }},
+     First patch: <span class="additions">+{{ cfbot_branch.first_additions }}</span><span class="deletions">&#8722;{{ cfbot_branch.first_deletions }}</span>,
+     All patches: <span class="additions">+{{ cfbot_branch.all_additions }}</span><span class="deletions">&#8722;{{ cfbot_branch.all_deletions }}</span>
+    {%else%}
+     Unknown
+    {%endif%}
+   </tr>
+   <tr>
+    <th>Topic</th>
+    <td>{{patch.topic}}</td>
+   </tr>
+   <tr>
+    <th>Created</th>
+    <td>{{patch.created}}</td>
+   </tr>
+   <tr>
+    <th style="white-space: nowrap;">Last modified</th>
+    <td>{{patch.modified}} ({{patch.modified|timesince}} ago)</td>
+   </tr>
+   <tr>
+    <th style="white-space: nowrap;">Latest email</th>
+    <td>{%if patch.lastmail%}{{patch.lastmail}} ({{patch.lastmail|timesince}} ago){%endif%}</td>
+   </tr>
+   <tr>
+    <th>Status</th>
+    <td>{%for c in patch_commitfests %}
+     <div style="margin-bottom: 3px;"><a href="/{{c.commitfest.id}}/">{{c.commitfest}}</a>: <span class="label label-{{c.status|patchstatuslabel}}">{{c.statusstring}}</span></div>
+    {%endfor%}
+    </td>
+   </tr>
+   <tr>
+    <th>Target version</th>
+    <td>{%if patch.targetversion%}<span class="label label-default">{{patch.targetversion}}</span>{%endif%}</td>
+   </tr>
+   <tr>
+    <th>Authors</th>
+    <td>{{patch.authors_string}}</td>
+   </tr>
+   <tr>
+    <th>Reviewers</th>
+    <td>{{patch.reviewers_string}}<a href="reviewer/{{is_reviewer|yesno:"remove,become"}}/" class="btn btn-default pull-right">{{is_reviewer|yesno:"Remove from reviewers,Become reviewer"}}</a></td>
+   </tr>
+   <tr>
+    <th>Committer</th>
+    <td>{%if patch.committer%}{{patch.committer.fullname}}{%endif%}
+     {%if is_committer%}<a href="committer/{{is_this_committer|yesno:"remove,become"}}/" class="btn btn-default pull-right">{{is_this_committer|yesno:"Unclaim as committer,Claim as committer"}}</a>{%endif%}
+    </td>
+   </tr>
+   <tr>
+    <th>Links</th>
+    {%if patch.wikilink%}
+     <a href="{{patch.wikilink}}">Wiki</a>{%endif%}{%if patch.gitlink%}
       <a href="{{patch.gitlink}}">Git</a>
-      {%endif%}</td>
-    </tr>
-    <tr>
-      <th>Emails</th>
-      <td>
-{%if user.is_authenticated%}
-	<div style="float:right"><button class="btn btn-default" onclick="attachThread({{cf.id}},{{patch.id}})">Attach thread</button></div>
-{%else%}
-	<div style="float:right"><button class="btn btn-default" onclick="location.href='/account/login/?next=/{{cf.id}}/{{patch.id}}/%3Fattachthreadnow'">Attach thread</button></div>
-{%endif%}
-	<dl>
-	{%for t in patch.mailthread_set.all%}
-	 <dt><a href="https://www.postgresql.org/message-id/flat/{{t.messageid}}">{{t.subject}}</a> <button type="button" class="close close-nofloat" title="Detach this thread" onclick="detachThread({{cf.id}},{{patch.id}},'{{t.messageid}}')">&times;</button></dt>
-	 <dd>
-	  First at <a href="https://www.postgresql.org/message-id/{{t.messageid}}">{{t.firstmessage}}</a> by {{t.firstauthor|hidemail}}<br/>
-	  Latest at <a href="https://www.postgresql.org/message-id/{{t.latestmsgid}}">{{t.latestmessage}}</a> by {{t.latestauthor|hidemail}}<br/>
-	  {%for ta in t.mailthreadattachment_set.all%}
-	  {%if forloop.first%}
-	  Latest attachment (<a href="https://www.postgresql.org/message-id/attachment/{{ta.attachmentid}}/{{ta.filename}}">{{ta.filename}}</a>) at <a href="https://www.postgresql.org/message-id/{{ta.messageid}}">{{ta.date}}</a> from {{ta.author|hidemail}} <button type="button" class="btn btn-default btn-xs" data-toggle="collapse" data-target="#att{{t.pk}}" title="Show all attachments"><i class="glyphicon glyphicon-plus"></i></button>
-           <div id="att{{t.pk}}" class="collapse">
-          {%endif%}
-           &nbsp;&nbsp;&nbsp;&nbsp;Attachment (<a href="https://www.postgresql.org/message-id/attachment/{{ta.attachmentid}}/{{ta.filename}}">{{ta.filename}}</a>) at <a href="https://www.postgresql.org/message-id/{{ta.messageid}}">{{ta.date}}</a> from {{ta.author|hidemail}} (Patch: {{ta.ispatch|yesno:"Yes,No,Pending check"}})<br/>
-          {%if forloop.last%}</div>{%endif%}
-	  {%endfor%}
-	   <div>
-	     {%for a in t.mailthreadannotation_set.all%}
-	     {%if forloop.first%}
-	     <h4>Annotations</h4>
-	     <table class="table table-bordered table-striped table-condensed small">
-	       <thead>
-		 <tr>
-		   <th>When</th>
-		   <th>Who</th>
-		   <th>Mail</th>
-		   <th>Annotation</th>
-		 </tr>
-	       </thead>
-	       <tbody>
-	     {%endif%}
-	         <tr>
-		   <td>{{a.date}}</td>
-		   <td style="white-space: nowrap">{{a.user_string}}</td>
-		   <td style="white-space: nowrap">From {{a.mailauthor}}<br/>at <a href="https://www.postgresql.org/message-id/{{a.msgid}}">{{a.maildate}}</a></td>
-		   <td width="99%">{{a.annotationtext}} <button type="button" class="close" title="Delete this annotation" onclick="deleteAnnotation({{a.id}})">&times;</button></td>
-		 </tr>
-	     {%if forloop.last%}
-               </body>
-             </table>
-             {%endif%}
-	     {%endfor%}
-	     {%if user.is_authenticated%}<button class="btn btn-xs btn-default" onclick="addAnnotation({{t.id}})">Add annotation</button>{%endif%}
-	   </div>
-	 </dd>
-	{%endfor%}
-	</dl>
-      </td>
-    </tr>
-    <tr>
-      <th>History</th>
-      <td>
-	<div style="max-height: 200px; overflow-y: scroll;">
-	<table class="table table-bordered table-striped table-condensed">
-	  <thead>
-	    <tr>
-	      <th>When</th>
-	      <th>Who</th>
-	      <th>What</th>
-	    </tr>
-	  </thead>
-	  <tbody>
-	    {%for h in patch.history %}
-	    <tr>
-	      <td style="white-space: nowrap;">{{h.date}}</td>
-	      <td style="white-space: nowrap;">{{h.by_string}}</td>
-	      <td width="99%">{{h.what}}</td>
-	    </tr>
-	    {%endfor%}
-	  </tbody>
-	</table>
-	</div>
-	{%if user.is_authenticated%}
-	<a href="{{is_subscribed|yesno:"unsubscribe,subscribe"}}/" class="btn btn-default">{{is_subscribed|yesno:"Unsubscribe from patch update emails,Subscribe to patch update emails"}}</a>
-	{%endif%}
-      </td>
-    </tr>
-  </tbody>
-</table>
+     {%endif%}</td>
+  </tr>
+  <tr>
+   <th>Emails</th>
+   <td>
+    {%if user.is_authenticated%}
+     <div style="float:right"><button class="btn btn-default" onclick="attachThread({{cf.id}},{{patch.id}})">Attach thread</button></div>
+    {%else%}
+     <div style="float:right"><button class="btn btn-default" onclick="location.href='/account/login/?next=/{{cf.id}}/{{patch.id}}/%3Fattachthreadnow'">Attach thread</button></div>
+    {%endif%}
+    <dl>
+     {%for t in patch.mailthread_set.all%}
+      <dt><a href="https://www.postgresql.org/message-id/flat/{{t.messageid}}">{{t.subject}}</a> <button type="button" class="close close-nofloat" title="Detach this thread" onclick="detachThread({{cf.id}},{{patch.id}},'{{t.messageid}}')">&times;</button></dt>
+      <dd>
+       First at <a href="https://www.postgresql.org/message-id/{{t.messageid}}">{{t.firstmessage}}</a> by {{t.firstauthor|hidemail}}<br/>
+       Latest at <a href="https://www.postgresql.org/message-id/{{t.latestmsgid}}">{{t.latestmessage}}</a> by {{t.latestauthor|hidemail}}<br/>
+       {%for ta in t.mailthreadattachment_set.all%}
+        {%if forloop.first%}
+         Latest attachment (<a href="https://www.postgresql.org/message-id/attachment/{{ta.attachmentid}}/{{ta.filename}}">{{ta.filename}}</a>) at <a href="https://www.postgresql.org/message-id/{{ta.messageid}}">{{ta.date}}</a> from {{ta.author|hidemail}} <button type="button" class="btn btn-default btn-xs" data-toggle="collapse" data-target="#att{{t.pk}}" title="Show all attachments"><i class="glyphicon glyphicon-plus"></i></button>
+         <div id="att{{t.pk}}" class="collapse">
+        {%endif%}
+        &nbsp;&nbsp;&nbsp;&nbsp;Attachment (<a href="https://www.postgresql.org/message-id/attachment/{{ta.attachmentid}}/{{ta.filename}}">{{ta.filename}}</a>) at <a href="https://www.postgresql.org/message-id/{{ta.messageid}}">{{ta.date}}</a> from {{ta.author|hidemail}} (Patch: {{ta.ispatch|yesno:"Yes,No,Pending check"}})<br/>
+        {%if forloop.last%}</div>{%endif%}
+       {%endfor%}
+       <div>
+        {%for a in t.mailthreadannotation_set.all%}
+         {%if forloop.first%}
+          <h4>Annotations</h4>
+          <table class="table table-bordered table-striped table-condensed small">
+           <thead>
+            <tr>
+             <th>When</th>
+             <th>Who</th>
+             <th>Mail</th>
+             <th>Annotation</th>
+            </tr>
+           </thead>
+           <tbody>
+         {%endif%}
+         <tr>
+          <td>{{a.date}}</td>
+          <td style="white-space: nowrap">{{a.user_string}}</td>
+          <td style="white-space: nowrap">From {{a.mailauthor}}<br/>at <a href="https://www.postgresql.org/message-id/{{a.msgid}}">{{a.maildate}}</a></td>
+          <td width="99%">{{a.annotationtext}} <button type="button" class="close" title="Delete this annotation" onclick="deleteAnnotation({{a.id}})">&times;</button></td>
+         </tr>
+         {%if forloop.last%}
+          </body>
+          </table>
+         {%endif%}
+        {%endfor%}
+        {%if user.is_authenticated%}<button class="btn btn-xs btn-default" onclick="addAnnotation({{t.id}})">Add annotation</button>{%endif%}
+       </div>
+      </dd>
+     {%endfor%}
+    </dl>
+   </td>
+  </tr>
+  <tr>
+   <th>History</th>
+   <td>
+    <div style="max-height: 200px; overflow-y: scroll;">
+     <table class="table table-bordered table-striped table-condensed">
+      <thead>
+       <tr>
+        <th>When</th>
+        <th>Who</th>
+        <th>What</th>
+       </tr>
+      </thead>
+      <tbody>
+       {%for h in patch.history %}
+        <tr>
+         <td style="white-space: nowrap;">{{h.date}}</td>
+         <td style="white-space: nowrap;">{{h.by_string}}</td>
+         <td width="99%">{{h.what}}</td>
+        </tr>
+       {%endfor%}
+      </tbody>
+     </table>
+    </div>
+    {%if user.is_authenticated%}
+     <a href="{{is_subscribed|yesno:"unsubscribe,subscribe"}}/" class="btn btn-default">{{is_subscribed|yesno:"Unsubscribe from patch update emails,Subscribe to patch update emails"}}</a>
+    {%endif%}
+   </td>
+  </tr>
+ </tbody>
+ </table>
 
-<div class="dropup" >
-{%include "patch_commands.inc"%}
-</div>
+ <div class="dropup" >
+  {%include "patch_commands.inc"%}
+ </div>
 
 {%comment%}commit dialog{%endcomment%}
-<div class="modal fade" id="commitModal" role="dialog">
- <div class="modal-dialog modal-lg">
+ <div class="modal fade" id="commitModal" role="dialog">
+  <div class="modal-dialog modal-lg">
    <div class="modal-content">
-     <div class="modal-header">
-       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-       <h3>Flag as committed</h3>
-     </div>
-     <div class="modal-body">
-       <form class="form" style="margin-bottom: 5px;">
-	 <div class="form-group">
-	   <label for="committerlist">Committer</label>
-	   <select id="committerSelect" class="form-control">
-	     <option value="" style="display:none;"></option>
-	     {%for c in committers%}
-	     <option value="{{c.user.username}}">{{c.user.first_name}} {{c.user.last_name}}</option>
-	     {%endfor%}
-	   </select>
-	 </div>
-       </form>
-     </div>
-     <div class="modal-footer">
-       <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
-       <a href="#" class="btn btn-default btn-primary" id="doCommitButton">Flag as committed</a>
-     </div>
+    <div class="modal-header">
+     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+     <h3>Flag as committed</h3>
+    </div>
+    <div class="modal-body">
+     <form class="form" style="margin-bottom: 5px;">
+      <div class="form-group">
+       <label for="committerlist">Committer</label>
+       <select id="committerSelect" class="form-control">
+        <option value="" style="display:none;"></option>
+        {%for c in committers%}
+         <option value="{{c.user.username}}">{{c.user.first_name}} {{c.user.last_name}}</option>
+        {%endfor%}
+       </select>
+      </div>
+     </form>
+    </div>
+    <div class="modal-footer">
+     <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
+     <a href="#" class="btn btn-default btn-primary" id="doCommitButton">Flag as committed</a>
+    </div>
    </div>
+  </div>
  </div>
-</div>
 
-{%include "thread_attach.inc"%}
+ {%include "thread_attach.inc"%}
 {%comment%}Modal dialog for adding annotation{%endcomment%}
-<div class="modal fade" id="annotateModal" role="dialog">
- <div class="modal-dialog modal-lg"><div class="modal-content">
-  <div class="modal-header">
-   <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-   <h3>Add annotation</h3>
-  </div>
-  <div id="annotateMessageBody" class="modal-body">
-   <div>Pick one of the messages in this thread</div>
-   <div id="annotateListWrap">
-    <select id="annotateMessageList" style="width:100%;" onChange="annotateMsgPicked()">
-    </select>
+ <div class="modal fade" id="annotateModal" role="dialog">
+  <div class="modal-dialog modal-lg"><div class="modal-content">
+   <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>Add annotation</h3>
    </div>
-   <div>Or copy/paste the message-id:</div>
-   <div id="annotateMsgidWrap">
+   <div id="annotateMessageBody" class="modal-body">
+    <div>Pick one of the messages in this thread</div>
+    <div id="annotateListWrap">
+     <select id="annotateMessageList" style="width:100%;" onChange="annotateMsgPicked()">
+     </select>
+    </div>
+    <div>Or copy/paste the message-id:</div>
+    <div id="annotateMsgidWrap">
      <input id="annotateMsgId" type="text" style="width:100%" onKeyUp="annotateChanged()">
-   </div>
-   <div><br/></div>
-   <div>Enter a message for the annotation</div>
-   <div id="annotateTextWrap">
+    </div>
+    <div><br/></div>
+    <div>Enter a message for the annotation</div>
+    <div id="annotateTextWrap">
      <input id="annotateMessage" type="text" style="width:100%" onKeyUp="annotateChanged()">
+    </div>
    </div>
-  </div>
-  <div class="modal-footer">
-   <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
-   <a href="#" id="doAnnotateMessageButton" class="btn btn-default btn-primary disabled">Add annotation</a>
-  </div>
- </div></div>
-</div>
+   <div class="modal-footer">
+    <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
+    <a href="#" id="doAnnotateMessageButton" class="btn btn-default btn-primary disabled">Add annotation</a>
+   </div>
+  </div></div>
+ </div>
 {%endblock%}
 
 {%block morescript%}
-<script>
-$(document).ready(function() {
+ <script>
+  $(document).ready(function() {
    $('button.close-nofloat').each(function(i,o) {
-      $(o).tooltip();
+    $(o).tooltip();
    });
-});
-{%if attachnow%}
-$(document).ready(function() {
-   attachThread({{cf.id}},{{patch.id}}, function() {
-      document.location.replace('/{{cf.id}}/{{patch.id}}/');
+  });
+  {%if attachnow%}
+   $(document).ready(function() {
+    attachThread({{cf.id}},{{patch.id}}, function() {
+     document.location.replace('/{{cf.id}}/{{patch.id}}/');
+    });
    });
-});
-{%endif%}
-</script>
+  {%endif%}
+ </script>
 {%endblock%}
diff --git a/pgcommitfest/commitfest/templates/patchsearch.html b/pgcommitfest/commitfest/templates/patchsearch.html
index c7e05026..d73e8751 100644
--- a/pgcommitfest/commitfest/templates/patchsearch.html
+++ b/pgcommitfest/commitfest/templates/patchsearch.html
@@ -2,34 +2,34 @@
 {%load commitfest %}
 {%block contents%}
 
-<form method="GET" action="/search/" class="form-inline" style="margin-bottom: 10px">
+ <form method="GET" action="/search/" class="form-inline" style="margin-bottom: 10px">
   <div class="form-group">
-    <input type="text" class="form-control" id="searchterm" name="searchterm" placeholder="Global search">
+   <input type="text" class="form-control" id="searchterm" name="searchterm" placeholder="Global search">
   </div>
   <button type="submit" class="btn btn-default">Search</button>
-</form>
+ </form>
 
-<table class="table table-striped table-bordered table-hover table-condensed">
- <thead>
-  <tr>
-   <th>Patch</th>
-   <th>Status</th>
-   <th>Author</th>
-  </tr>
- </thead>
- <tbody>
-{%for p in patches %}
- {%with p.patchoncommitfest_set.all as cfs %}
-  <tr>
-   <td>{%with cfs|first as firstcf%}<a href="/{{firstcf.commitfest_id}}/{{p.id}}/">{{p}}</a>{%endwith%}</td>
-   <td>{%for c in cfs %}
-	<div style="margin-bottom: 3px;">{{c.commitfest}}: <span class="label label-default">{{c.statusstring}}</span></div>
-	{%endfor%}</td>
-   <td>{{p.authors_string|default:''}}</td>
-  </tr>
- {%endwith%}
-{%endfor%}
- </tbody>
-</table>
+ <table class="table table-striped table-bordered table-hover table-condensed">
+  <thead>
+   <tr>
+    <th>Patch</th>
+    <th>Status</th>
+    <th>Author</th>
+   </tr>
+  </thead>
+  <tbody>
+   {%for p in patches %}
+    {%with p.patchoncommitfest_set.all as cfs %}
+     <tr>
+      <td>{%with cfs|first as firstcf%}<a href="/{{firstcf.commitfest_id}}/{{p.id}}/">{{p}}</a>{%endwith%}</td>
+      <td>{%for c in cfs %}
+       <div style="margin-bottom: 3px;">{{c.commitfest}}: <span class="label label-default">{{c.statusstring}}</span></div>
+      {%endfor%}</td>
+      <td>{{p.authors_string|default:''}}</td>
+     </tr>
+    {%endwith%}
+   {%endfor%}
+  </tbody>
+ </table>
 
 {%endblock%}
diff --git a/pgcommitfest/commitfest/templates/report_authors.html b/pgcommitfest/commitfest/templates/report_authors.html
index 624e822b..115f639d 100644
--- a/pgcommitfest/commitfest/templates/report_authors.html
+++ b/pgcommitfest/commitfest/templates/report_authors.html
@@ -2,36 +2,36 @@
 {%load commitfest %}
 {%block contents%}
 
-<table class="table table-striped table-bordered table-hover table-condensed">
- <thead>
+ <table class="table table-striped table-bordered table-hover table-condensed">
+  <thead>
    <tr>
-     <th>User</th>
-     <th>Author of</th>
-     <th>Reviewer of</th>
+    <th>User</th>
+    <th>Author of</th>
+    <th>Reviewer of</th>
    </tr>
- </thead>
- <tbody>
+  </thead>
+  <tbody>
    {%for user, authorlist, reviewlist in report %}
-   <tr>
+    <tr>
      <td>{{user}}</td>
      <td>
-       <ul>
-	 {%for a in authorlist%}
-	 <li><a href="../../{{a.0}}/">{{a.1}}</a></li>
-	 {%endfor%}
-       </ul>
+      <ul>
+       {%for a in authorlist%}
+        <li><a href="../../{{a.0}}/">{{a.1}}</a></li>
+       {%endfor%}
+      </ul>
      </td>
      <td>
-       <ul>
-	 {%for r in reviewlist%}
-	 <li><a href="../../{{r.0}}/">{{r.1}}</a></li>
-	 {%endfor%}
-       </ul>
+      <ul>
+       {%for r in reviewlist%}
+        <li><a href="../../{{r.0}}/">{{r.1}}</a></li>
+       {%endfor%}
+      </ul>
      </td>
-   </tr>
+    </tr>
    {%endfor%}
- </tbody>
-</table>
+  </tbody>
+ </table>
 
 {%endblock%}
 
diff --git a/pgcommitfest/userprofile/templates/userprofileform.html b/pgcommitfest/userprofile/templates/userprofileform.html
index ed5e2638..4a636e5c 100644
--- a/pgcommitfest/userprofile/templates/userprofileform.html
+++ b/pgcommitfest/userprofile/templates/userprofileform.html
@@ -2,35 +2,35 @@
 {%load commitfest%}
 
 {%block contents%}
-<form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
-{%if form.errors%}
- <div class="alert">Please correct the errors below, and re-submit the form.</div>
-{%endif%}
-{%if form.non_field_errors%}
- <div class="alert alert-danger">{{form.non_field_errors}}</div>
-{%endif%}
- {%for field in form%}
- {%if not field.is_hidden%}
- <div class="form-group">
-   {{field|label_class:"control-label col-lg-2"}}
-   <div class="col-lg-10 controls">
-  {%if field.errors %}
-   {%for e in field.errors%}
- <div class="alert alert-danger">{{e}}</div>
-   {%endfor%}
+ <form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
+  {%if form.errors%}
+   <div class="alert">Please correct the errors below, and re-submit the form.</div>
   {%endif%}
-{{field|field_class:"form-control"}}
-{%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
- </div>
- {%else%}
-{{field}}
- {%endif%}
-{%endfor%}
- <div class="form-group">
-  <div class="col-lg-12">
-   <div class="control"><input type="submit" class="btn btn-default" name="submit" value="Save"></div>
+  {%if form.non_field_errors%}
+   <div class="alert alert-danger">{{form.non_field_errors}}</div>
+  {%endif%}
+  {%for field in form%}
+   {%if not field.is_hidden%}
+    <div class="form-group">
+     {{field|label_class:"control-label col-lg-2"}}
+     <div class="col-lg-10 controls">
+      {%if field.errors %}
+       {%for e in field.errors%}
+        <div class="alert alert-danger">{{e}}</div>
+       {%endfor%}
+      {%endif%}
+      {{field|field_class:"form-control"}}
+      {%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
+    </div>
+   {%else%}
+    {{field}}
+   {%endif%}
+  {%endfor%}
+  <div class="form-group">
+   <div class="col-lg-12">
+    <div class="control"><input type="submit" class="btn btn-default" name="submit" value="Save"></div>
+   </div>
   </div>
- </div>
-</form>
+ </form>
 
 {%endblock%}