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 fe45140..0d3e700 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -2,27 +2,70 @@
 {% 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 %}
-    <h1>{% title_from_tags tags %}</h1>
-    {% breadcrumbs tags %}
-    
+    <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.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 %}
+         </li>
+         {% endfor %}
+
+       </ul>
+      </li>
+      {% empty %}
+      <p>No results.</p>
+      {% endfor %}
+      </ol>
+    </div>
+
+
+{% comment %}
     <div id="books-list">
         <p>{% trans "More than one result matching the criteria found." %}</p>
-               <ul class='matches'>
+        <ul class='matches'>
         {% for match, link, type in results %}
-            <li><a href='{{ link }}'>{{ match.name }}</a> ({{ type }})</li>
+          <li>{% trans type %}: <a href='{{ link }}'>
+            {% ifequal type "book" %}
+                {% book_title match %}
+            {% else %}
+                {{ match.name }}
+            {% endifequal %}
+          </a></li>
         {% endfor %}
-               </ul>
+        </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 %}
\ No newline at end of file
+{% endblock %}