Controls search type

bookwyrm/templates/search/layout.html

@@ -10,14 +10,14 @@
     </h1>
 </div>
 
-<form class="block">
+<form class="block" action="{% url 'search' %}" method="GET">
     <div class="field has-addons">
         <div class="control">
-            <input type="input" class="input" value="{{ query }}">
+            <input type="input" class="input" name="q" value="{{ query }}">
         </div>
         <div class="control">
             <div class="select">
-                <select>
+                <select name="type">
                     <option value="book" {% if type == "book" %}selected{% endif %}>{% trans "Books" %}</option>
                     <option value="user" {% if type == "user" %}selected{% endif %}>{% trans "Users" %}</option>
                     <option value="list" {% if type == "list" %}selected{% endif %}>{% trans "Lists" %}</option>
@@ -35,25 +35,25 @@
 
 <nav class="tabs">
     <ul>
-        {% url 'search' "book" as url %}
-        <li{% if request.path in url %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Books" %}</a>
+        <li{% if type == "book" %} class="is-active"{% endif %}>
+            <a href="{% url 'search' %}?q={{ query }}&type=book">{% trans "Books" %}</a>
         </li>
-        {% url 'search' "user" as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Users" %}</a>
+        <li{% if type == "user" %} class="is-active"{% endif %}>
+            <a href="{% url 'search' %}?q={{ query }}&type=user">{% trans "Users" %}</a>
         </li>
-        {% url 'search' "list" as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Lists" %}</a>
+        <li{% if type == "list" %} class="is-active"{% endif %}>
+            <a href="{% url 'search' %}?q={{ query }}&type=list">{% trans "Lists" %}</a>
         </li>
     </ul>
 </nav>
 
-<div class="block columns">
-    <section class="block">
-        {% block panel %}
-        {% endblock %}
-    </section>
-</div>
+<section class="block">
+    {% block panel %}
+    {% endblock %}
+    {% if not results %}
+    <p>
+        <em>{% blocktrans %}No results found for "{{ query }}"{% endblocktrans %}</em>
+    </p>
+    {% endif %}
+</section>
 {% endblock %}

bookwyrm/templates/search/list.html

@@ -2,8 +2,6 @@
 
 {% block panel %}
 
-{% for result in results %}
-hi
-{% endfor %}
+{% include 'lists/list_items.html' with lists=results %}
 
 {% endblock %}