X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d52c76021eaf1621b4e55a6eba1df1c0404bd7dd..5b5ccdc9dc573482feaded2eaa8110bc65f27cb7:/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 7c33a3740..b729ca917 100644
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -1,88 +1,135 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load catalogue_tags pagination_tags switch_tag %}
+{% load catalogue_tags switch_tag social_tags %}
 
 {% block titleextra %}{% title_from_tags tags %}{% endblock %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
-    <div class="left-column">
-    <div class="page-desc">
-    <h1>{% title_from_tags tags %}</h1>
+<div class="left-column">
+  <div class="page-desc">
+    <h1>{% html_title_from_tags tags %}</h1>
 
     {% with tags|last as last_tag %}
     {% if last_tag.has_description %}
-        <div id="description">
-            <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></p></div>
+    <div id="description" class="normal-text">
+      <div id='description-long' style="display:none">{{ last_tag.description|safe }}</div>
+      <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:40 }}</div>
+    </div>
     {% endif %}
 
-
+    <div class="clearboth"></div>
     <div class="inline-tag-lists">
-    {% if categories.author %}
-        <p><span class="mono">{% trans "Authors" %}:</span>
-        {% inline_tag_list categories.author tags %}
-        </p>
-    {% endif %}
-    {% if categories.kind %}
-        <p><span class="mono">{% trans "Kinds" %}:</span>
-        {% inline_tag_list categories.kind tags %}
-        </p>
-    {% endif %}
-    {% if categories.genre %}
-        <p><span class="mono">{% trans "Genres" %}:</span>
-        {% inline_tag_list categories.genre tags %}
-        </p>
-    {% endif %}
-    {% if categories.epoch %}
-        <p><span class="mono">{% trans "Epochs" %}:</span>
-        {% inline_tag_list categories.epoch tags %}
-        </p>
-    {% endif %}
+      {% if categories.author %}
+      <div>
+	<div class="mono inline-header">{% trans "Authors" %}:</div>
+    	<div class="inline-body">
+	  {% inline_tag_list categories.author tags %}
+        </div>
+      </div>
+      {% endif %}
+      {% if categories.kind %}
+      <div>
+	<div class="mono inline-header">{% trans "Kinds" %}:</div>
+    	<div class="inline-body">
+	  {% inline_tag_list categories.kind tags %}
+        </div>
+      </div>
+      {% endif %}
+      {% if categories.genre %}
+      <div>
+	<div class="mono inline-header">{% trans "Genres" %}:</div>
+    	<div class="inline-body">
+	  {% inline_tag_list categories.genre tags %}
+        </div>
+      </div>
+      {% endif %}
+      {% if categories.epoch %}
+      <div class="inline-tag-list">
+	<div class="mono inline-header">{% trans "Epochs" %}:</div>
+    	<div class="inline-body">
+	  {% inline_tag_list categories.epoch tags %}
+        </div>
+      </div>
+      {% endif %}
+
+      {% if categories.theme %}
+      <div class="hidden-box-wrapper">
+	<p><a href="#" class="hidden-box-trigger theme-list-link mono">
+            {% trans "Motifs and themes" %}</a></p>
+	<div class="hidden-box">
+          {% tag_list categories.theme tags %}
+	</div>
+      </div>
+      {% endif %}
     </div>
 
-    {% if categories.theme %}
-        <div id="themes-list-wrapper">
-            <p><a href="#" id="themes-list-toggle" class="mono">{% trans "Motifs and themes" %}</a></p>
-            <div id="themes-list">
-                {% tag_list categories.theme tags %}
-            </div>
+    <div class="clearboth"></div>
+
+
+	{% if theme_is_set %}
+        <div class="see-also">
+            {% if last_tag.gazeta_link or last_tag.wiki_link %}
+            <h2 class='mono'>{% trans "See also" %}:</h2>
+            <ul>
+        {% if last_tag.gazeta_link %}
+        <li><a href="{{ last_tag.gazeta_link }}">
+        	{% trans "in Lektury.Gazeta.pl" %}
+        </a></li>
+        {% endif %}
+        {% if last_tag.wiki_link %}
+        <li><a href="{{ last_tag.wiki_link }}">
+			{% trans "in Wikipedia" %}
+        </a></li>
+        {% endif %}
+            </ul>
+            {% endif %}
         </div>
     {% endif %}
 
+
     </div>
     </div>
 
 
     <div class="right-column">
-        <a href="" class="cite">
-            <div class="cite-body">
-            Dobranoc, obróć jeszcze raz na mnie oczęta,<br/>
-            (…) Daj mi pierś ucałować<br/>
-            Dobranoc, zapięta.
-            </div>
-            <p class="mono">Adam Mickiewicz, Dziady część III</p>
-        </a>
+        {% if theme_is_set %}
+            {% work_list object_list %}
+        {% else %}
+        {% cite_promo tags 1 %}
 
         <div class="see-also">
+            {% if last_tag.gazeta_link or last_tag.wiki_link %}
             <h2 class='mono'>{% trans "See also" %}:</h2>
             <ul>
-                <li><a href="">Wiki</a></li>
-                <li><a href="">Gazeta</a></li>
+        {% if last_tag.gazeta_link %}
+        <li><a href="{{ last_tag.gazeta_link }}">
+        	{% trans "in Lektury.Gazeta.pl" %}
+        </a></li>
+        {% endif %}
+        {% if last_tag.wiki_link %}
+        <li><a href="{{ last_tag.wiki_link }}">
+			{% trans "in Wikipedia" %}
+        </a></li>
+        {% endif %}
+
+
+
             </ul>
+            {% endif %}
         </div>
 
         <div class="download">
+            {% comment %}
             <h2 class='mono'>{% trans "Download" %}:</h2>
             <ul>
                 <li><a href="">wszystko</a></li>
                 <li><a href="">część</a></li>
             </ul>
+            {% endcomment %}
         </div>
+        {% endif %}
 
     </div>
 
@@ -90,64 +137,15 @@
 
 
 
-
-    {% autopaginate object_list 10 %}
+    {% if not theme_is_set %}
     <div id="books-list">
-
-
-        {% if last_tag.gazeta_link %}
-        <p><a href="{{ last_tag.gazeta_link }}">
-            {% 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 }}">
-        	{% 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 %}
-
         {% if object_list %}
-            {% spaceless %}
-            <ol>
-            {% for book in object_list %}
-                <li>
-                    {% if user_is_owner %}
-                        <a href="{% url remove_from_shelf last_tag.slug book.slug %}" class="remove-from-shelf">{% trans "Delete" %}</a>
-                    {% endif %}
-                    {{ book.short_html }}</li>
-            {% endfor %}
-            </ol>
-            {% endspaceless %}
-            {% paginate %}
+            {% work_list object_list %}
         {% else %}
             {% trans "Sorry! Search cirteria did not match any resources." %}
             {% include "info/join_us.html" %}
         {% endif %}
-        {% endwith %}
     </div>
-	{% if object_list %}
-	{% comment %} If we didn't find anything there will be nothing on the right side as well {% endcomment %}
-	{% endif %}
+    {% endif %}
+    {% endwith %}
 {% endblock %}