merge search into pretty branch

[wolnelektury.git] / wolnelektury / templates / catalogue / book_list.html

diff --git a/wolnelektury/templates/catalogue/book_list.html b/wolnelektury/templates/catalogue/book_list.html
index 2791ef2..b4336d3 100644 (file)
--- a/wolnelektury/templates/catalogue/book_list.html
+++ b/wolnelektury/templates/catalogue/book_list.html
@@ -4,13 +4,12 @@
 
 {% block bodyid %}book-a-list{% endblock %}
 
-{% block title %}{% trans "Listing of all works on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Listing of all works" %}{% endblock %}
 
 {% block body %}
     <h1>{% block book_list_header %}{% trans "Listing of all works" %}{% endblock %}</h1>
-    <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>
+
+    <div class="column-left">{% block book_list_info %}{% endblock %}</div><div style='clear:both;'></div>
     <a name="top">
     <div id="book-list-nav">
         {% trans "Table of Content" %}
@@ -26,6 +25,7 @@
         {% endfor %}    
     </div>
     <div id="book-list">
+      {% block book_list %}
         {% book_tree orphans books_by_parent %}
         {% for author, group in books_by_author.items %}
             {% if group %}
@@ -36,6 +36,7 @@
                 </div>
             {% endif %}
         {% endfor %}
+      {% endblock %}
     </div>
     <div id="book-list-up">
         <p><a href="#top">{% trans "↑ top ↑" %}</a></p>