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 b569e7d..efe6d79 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -1,34 +1,85 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load catalogue_tags pagination_tags %}
+{% load catalogue_tags search_tags pagination_tags %}
 
-{% block title %}{% trans "Searching in" %} WolneLektury.pl{% endblock %}
+{% block titleextra %}{% trans "Search" %}{% endblock %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <h1>{% title_from_tags tags %}</h1>
-    {% breadcrumbs tags %}
-
-    <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>
-    </div>
-
-    <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-        <div class="target">
-            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
-        </div>
-    </div>
-{% endblock %}
\ No newline at end of file
+    {% 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) -->
+
+    {% 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 %}
+
+    {% 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>
+    {% 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 %}
+
+
+
+{% endblock %}