Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

[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 23d1a59..5d22251 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -1,72 +1,23 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load catalogue_tags pagination_tags %}
+{% load 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 %}
-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>
+    {% if did_you_mean %}
+      <span class="did_you_mean">{% trans "Dod you mean" %} <a href="{% url search %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a></b>?</span>
+    {% endif %}
+    <!-- tu pójdą trafienia w tagi: Autorzy - z description oraz motywy i rodzaje (z book_count) -->
 
     <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.hits %}
-         <li>
-           {% for snip in hit.3.snippets %}
-             {{snip|safe}}<br/>
-           {% endfor %}
-         </li>
-         {% endfor %}
-
-         {% for part in result.parts %}
-         {% if part.header %}
-         <li>W {{part.header}} nr {{part.position}}</li>
-         {% else %} 
-         {% if part.fragment %}
-         <li>
-           <div style="">Tagi/Motywy: {% for tag in part.fragment.tags %}{{tag.name}} {% endfor %}</div>
-           {{part.fragment.short_html|safe}}
-         </li>
-         {% endif %}
-         {% endif %}
-         {% endfor %}
-       </ul>
-      </li>
-      {% empty %}
-      <p>No results.</p>
+        {% book_searched result %}
       {% endfor %}
-      </ol>
     </div>
 
 
-{% 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>
-    </div>
-{% endcomment %}
 
-    <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 %}