X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/41e79f5deff58b34f185c8c7426f505793c1d9c7..916aa587c9cc241044c57493f5f4aea5d0b7a2de:/wolnelektury/templates/catalogue/book_detail.html

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 7963fe6a9..4a8a9313c 100644
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -7,11 +7,11 @@
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
-    <h1>{{ book.title }}, {{ categories.author|join:", " }}</h1>
+    <h1>{% book_title book %}</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 id="books-list">
         {% if extra_info.license %}
         <p>{% trans "Work is licensed under " %}<a href="{{ extra_info.license }}">{{ extra_info.license_description }}</a>.</p>
@@ -19,9 +19,10 @@
         <p>{% trans "Based on" %}: {{ extra_info.source_name }}</p>
         {% if book.has_description %}
             <div id="description">
-                {{ book.description|safe }}
+                <div id='description-long'>{{ book.description|safe }}</div>
+                <div id='description-short'>{{ book.description|safe|truncatewords_html:30 }}</div>
             </div>
-            <div id="toggle-description"><p>{% trans "Hide description" %} ▲</p></div>
+            <div id="toggle-description"><p></p></div>
         {% endif %}
         <div id="formats">
             <p class="change-sets">{% trans "Put a book" %} <span><a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">{% trans "on the shelf!" %}</a></span></p>
@@ -44,7 +45,7 @@
             {% endif %}
             {% if book.mp3_file %}
                 <div id="czytamy-sluchajac-info">
-                    <a href="http://czytamysluchajac.pl/" id="czytamysluchajac-logo"><img src="{{ STATIC_URL }}img/czytamysluchajac-logo-small.png" /></a>     
+                    <a href="http://czytamysluchajac.pl/" id="czytamysluchajac-logo"><img src="{{ STATIC_URL }}img/czytamysluchajac-logo-small.png" /></a>
                     <p>{% trans "Artist" %}: {{ book.get_extra_info_value.artist_name }}</p>
 					{% if book.get_extra_info_value.director_name %}
                         <p>{% trans "Director" %}: {{ book.get_extra_info_value.director_name }}</p>
@@ -62,7 +63,7 @@
             {% endif %}
             </div>
         </div>
-    
+
         {% if book_children %}
         {% autopaginate book_children 10 %}
         <div id="book-children">
@@ -74,35 +75,36 @@
         </div>
         {% paginate %}
         {% endif %}
-    
+
     </div>
-        
+
     <div id="tags-list">
         <div id="book-info">
             <h2>{% trans "Details" %}</h2>
             <ul>
                 <li>
-                    {% trans "Author" %}: 
+                	
+                    {% trans "Author" %}:
                     {% for tag in categories.author %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
+                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
                     {% endfor %}
                 </li>
                 <li>
                     {% trans "Epoch" %}:
                     {% for tag in categories.epoch %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
+                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
                     {% endfor %}
                 </li>
                 <li>
                     {% trans "Kind" %}:
                     {% for tag in categories.kind %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
+                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
                     {% endfor %}
                 </li>
                 <li>
                     {% trans "Genre" %}:
                     {% for tag in categories.genre %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
+                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
                     {% endfor %}
                 </li>
             </ul>