Improved title generation (Request from Olga).

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

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 332dd33..3174007 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load catalogue_tags %}
+{% load catalogue_tags pagination_tags %}

 
 {% block title %}Lektura {{ book.title }} w WolneLektury.pl{% endblock %}
 
 
 {% block title %}Lektura {{ book.title }} w WolneLektury.pl{% endblock %}
 


@@ -27,12 +27,7 @@
 {% block body %}
     <h1>{{ book.title }}, {{ categories.author|join:", " }}</h1>
     <form action="{% url main_page %}" method="get" accept-charset="utf-8" id="search-form">
 {% block body %}
     <h1>{{ book.title }}, {{ categories.author|join:", " }}</h1>
     <form action="{% url main_page %}" method="get" accept-charset="utf-8" id="search-form">

-        <ol>
-            {# {% for tag in tags %} #}
-            {# <li class="category"><a href="{% catalogue_url tag %}">{{ tag }}</a> | <a href="{% catalogue_url tags -tag %}">x</a></li> #}
-            {# {% endfor %} #}
-            <li class="book-title">{{ book.title }} | <a href="{% url main_page %}">x</a></li>
-        </ol>
+        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url main_page %}">wróć do strony głównej</a></p>

     </form>
     
     <div id="books-list">
     </form>
     
     <div id="books-list">


@@ -44,25 +39,32 @@
         {% endif %}
         <div id="formats">
             <ul>
         {% endif %}
         <div id="formats">
             <ul>

+            {% if book.html_file %}
+                <li><a href="{% url book_text book.slug %}">Czytaj online</a></li>
+            {% endif %}

             {% if book.pdf_file %}
                 <li><a href="{{ book.pdf_file.url }}">Pobierz plik PDF</a></li>
             {% endif %}
             {% if book.odt_file %}
                 <li><a href="{{ book.odt_file.url }}">Pobierz plik ODT</a></li>
             {% endif %}
             {% if book.pdf_file %}
                 <li><a href="{{ book.pdf_file.url }}">Pobierz plik PDF</a></li>
             {% endif %}
             {% if book.odt_file %}
                 <li><a href="{{ book.odt_file.url }}">Pobierz plik ODT</a></li>
             {% endif %}

-            {% if book.html_file %}
-                <li><a href="{{ book.html_file.url }}">Pobierz plik HTML</a></li>
+            {% if book.txt_file %}
+                <li><a href="{{ book.txt_file.url }}">Pobierz plik TXT</a></li>

             {% endif %}
             </ul>
         </div>
     
             {% endif %}
             </ul>
         </div>
     

-        {% if book.children.all %}
+        {% if book_children %}
+        {% autopaginate book_children 10 %}

         <div id="book-children">
             <h2>Utwory składające się na ten utwór:</h2>
         <div id="book-children">
             <h2>Utwory składające się na ten utwór:</h2>

-            {% for book in book.children.all %}
-                <li><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></li>
+            <ol>
+            {% for book in book_children %}
+                <li>{{ book.short_html }}</li>

             {% endfor %}
             {% endfor %}

+            </ol>

         </div>
         </div>

+        {% paginate %}

         {% endif %}
     
     </div>
         {% endif %}
     
     </div>


@@ -107,5 +109,6 @@
                 </ul>
             {% endif %}
         </div>
                 </ul>
             {% endif %}
         </div>

+        <div class="clearboth"></div>

     </div>
 {% endblock %}
\ No newline at end of file
     </div>
 {% endblock %}
\ No newline at end of file