Some search fixes.

[wolnelektury.git] / wolnelektury / templates / catalogue / search_multiple_hits.html

diff --git a/wolnelektury/templates/catalogue/search_multiple_hits.html b/wolnelektury/templates/catalogue/search_multiple_hits.html
index 414dcfd..ed06c94 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -1,56 +1,87 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load catalogue_tags pagination_tags %}
+{% load catalogue_tags search_tags pagination_tags %}
 
 {% block titleextra %}{% trans "Search" %}{% endblock %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <h1>{% trans "Search" %}</h1>
-
-    <div id="results">
-      <ol>
-      {% for result in results %}
-      <li>
-       <p><a href="{{result.book.get_absolute_url}}">{{result.book.pretty_title}}</a> (id: {{result.book_id}}, score: {{result.score}})</p>
-       <ul>
-         {% for hit in result.process_hits %}
-         <li>
-           {% if hit.fragment %}
-           <a href="{{hit.fragment.get_absolute_url}}">Idź do fragmentu</a>
-           <div style="">Tagi/Motywy: {% for tag in hit.themes %}{{tag.name}} {% endfor %}</div>
-           {% endif %}
-           {% for snip in hit.snippets %}
-             {{snip|safe}}<br/>
-           {% endfor %}
-         </li>
-         {% endfor %}
-
-       </ul>
-      </li>
-      {% empty %}
-      <p>No results.</p>
-      {% endfor %}
+    {% if did_you_mean %}
+      <span class="did_you_mean">{% trans "Did you mean" %} <a href="{% url search %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a>?</span>
+    {% endif %}
+    <!-- tu pójdą trafienia w tagi: Autorzy - z description oraz motywy i rodzaje (z book_count) -->
+
+    {% spaceless %}
+    {% if results.author %}
+    <div class="book-list-header">
+      <div class="book-box-inner">
+       <p>{% trans "Results by authors" %}</p>
+      </div>
+    </div>
+    <div>
+      <ol class="work-list">
+       {% for author in results.author %}
+       <li class="Book-item">
+         {% book_short author.book %}
+       </li>
+       {% endfor %}
       </ol>
     </div>
+    {% endif %}
 
+    {% if results.title %}
+    <div class="book-list-header">
+      <div class="book-box-inner">
+      <p>{% trans "Results by title" %}</p>
+      </div>
+    </div>
+    <div>
+      <ol class="work-list">
+       {% for result in results.title %}
+       <li class="Book-item">
+         {% book_short result.book %}
+       </li>
+       {% endfor %}
+      </ol>
+    </div>
+    {% endif %}
 
-{% comment %}
-    <div id="books-list">
-        <p>{% trans "More than one result matching the criteria found." %}</p>
-        <ul class='matches'>
-        {% for match, link, type in results %}
-          <li>{% trans type %}: <a href='{{ link }}'>
-            {% ifequal type "book" %}
-                {% book_title match %}
-            {% else %}
-                {{ match.name }}
-            {% endifequal %}
-          </a></li>
-        {% endfor %}
-        </ul>
+    {% if results.content %}
+    <div class="book-list-header">
+      <div class="book-box-inner">
+      <p>{% trans "Results in text" %}</p>
+      </div>
+    </div>
+    <div>
+      <ol class="work-list">
+       {% for result in results.content %}
+       <li class="Book-item">
+          {% book_searched result %}
+       </li>
+       {% endfor %}
+      </ol>
     </div>
-{% endcomment %}
+    {% endif %}
+
+    {% if results.other %}
+    <div class="book-list-header">
+      <div class="book-box-inner">
+       <p>{% trans "Other results" %}</p>
+      </div>
+    </div>
+    <div>
+      <ol class="work-list">
+       {% for result in results.other %}
+       <li class="Book-item">
+          {% book_searched result %}
+       </li>
+       {% endfor %}
+      </ol>
+    </div>
+    {% endif %}
+    {% endspaceless %}
+
+
 
 {% endblock %}