From 4632cf5ce6e1ebc9a4b2d56bc4c1814c6d049f42 Mon Sep 17 00:00:00 2001
From: evanhearne <evanhearne02@gmail.com>
Date: Feb 12 2020 19:28:23 +0000
Subject: redesigned search page


---

diff --git a/templates/messaging/archive.html b/templates/messaging/archive.html
index c9143eb..7d638e2 100644
--- a/templates/messaging/archive.html
+++ b/templates/messaging/archive.html
@@ -6,15 +6,14 @@
 
     <div class="page-header">
         <h2>Happiness Archive</h2>
-    </div>
-
-    {% url 'messaging:search' as url %}
-    <form method="get" class="form-inline" action="{{url}}">
+        {% url 'messaging:search' as url %}
+        <form method="get" class="form-inline" action="{{url}}" style="position: absolute; top: 50px; right: 0px;">
             <div class="form-group" style="font-size: 1.7em;">
                 <input type="search" name="q" id="id_q">
                 <input type="submit" value="Search" class="search">
             </div>  
-    </form>
+        </form>
+    </div>
 
     <p>
         When you send a Happiness Packet, you can agree to display your message publicly on
diff --git a/templates/search/search.html b/templates/search/search.html
index b353b9d..1907304 100644
--- a/templates/search/search.html
+++ b/templates/search/search.html
@@ -3,18 +3,20 @@
 {% block extra_head %}<title>Search</title>{% endblock %}
 
 {% block content %}
-<h2>Search</h2>
-<form method="get"  class="form-inline">
+
+{% if query %}
+<div class="page-header">
+    <h3>Results</h3>
+    <form method="get"  class="form-inline" style="position: absolute; top: 40px; right: 0px;">
     {% for field in form %}
     <div class="form-group" style="font-size: 1.7em;">
         {{ field.errors }}
-        {{ field.label_tag }} {{ field }}
+        {{ field }}
     </div>
     {% endfor %}
     <input type="submit" value="Search" class="search">
 </form>
-{% if query %}
-<h3>Results</h3>
+</div>
 
 {% for result in object_list %}
 <h4>