4 files changed, 154 insertions, 1 deletions

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index 76d7d66..8bdb1c5 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -36,6 +36,19 @@
 						{% endif %}
 						</ul>
 
+						<div id="search-form" class="nav">
+							<form name="search" method="get" action="{% url 'search' %}" class="form-search">
+								{% if mlist %}<input type="hidden" name="list" value="{{ mlist.name }}" />{% endif %}
+								<div class="input-append">
+									<input name="query" type="text" class="search-query"
+									       placeholder="Search {% if mlist %}this list{% else %}all lists{% endif %}"
+										   {% if query %}value="{{ query }}"{% endif %}
+									       />
+									<button type="submit" class="btn">Search</button>
+								</div>
+							</form>
+						</div>
+
 
 						<a class="brand" href="{% url 'root' %}">{{ app_name|title }}</a>
 
diff --git a/hyperkitty/templates/messages/like_form.html b/hyperkitty/templates/messages/like_form.html
index bf7a5ba..c499f4f 100644
--- a/hyperkitty/templates/messages/like_form.html
+++ b/hyperkitty/templates/messages/like_form.html
@@ -1,7 +1,7 @@
 {% load url from future %}
 
 	<form method="post" class="likeform"
-	      action="{% url 'message_vote' mlist_fqdn=mlist.name message_id_hash=message_id_hash %}">
+	      action="{% url 'message_vote' mlist_fqdn=object.list_name message_id_hash=message_id_hash %}">
 	{% csrf_token %}
 	<span class="likestatus {{ object.likestatus }}">+{{ object.likes }}/-{{ object.dislikes }}</span>
 	{% if object.myvote == 1 %}
diff --git a/hyperkitty/templates/messages/summary_message.html b/hyperkitty/templates/messages/summary_message.html
new file mode 100644
index 0000000..6e14777
--- /dev/null
+++ b/hyperkitty/templates/messages/summary_message.html
@@ -0,0 +1,37 @@
+{% load url from future %}
+{% load gravatar %}
+{% load hk_generic %}
+{% load storm %}
+
+		<div class="thread">
+			<div>
+				<span class="thread-title">
+					<a name="{{message.message_id_hash}}"
+					   href="{% url 'message_index' message_id_hash=message.message_id_hash mlist_fqdn=message.list_name %}"
+					   >{{ message.subject|strip_subject:mlist }}</a></span>
+				<span class="thread-date">{{ message|get_date|timesince }}</span>
+			</div>
+			<div class="thread-content">
+				<div class="gravatar">
+					{% if message.sender_email %}
+					{% gravatar message.sender_email 40 %}
+					<br />
+					{% endif %}
+					{{ message.sender_name|escapeemail }}
+				</div>
+				<div class="thread-email">
+					<span class="expander collapsed">
+						{{ message.content|urlizetrunc:76|escapeemail }}
+					</span>
+				</div>
+			</div>
+			<div class="thread-info">
+				<div class="tags">
+				</div>
+				{% include "messages/like_form.html" with message_id_hash=message.message_id_hash object=message %}
+				<a href="{% url 'message_index' message_id_hash=message.message_id_hash mlist_fqdn=message.list_name %}"
+				   class="btn thread-show">Show message</a>
+			</div>
+		</div>
+
+{# vim: set noet: #}
diff --git a/hyperkitty/templates/search_results.html b/hyperkitty/templates/search_results.html
new file mode 100644
index 0000000..41b97ba
--- /dev/null
+++ b/hyperkitty/templates/search_results.html
@@ -0,0 +1,103 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% load gravatar %}
+{% load hk_generic %}
+
+
+{% block title %}
+Search results for "{{ query }}"{% if mlist %} - {{ mlist.display_name|default:mlist.name|escapeemail }} {% endif %} - {{ app_name|title }}
+{% endblock %}
+
+{% block content %}
+
+<div class="row-fluid">
+
+{% include 'threads/month_list.html' %}
+
+	<div id="thread-list" class="span8">
+
+		<div class="thread-list-header page-header">
+			{% if mlist %}
+			<h1>{{ mlist.display_name|default:mlist.name|escapeemail }}
+				<small>Search results for query "{{ query }}"</small>
+			</h1>
+			{% else %}
+			<h1>Search results
+			<small>for query "{{ query }}"</small>
+			</h1>
+			{% endif %}
+			<ul class="thread-list-info">
+				{% if mlist.display_name %}
+				<li class="list-address">
+					{{ mlist.name|escapeemail }}
+				</li>
+				{% endif %}
+				<li class="discussion">
+					{{ total }} messages
+				</li>
+			</ul>
+		</div>
+
+		{% for message in messages %}
+			{% include "messages/summary_message.html" %}
+		{% empty %}
+			<p>Sorry no email could be found for this query.</p>
+		{% endfor %}
+
+		<div class="pagination pagination-centered">
+		<ul>
+			{% if messages.has_previous %}
+			<li>
+				<a href="?{% add_to_query_string page=messages.previous_page_number %}">
+			{% else %}
+			<li class="disabled">
+				<a href="#">
+			{% endif %}
+				&larr; Previous</a>
+			</li>
+
+			{% for pagenum in page_range %}
+				<li{% if pagenum == messages.number %} class="active"{% endif %}>
+					<a href="?{% add_to_query_string page=pagenum %}">{{ pagenum }}</a>
+				</li>
+			{% endfor %}
+
+			{% if messages.has_next %}
+			<li>
+				<a href="?{% add_to_query_string page=messages.next_page_number %}">
+			{% else %}
+			<li class="disabled">
+				<a href="#">
+			{% endif %}
+				Next &rarr;</a>
+			</li>
+		</ul>
+		</div>
+
+	</div>
+
+</div>
+
+{% endblock %}
+
+{% block additionaljs %}
+<script>
+$(document).ready(function() {
+    $('span.expander').expander({
+        slicePoint: 500,
+        userCollapseText : '\n[View Less]',
+        expandText : '\n[View More]',
+        beforeExpand: function() {
+            $(this).removeClass("collapsed");
+            $(this).addClass("expanded");
+        },
+        onCollapse: function() {
+            $(this).removeClass("expanded");
+            $(this).addClass("collapsed");
+        }
+    });
+});
+</script>
+{% endblock %}
+
+{# vim: set noet: #}