X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/568be7ec391479b5a253137fc08fa0ffa17b8249..73ce961f14509aabfa26536f847afd28111029c6:/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 dc3696ece..7a3e580b8 100644
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -2,29 +2,47 @@
 {% 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>
 
+    {% 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 %}
     <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 %}
+	  {% 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 #}
+	    <a href="{% url book_text result.book.slug %}#f{{hit.section_number}}">{{hit.header_index}}</a>
+  	     {% 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 +72,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 %}