use html5 placeholder and hide labels,

[wolnelektury.git] / 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 1a6843a..c7898d5 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -9,45 +9,55 @@
 {% block body %}
     <div class="left-column">
     <div class="page-desc">
-    <h1>{% title_from_tags tags %}</h1>
+    <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 id="description" class="normal-text">
+            <div id='description-long' style="diplay:none">{{ last_tag.description|safe }}</div>
+            <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:40 }}</div>
         </div>
-        <div class="clearboth"></div>
-        <div id="toggle-description"><p></p></div>
     {% endif %}
 
 
     <div class="inline-tag-lists">
     {% if categories.author %}
-        <p><span class="mono">{% trans "Authors" %}:</span>
-        {% inline_tag_list categories.author tags %}
-        </p>
+       <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 %}
-        <p><span class="mono">{% trans "Kinds" %}:</span>
-        {% inline_tag_list categories.kind tags %}
-        </p>
+       <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 %}
-        <p><span class="mono">{% trans "Genres" %}:</span>
-        {% inline_tag_list categories.genre tags %}
-        </p>
+       <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 %}
-        <p><span class="mono">{% trans "Epochs" %}:</span>
-        {% inline_tag_list categories.epoch tags %}
-        </p>
+       <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 %}
     </div>
 
     {% if categories.theme %}
         <div class="hidden-box-wrapper">
-            <p><a href="#" class="hidden-box-trigger theme-list-link" class="mono">
+            <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 %}
@@ -60,6 +70,9 @@
 
 
     <div class="right-column">
+        {% if theme_is_set %}
+            {% work_list object_list %}
+        {% else %}
         {% cite_promo tags 1 %}
 
         <div class="see-also">
@@ -68,34 +81,12 @@
             <ul>
         {% if last_tag.gazeta_link %}
         <li><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 %}
+               {% trans "in Lektury.Gazeta.pl" %}
         </a></li>
         {% endif %}
         {% if last_tag.wiki_link %}
         <li><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 %}
+                       {% trans "in Wikipedia" %}
         </a></li>
         {% endif %}
 
@@ -114,6 +105,7 @@
             </ul>
             {% endcomment %}
         </div>
+        {% endif %}
 
     </div>
 
@@ -121,7 +113,7 @@
 
 
 
-
+    {% if not theme_is_set %}
     <div id="books-list">
         {% if object_list %}
             {% work_list object_list %}
@@ -129,6 +121,7 @@
             {% trans "Sorry! Search cirteria did not match any resources." %}
             {% include "info/join_us.html" %}
         {% endif %}
-        {% endwith %}
     </div>
+    {% endif %}
+    {% endwith %}
 {% endblock %}