Search - some tests, change in SearchResults cleaning.

[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 dc3696e..0d3e700 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -2,14 +2,12 @@
 {% load i18n %}
 {% load catalogue_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>
+    <h1>{% trans "Search" %}</h1>
 
     <div id="results">
       <ol>
@@ -17,14 +15,30 @@
       <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 %}
+         {% for hit in result.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>
+           {# snippets or short html? #}
+           {% if hit.snippets %}
+            {% for snip in hit.snippets %}
+              {{snip|safe}}<br/>
+            {% endfor %}
+           {% else %}
+            {{hit.fragment.short_text|safe}}
+           {% endif %}
+           
+           {% else %}
+           {# it's a section #}
+            {% if hit.snippets %}
+             {% for snip in hit.snippets %}
+               {{snip|safe}}<br/>
+             {% endfor %}
+            {% else %}
+              [section matched but no snippets :-(]
+            {% endif %}
            {% endif %}
-           {% for snip in hit.snippets %}
-             {{snip|safe}}<br/>
-           {% endfor %}
          </li>
          {% endfor %}
 
@@ -54,10 +68,4 @@
     </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 %}