Merge branch 'master' into rwd

[wolnelektury.git] / apps / search / templates / newsearch / search.html

diff --git a/apps/search/templates/newsearch/search.html b/apps/search/templates/newsearch/search.html
index c494ca6..0b0fad4 100644 (file)
--- a/apps/search/templates/newsearch/search.html
+++ b/apps/search/templates/newsearch/search.html
@@ -10,7 +10,7 @@
 
 {% block body %}
     <h1>Search</h1>
 
 {% block body %}
     <h1>Search</h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form-x">
+    <form action="{% url 'search' %}" method="get" accept-charset="utf-8" id="search-form-x">

         <p>
          <input type="text" name="q" value="{{request.GET.q}}" style="width:250px; font-size: 1.2em;">
          <input type="submit" value="{% trans "Search" %}" /> 
         <p>
          <input type="text" name="q" value="{{request.GET.q}}" style="width:250px; font-size: 1.2em;">
          <input type="submit" value="{% trans "Search" %}" /> 


@@ -29,11 +29,9 @@
       <li>
        <p><a href="{{result.book.get_absolute_url}}">{{result.book.pretty_title}}</a> (id: {{result.book_id}}, score: {{result.score}})</p>
        <ul>
       <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 %}
+         {% for snip in hit.snippets %}

          <li>
          <li>

-           {% for snip in hit.3.snippets %}
-             {{snip|safe}}<br/>
-           {% endfor %}
+           {{snip|safe}}<br/>

          </li>
          {% endfor %}
 
          </li>
          {% endfor %}