X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1615c0eec40aa73f7662469eaeb082ac14477d11..fc41499fbd1fde6a32eff57cd7553ea56780b5ba:/wolnelektury/templates/catalogue/tagged_object_list.html

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index fe8abc86c..b24929cd9 100644
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load catalogue_tags pagination_tags %}
+{% load catalogue_tags pagination_tags switch_tag %}
 
 {% block title %}{% title_from_tags tags %} w WolneLektury.pl{% endblock %}
 
@@ -9,8 +9,8 @@
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>
     {% breadcrumbs tags %}
-    
-    {% if shelf_is_set and not object_list %}
+
+    {% if only_shelf and not object_list %}
     <div id="books-list">
         <h2>{% trans "Your shelf is empty" %}</h2>
         <p>{% trans "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." %}</p>
@@ -21,12 +21,13 @@
         {% with tags|last as last_tag %}
         {% if last_tag.has_description %}
             <div id="description">
-                {{ last_tag.description|safe }}
+                <div id='description-long'>{{ last_tag.description|safe }}</div>
+                <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:30 }}</div>
             </div>
             <div class="clearboth"></div>
-            <div id="toggle-description"><p>{% trans "Hide description" %} ▲</p></div>
+            <div id="toggle-description"><p></p></div>
         {% endif %}
-        {% if shelf_is_set %}
+        {% if only_shelf %}
             <a id="download-shelf" href="{% url download_shelf last_tag.slug %}">
                 {% trans "Download all books from this shelf" %}
             </a>
@@ -43,7 +44,7 @@
                     <div class="clearboth"></div>
                 </form>
             </div>
-            {% if user_is_owner %}
+            {% if only_my_shelf %}
             <div id="toggle-share-shelf"><p>{% trans "Share this shelf" %}</p></div>
             <div id="share-shelf">
                 <p>{% trans "Copy this link and share it with other people to let them see your shelf." %}
@@ -54,22 +55,34 @@
         {% endif %}
         {% if last_tag.gazeta_link %}
         <p><a href="{{ last_tag.gazeta_link }}">
-            {% ifequal last_tag.category "author" %}
-				{% trans "Read work's study of this author on Lektury.Gazeta.pl" %}
-			{% endifequal %}
-            {% ifequal last_tag.category "epoch" %}
-				{% trans "Read study of epoch" %} {{ last_tag }} {% trans "on Lektury.Gazeta.pl" %}
-			{% endifequal %}
+            {% switch last_tag.category %}
+                {% case "author" %}
+                    {% trans "Read work's study of this author on Lektury.Gazeta.pl" %}
+                {% case "epoch" %}
+                    {% blocktrans %}Read study of epoch {{ last_tag }} on Lektury.Gazeta.pl{% endblocktrans %}
+                {% case "kind" %}
+                    {% blocktrans %}Read study of kind {{ last_tag }} on Lektury.Gazeta.pl{% endblocktrans %}
+                {% case "genre" %}
+                    {% blocktrans %}Read study of genre {{ last_tag }} on Lektury.Gazeta.pl{% endblocktrans %}
+                {% else %}
+                    {% trans "Read related study on Lektury.Gazeta.pl" %}
+            {% endswitch %}
         </a></p>
         {% endif %}
         {% if last_tag.wiki_link %}
         <p><a href="{{ last_tag.wiki_link }}">
-            {% ifequal last_tag.category "author" %}
-				{% trans "Read article about this author on Wikipedia" %}
-			{% endifequal %}
-            {% ifequal last_tag.category "epoch"  %}
-				{% trans "Read article about epoch" %} {{ last_tag }} {% trans "on Wikipedia" %}
-			{% endifequal %}
+        	{% switch last_tag.category %}
+			    {% case "author" %}
+				    {% trans "Read article about this author on Wikipedia" %}
+				{% case "epoch" %}
+                    {% blocktrans %}Read article about epoch {{ last_tag }} on Wikipedia{% endblocktrans %}
+				{% case "kind" %}
+                    {% blocktrans %}Read article about kind {{ last_tag }} on Wikipedia{% endblocktrans %}
+				{% case "genre" %}
+                    {% blocktrans %}Read article about genre {{ last_tag }} on Wikipedia{% endblocktrans %}
+				{% else %}
+				    {% trans "Read related article on Wikipedia" %}
+			{% endswitch %}
         </a></p>
         {% endif %}
 
@@ -89,7 +102,7 @@
 					{% trans "This author's works are copyrighted." %}
 				{% else %}{% comment %} Is dead {% endcomment %}
             	    {% if last_tag.in_pd %}
-						<p>{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>		 
+						<p>{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>
 	                {% else %}
 						{% comment %} Is dead, but not yet in public domain {% endcomment %}
     	                <div>
@@ -126,7 +139,7 @@
             {% if categories.epoch %}
                 <h2>{% trans "Epochs" %}</h2>
                 {% tag_list categories.epoch tags %}
-            {% endif %}        
+            {% endif %}
         </div>
         <div id="themes-list">
             {% if categories.theme %}