diff --git a/src/search/templates/search/includes/search_filters.html b/src/search/templates/search/includes/search_filters.html
new file mode 100644
index 0000000..ba889af
--- /dev/null
+++ b/src/search/templates/search/includes/search_filters.html
@@ -0,0 +1,172 @@
+{% load i18n superarchives %}
+
+<h3>{% trans "Filters" %}</h3>
+
+  {% if filters %}
+    <ul class="unstyled-list">
+      <li class="selected" title="{% trans "Remove filter" %}">
+        <a href="{% url 'haystack_search' %}?q={{ request.GET.q }}{% if request.GET.order %}&order={{ request.GET.order }}{% endif %}{% if request.GET.since %}&since={{ request.GET.since }}{% endif %}{% if request.GET.until %}&until={{ request.GET.until }}{% endif %}">
+          <span class="glyphicon glyphicon-remove"></span> {{ filters.name }}
+        </a>
+      </li>
+    </ul>
+    <hr />
+    <form role="form">
+      <input type="hidden" name="q" value="{{ request.GET.q }}" />
+      <input type="hidden" name="order" value="{{ request.GET.order }}" />
+      <input type="hidden" name="type" value="{{ type_chosen }}" />
+      <input type="hidden" name="since" value="{{ request.GET.since }}" />
+      <input type="hidden" name="until" value="{{ request.GET.until }}" />
+
+      {% for field_lookup, field_display, field_value in filters.fields %}
+        <div class="form-group">
+          <label for="{{ field_lookup }}">{{ field_display }}</label>
+          {% if field_lookup == "list" %}
+            <select name="{{ field_lookup }}" class="form-control" multiple>
+              {% for value, option in form.fields.list.choices %}
+                <option value="{{ value }}" {% if value in field_value %}selected{% endif %}>{{ option }}</option>
+              {% endfor %}
+            </select>
+          {% elif field_lookup == "size" %}
+            <ul class="unstyled-list">
+              {% for value, option in size_choices %}
+                {% with value|add:" "|add:size_chosen as sizelistadd %}
+                  {% if value in field_value %}
+                    <li class="selected" title="{% trans "Remove filter" %}">
+                      <span class="glyphicon glyphicon-remove"></span>
+                      <a href="{% pop_from_get size=value %}">{{ option }}</a>
+                    </li>
+                  {% else %}
+                    <li>
+                      <span class="glyphicon glyphicon-chevron-right"></span>
+                      <a href="{% append_to_get size=sizelistadd %}">{{ option }}</a>
+                    </li>
+                  {% endif %}
+                {% endwith %}
+              {% endfor %}
+            </ul>
+          {% elif field_lookup == "mimetype" %}
+            <ul class="unstyled-list">
+              {% for value, option in mimetype_choices %}
+                {% with value|add:" "|add:mimetype_chosen as mimelistadd %}
+                  {% if value in mimetype_chosen %}
+                    <li class="selected"  title="{% trans "Remove filter" %}">
+                      <span class="glyphicon glyphicon-remove"></span>
+                      <a href="{% pop_from_get mimetype=value %}">{{ option }}</a>
+                    </li>
+                  {% else %}
+                    <li>
+                      <span class="glyphicon glyphicon-chevron-right"></span>
+                      <a href="{% append_to_get mimetype=mimelistadd %}">{{ option }}</a>
+                    </li>
+                  {% endif %}
+                {% endwith %}
+              {% endfor %}
+            </ul>
+          {% elif field_lookup == "used_by" %}
+            <ul class="unstyled-list">
+              {% for value, option in used_by_choices %}
+                {% with value|add:" "|add:used_by_chosen as used_byadd %}
+                  {% if value in used_by_chosen %}
+                    <li class="selected"  title="{% trans "Remove filter" %}">
+                      <span class="glyphicon glyphicon-remove"></span>
+                      <a href="{% pop_from_get used_by=value %}">{{ option }}</a>
+                    </li>
+                  {% else %}
+                    <li>
+                      <span class="glyphicon glyphicon-chevron-right"></span>
+                      <a href="{% append_to_get used_by=used_byadd %}">{{ option }}</a>
+                    </li>
+                  {% endif %}
+                {% endwith %}
+              {% endfor %}
+            </ul>
+          {% else %}
+            <input type="text" class="form-control" placeholder="{{ field_display }}" name="{{ field_lookup }}" {% if field_value %}value="{{ field_value }}"{% endif %}>
+          {% endif %}
+        </div>
+      {% endfor %}
+      <button type="submit" class="btn btn-default pull-right">
+        <span class="glyphicon glyphicon-filter"></span> {% trans 'Filter' %}
+      </button>
+    </form>
+    <br /><br /><hr />
+  {% endif %}
+
+  <h4>{% trans "Sort by" %}</h4>
+  <ul class="unstyled-list">
+    {% for option, dict_order in order_data.items %}
+      <li>
+        <span class="glyphicon glyphicon-chevron-right"></span>
+        <a href="{% append_to_get order=option p=1 %}">
+          {% ifequal request.GET.order option %}
+            {% blocktrans with name=dict_order.name %}<strong>{{ name }}</strong>{% endblocktrans %}
+          {% else %}
+            {% blocktrans with name=dict_order.name %}{{ name }}{% endblocktrans %}
+          {% endifequal %}
+        </a>
+      </li>
+    {% endfor %}
+  </ul>
+
+  {% if not request.GET.type %}
+    <h4>{% trans "Types" %}</h4>
+
+    <ul class="unstyled-list">
+      <li>
+        <span class="glyphicon glyphicon-book"></span>
+        <a href="{% append_to_get type='wiki' %}">{% trans "Wiki" %}</a>
+      </li>
+      <li>
+        <span class="glyphicon glyphicon-envelope"></span>
+        <a href="{% append_to_get type='thread' %}">{% trans "Discussion" %}</a>
+      </li>
+      <li>
+        <span class="glyphicon glyphicon-tag"></span>
+        <a href="{% append_to_get type='ticket' %}">{% trans "Ticket" %}</a>
+      </li>
+      <li>
+        <span class="glyphicon glyphicon-align-right"></span>
+        <a href="{% append_to_get type='changeset' %}">{% trans "Changeset" %}</a>
+      </li>
+      <li>
+        <span class="glyphicon glyphicon-user"></span>
+        <a href="{% append_to_get type='user' %}">{% trans "User" %}</a>
+      </li>
+      <li>
+        <span class="glyphicon glyphicon-file"></span>
+        <a href="{% append_to_get type='attachment' %}">{% trans "Attachment" %}</a>
+      </li>
+    </ul>
+  {% endif %}
+  <hr />
+  <form role="form">
+    {% for name, value in request.GET.items %}
+      {% if value and not name == "since" and not name == "until" %}
+        <input type="hidden" name="{{ name }}" value="{{ value }}" />
+      {% endif %}
+    {% endfor %}
+    <div class="form-group">
+      <label for="since">{% trans "Since" %}</label>
+        <div class="input-group date" id="datepicker_since">
+          <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
+          <span class="input-group-addon">
+            <span class="glyphicon glyphicon-calendar"></span>
+          </span>
+        </div>
+    </div>
+    <div class="form-group">
+      <label for="until">{% trans "Until" %}</label>
+        <div class="input-group date" id="datepicker_until">
+          <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
+          <span class="input-group-addon">
+            <span class="glyphicon glyphicon-calendar"></span>
+          </span>
+        </div>
+    </div>
+    <p class="text-right">
+      <button type="submit" class="btn btn-default">
+        <span class="glyphicon glyphicon-filter"></span> {% trans "Filter" %}
+      </button>
+    </p>
+  </form>
diff --git a/src/search/templates/search/search-message-preview.html b/src/search/templates/search/search-message-preview.html
new file mode 100644
index 0000000..e449429
--- /dev/null
+++ b/src/search/templates/search/search-message-preview.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+
+<span class="glyphicon glyphicon-envelope" title="{{ result.type }}"></span>
+
+{% if result.mailinglist %}
+  <a href="{% url 'super_archives.views.list_messages' %}?list={{ result.mailinglist }}">
+    <span class="label label-primary">{{ result.mailinglist }}</span>
+  </a>
+{% endif %}
+
+<span class="subject">
+  <a href="{{ result.url }}#msg-{{ result.pk }}"
+    title="{% filter striptags|truncatewords:50 %}{{ result.description|escape }}{% endfilter %}">
+    {{ result.title }}
+  </a>
+</span>
+
+<span class="quiet">- {{ result.description|striptags }}</span>
diff --git a/src/search/templates/search/search-revision-preview.html b/src/search/templates/search/search-revision-preview.html
new file mode 100644
index 0000000..1f99c44
--- /dev/null
+++ b/src/search/templates/search/search-revision-preview.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+
+<span class="glyphicon glyphicon-align-right" title="{{ result.type }}"></span>
+
+<span class="subject">
+  <a href="{{ result.url }}">{{ result.repository_name }} [{{ result.revision }}]</a>
+</span>
+
+<span class="quiet">{% if result.message %}- {{ result.message }}{% endif %}</span>
diff --git a/src/search/templates/search/search-ticket-preview.html b/src/search/templates/search/search-ticket-preview.html
new file mode 100644
index 0000000..eade62b
--- /dev/null
+++ b/src/search/templates/search/search-ticket-preview.html
@@ -0,0 +1,16 @@
+{% load i18n %}
+{% load highlight %}
+
+<span class="glyphicon glyphicon-tag" title="{{ result.type }}"></span>
+
+<a href="{{ result.url }}" title="{{ result.description|escape }}">
+{% if result.status %}
+    <span class="label label-primary">{{ result.status }}</span>
+{% endif %}
+
+<span class="subject">
+    #{{ result.pk }} - {% filter striptags|truncatewords:50 %}{{ result.summary|escape }}{% endfilter %}
+  </a>
+</span>
+
+<span class="quiet">- {% highlight result.description with query max_length "150" %}</span>
diff --git a/src/search/templates/search/search-user-preview.html b/src/search/templates/search/search-user-preview.html
new file mode 100644
index 0000000..cee56c5
--- /dev/null
+++ b/src/search/templates/search/search-user-preview.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+
+<span class="glyphicon glyphicon-user" title="{{ result.type }}"></span>
+
+<span class="subject">
+  <a href="{% url 'user_profile' result.username %}">{{ result.name }}</a>
+</span>
+
+<span class="quiet">{% if result.institution %}- {{ result.institution }}{% endif %}{% if result.role %} - {{ result.role }}{% endif %}</span>
diff --git a/src/search/templates/search/search-wiki-preview.html b/src/search/templates/search/search-wiki-preview.html
new file mode 100644
index 0000000..e62f954
--- /dev/null
+++ b/src/search/templates/search/search-wiki-preview.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+
+<span class="glyphicon glyphicon-book" title="{{ result.type }}"></span>
+
+<span class="subject">
+  <a href="{{ result.url }}">{{ result.name }}</a>
+</span>
+
+<span class="quiet">{% if result.wiki_text %}- {{ result.wiki_text|truncatechars:150 }}{% elif result.comment %}- {{ result.comment|truncatechars:150 }}{% endif %}</span>
diff --git a/src/search/templates/search/search.html b/src/search/templates/search/search.html
new file mode 100644
index 0000000..7e59636
--- /dev/null
+++ b/src/search/templates/search/search.html
@@ -0,0 +1,79 @@
+{% extends "base.html" %}
+{% load i18n highlight superarchives %}
+
+{% block head_js %}
+<script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+{% if use_language %}
+  <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script>
+{% endif %}
+
+<script type="text/javascript">
+  $(function () {
+    $('#datepicker_since, #datepicker_until').datetimepicker({
+      pickTime: false,
+      {% if use_language and date_format %}
+        language: '{{ use_language }}',
+        format: '{{ date_format }}',
+      {% endif %}
+    });
+  });
+</script>
+{% endblock %}
+
+{% block head_css %}
+<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css"/>
+{% endblock %}
+
+{% block main-content %}
+  <div class="row">
+    <div class="col-xs-6 col-sm-4 col-md-2 col-lg-2">
+      <h2>{% trans "Search" %}</h2>
+    </div>
+    <div class="col-xs-6 col-sm-8 col-md-10 col-lg-10">
+      <br/><br/>
+      <p class="text-right quiet">
+        {{ page.paginator.count }} {% trans "documents found" %}
+      </p>
+    </div>
+  </div>
+
+  <hr/>
+
+  <div class="row">
+    <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2">
+      {% include "search/includes/search_filters.html" %}
+    </div>
+  
+    <div class="col-lg-10">
+      <ul class="list-unstyled">
+      {% for result in page.object_list  %}
+        {% include "message-preview.html" %}
+      {% empty %}
+        <li class="text-center">
+          {% trans "No results for your search." %}
+        </li>
+      {% endfor %}
+      </ul>
+
+      {% if page.has_other_pages %}
+        <div class="text-center">
+          <span>
+            {% if page.has_previous %}
+              <a href="{% append_to_get page=page.previous_page_number %}">{% trans "Previous" %}</a>
+            {% endif %}
+            <span>
+              {% trans "Page" %} {{ page.number }} {% trans "of" %}
+              {{ page.paginator.num_pages }}
+            </span>
+
+            {% if page.has_next %}
+              <a href="{% append_to_get page=page.next_page_number %}">{% trans "Next" %}</a>
+            {% endif %}
+          </span>
+        </div>
+      {% endif %}
+
+    </div>
+  </div>
+
+{% endblock %}
diff --git a/src/templates/search/search-message-preview.html b/src/templates/search/search-message-preview.html
deleted file mode 100644
index e449429..0000000
--- a/src/templates/search/search-message-preview.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% load i18n %}
-
-<span class="glyphicon glyphicon-envelope" title="{{ result.type }}"></span>
-
-{% if result.mailinglist %}
-  <a href="{% url 'super_archives.views.list_messages' %}?list={{ result.mailinglist }}">
-    <span class="label label-primary">{{ result.mailinglist }}</span>
-  </a>
-{% endif %}
-
-<span class="subject">
-  <a href="{{ result.url }}#msg-{{ result.pk }}"
-    title="{% filter striptags|truncatewords:50 %}{{ result.description|escape }}{% endfilter %}">
-    {{ result.title }}
-  </a>
-</span>
-
-<span class="quiet">- {{ result.description|striptags }}</span>
diff --git a/src/templates/search/search-revision-preview.html b/src/templates/search/search-revision-preview.html
deleted file mode 100644
index 1f99c44..0000000
--- a/src/templates/search/search-revision-preview.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-
-<span class="glyphicon glyphicon-align-right" title="{{ result.type }}"></span>
-
-<span class="subject">
-  <a href="{{ result.url }}">{{ result.repository_name }} [{{ result.revision }}]</a>
-</span>
-
-<span class="quiet">{% if result.message %}- {{ result.message }}{% endif %}</span>
diff --git a/src/templates/search/search-ticket-preview.html b/src/templates/search/search-ticket-preview.html
deleted file mode 100644
index eade62b..0000000
--- a/src/templates/search/search-ticket-preview.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% load i18n %}
-{% load highlight %}
-
-<span class="glyphicon glyphicon-tag" title="{{ result.type }}"></span>
-
-<a href="{{ result.url }}" title="{{ result.description|escape }}">
-{% if result.status %}
-    <span class="label label-primary">{{ result.status }}</span>
-{% endif %}
-
-<span class="subject">
-    #{{ result.pk }} - {% filter striptags|truncatewords:50 %}{{ result.summary|escape }}{% endfilter %}
-  </a>
-</span>
-
-<span class="quiet">- {% highlight result.description with query max_length "150" %}</span>
diff --git a/src/templates/search/search-user-preview.html b/src/templates/search/search-user-preview.html
deleted file mode 100644
index cee56c5..0000000
--- a/src/templates/search/search-user-preview.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-
-<span class="glyphicon glyphicon-user" title="{{ result.type }}"></span>
-
-<span class="subject">
-  <a href="{% url 'user_profile' result.username %}">{{ result.name }}</a>
-</span>
-
-<span class="quiet">{% if result.institution %}- {{ result.institution }}{% endif %}{% if result.role %} - {{ result.role }}{% endif %}</span>
diff --git a/src/templates/search/search-wiki-preview.html b/src/templates/search/search-wiki-preview.html
deleted file mode 100644
index e62f954..0000000
--- a/src/templates/search/search-wiki-preview.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-
-<span class="glyphicon glyphicon-book" title="{{ result.type }}"></span>
-
-<span class="subject">
-  <a href="{{ result.url }}">{{ result.name }}</a>
-</span>
-
-<span class="quiet">{% if result.wiki_text %}- {{ result.wiki_text|truncatechars:150 }}{% elif result.comment %}- {{ result.comment|truncatechars:150 }}{% endif %}</span>
diff --git a/src/templates/search/search.html b/src/templates/search/search.html
deleted file mode 100644
index ac2228c..0000000
--- a/src/templates/search/search.html
+++ /dev/null
@@ -1,246 +0,0 @@
-{% extends "base.html" %}
-{% load i18n highlight superarchives %}
-
-{% block head_js %}
-<script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-{% if use_language %}
-  <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script>
-{% endif %}
-
-<script type="text/javascript">
-  $(function () {
-    $('#datepicker_since, #datepicker_until').datetimepicker({
-      pickTime: false,
-      {% if use_language and date_format %}
-        language: '{{ use_language }}',
-        format: '{{ date_format }}',
-      {% endif %}
-    });
-  });
-</script>
-{% endblock %}
-
-{% block head_css %}
-<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css"/>
-{% endblock %}
-
-{% block main-content %}
-  <div class="row">
-    <div class="col-xs-6 col-sm-4 col-md-2 col-lg-2">
-      <h2>{% trans "Search" %}</h2>
-    </div>
-    <div class="col-xs-6 col-sm-8 col-md-10 col-lg-10">
-      <br/><br/>
-      <p class="text-right quiet">
-        {{ page.paginator.count }} {% trans "documents found" %}
-      </p>
-    </div>
-  </div>
-
-  <hr/>
-
-  <div class="row">
-    <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2">
-      <h3>{% trans "Filters" %}</h3>
-
-      {% if filters %}
-        <ul class="unstyled-list">
-          <li class="selected" title="{% trans "Remove filter" %}">
-            <a href="{% url 'haystack_search' %}?q={{ request.GET.q }}{% if request.GET.order %}&order={{ request.GET.order }}{% endif %}{% if request.GET.since %}&since={{ request.GET.since }}{% endif %}{% if request.GET.until %}&until={{ request.GET.until }}{% endif %}">
-              <span class="glyphicon glyphicon-remove"></span> {{ filters.name }}
-            </a>
-          </li>
-        </ul>
-        <hr />
-        <form role="form">
-          <input type="hidden" name="q" value="{{ request.GET.q }}" />
-          <input type="hidden" name="order" value="{{ request.GET.order }}" />
-          <input type="hidden" name="type" value="{{ type_chosen }}" />
-          <input type="hidden" name="since" value="{{ request.GET.since }}" />
-          <input type="hidden" name="until" value="{{ request.GET.until }}" />
-
-          {% for field_lookup, field_display, field_value in filters.fields %}
-            <div class="form-group">
-              <label for="{{ field_lookup }}">{{ field_display }}</label>
-              {% if field_lookup == "list" %}
-                <select name="{{ field_lookup }}" class="form-control" multiple>
-                  {% for value, option in form.fields.list.choices %}
-                    <option value="{{ value }}" {% if value in field_value %}selected{% endif %}>{{ option }}</option>
-                  {% endfor %}
-                </select>
-              {% elif field_lookup == "size" %}
-                <ul class="unstyled-list">
-                  {% for value, option in size_choices %}
-                    {% with value|add:" "|add:size_chosen as sizelistadd %}
-                      {% if value in field_value %}
-                        <li class="selected" title="{% trans "Remove filter" %}">
-                          <span class="glyphicon glyphicon-remove"></span>
-                          <a href="{% pop_from_get size=value %}">{{ option }}</a>
-                        </li>
-                      {% else %}
-                        <li>
-                          <span class="glyphicon glyphicon-chevron-right"></span>
-                          <a href="{% append_to_get size=sizelistadd %}">{{ option }}</a>
-                        </li>
-                      {% endif %}
-                    {% endwith %}
-                  {% endfor %}
-                </ul>
-              {% elif field_lookup == "mimetype" %}
-                <ul class="unstyled-list">
-                  {% for value, option in mimetype_choices %}
-                    {% with value|add:" "|add:mimetype_chosen as mimelistadd %}
-                      {% if value in mimetype_chosen %}
-                        <li class="selected"  title="{% trans "Remove filter" %}">
-                          <span class="glyphicon glyphicon-remove"></span>
-                          <a href="{% pop_from_get mimetype=value %}">{{ option }}</a>
-                        </li>
-                      {% else %}
-                        <li>
-                          <span class="glyphicon glyphicon-chevron-right"></span>
-                          <a href="{% append_to_get mimetype=mimelistadd %}">{{ option }}</a>
-                        </li>
-                      {% endif %}
-                    {% endwith %}
-                  {% endfor %}
-                </ul>
-              {% elif field_lookup == "used_by" %}
-                <ul class="unstyled-list">
-                  {% for value, option in used_by_choices %}
-                    {% with value|add:" "|add:used_by_chosen as used_byadd %}
-                      {% if value in used_by_chosen %}
-                        <li class="selected"  title="{% trans "Remove filter" %}">
-                          <span class="glyphicon glyphicon-remove"></span>
-                          <a href="{% pop_from_get used_by=value %}">{{ option }}</a>
-                        </li>
-                      {% else %}
-                        <li>
-                          <span class="glyphicon glyphicon-chevron-right"></span>
-                          <a href="{% append_to_get used_by=used_byadd %}">{{ option }}</a>
-                        </li>
-                      {% endif %}
-                    {% endwith %}
-                  {% endfor %}
-                </ul>
-              {% else %}
-                <input type="text" class="form-control" placeholder="{{ field_display }}" name="{{ field_lookup }}" {% if field_value %}value="{{ field_value }}"{% endif %}>
-              {% endif %}
-            </div>
-          {% endfor %}
-          <button type="submit" class="btn btn-default pull-right">
-            <span class="glyphicon glyphicon-filter"></span> {% trans 'Filter' %}
-          </button>
-        </form>
-        <br /><br /><hr />
-      {% endif %}
-
-      <h4>{% trans "Sort by" %}</h4>
-      <ul class="unstyled-list">
-        {% for option, dict_order in order_data.items %}
-          <li>
-            <span class="glyphicon glyphicon-chevron-right"></span>
-            <a href="{% append_to_get order=option p=1 %}">
-              {% ifequal request.GET.order option %}
-                {% blocktrans with name=dict_order.name %}<strong>{{ name }}</strong>{% endblocktrans %}
-              {% else %}
-                {% blocktrans with name=dict_order.name %}{{ name }}{% endblocktrans %}
-              {% endifequal %}
-            </a>
-          </li>
-        {% endfor %}
-      </ul>
-
-      {% if not request.GET.type %}
-        <h4>{% trans "Types" %}</h4>
-
-        <ul class="unstyled-list">
-          <li>
-            <span class="glyphicon glyphicon-book"></span>
-            <a href="{% append_to_get type='wiki' %}">{% trans "Wiki" %}</a>
-          </li>
-          <li>
-            <span class="glyphicon glyphicon-envelope"></span>
-            <a href="{% append_to_get type='thread' %}">{% trans "Discussion" %}</a>
-          </li>
-          <li>
-            <span class="glyphicon glyphicon-tag"></span>
-            <a href="{% append_to_get type='ticket' %}">{% trans "Ticket" %}</a>
-          </li>
-          <li>
-            <span class="glyphicon glyphicon-align-right"></span>
-            <a href="{% append_to_get type='changeset' %}">{% trans "Changeset" %}</a>
-          </li>
-          <li>
-            <span class="glyphicon glyphicon-user"></span>
-            <a href="{% append_to_get type='user' %}">{% trans "User" %}</a>
-          </li>
-          <li>
-            <span class="glyphicon glyphicon-file"></span>
-            <a href="{% append_to_get type='attachment' %}">{% trans "Attachment" %}</a>
-          </li>
-        </ul>
-      {% endif %}
-      <hr />
-      <form role="form">
-        {% for name, value in request.GET.items %}
-          {% if value and not name == "since" and not name == "until" %}
-            <input type="hidden" name="{{ name }}" value="{{ value }}" />
-          {% endif %}
-        {% endfor %}
-        <div class="form-group">
-          <label for="since">{% trans "Since" %}</label>
-            <div class="input-group date" id="datepicker_since">
-              <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
-              <span class="input-group-addon">
-                <span class="glyphicon glyphicon-calendar"></span>
-              </span>
-            </div>
-        </div>
-        <div class="form-group">
-          <label for="until">{% trans "Until" %}</label>
-            <div class="input-group date" id="datepicker_until">
-              <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
-              <span class="input-group-addon">
-                <span class="glyphicon glyphicon-calendar"></span>
-              </span>
-            </div>
-        </div>
-      <button type="submit" class="btn btn-default pull-right">
-        <span class="glyphicon glyphicon-filter"></span> {% trans "Filter" %}
-      </button>
-      </form>
-    </div>
-  
-    <div class="col-lg-10">
-      <ul class="list-unstyled">
-      {% for result in page.object_list  %}
-        {% include "message-preview.html" %}
-      {% empty %}
-        <li class="text-center">
-          {% trans "No results for your search." %}
-        </li>
-      {% endfor %}
-      </ul>
-
-      {% if page.has_other_pages %}
-        <div class="text-center">
-          <span>
-            {% if page.has_previous %}
-              <a href="{% append_to_get page=page.previous_page_number %}">{% trans "Previous" %}</a>
-            {% endif %}
-            <span>
-              {% trans "Page" %} {{ page.number }} {% trans "of" %}
-              {{ page.paginator.num_pages }}
-            </span>
-
-            {% if page.has_next %}
-              <a href="{% append_to_get page=page.next_page_number %}">{% trans "Next" %}</a>
-            {% endif %}
-          </span>
-        </div>
-      {% endif %}
-
-    </div>
-  </div>
-
-{% endblock %}
--
libgit2 0.21.2