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

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

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

-    <form action="{% url newsearch %}" 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" %}" /> 


@@ -32,7 +32,7 @@
          {% for hit in result.hits %}
          <li>
            {% for snip in hit.3.snippets %}
          {% for hit in result.hits %}
          <li>
            {% for snip in hit.3.snippets %}

-           {{snip}}<br/>
+             {{snip|safe}}<br/>

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