Updated and fixes.

[wolnelektury.git] / src / catalogue / templates / catalogue / inline_tag_list.html

diff --git a/src/catalogue/templates/catalogue/inline_tag_list.html b/src/catalogue/templates/catalogue/inline_tag_list.html
old mode 100755 (executable)
new mode 100644 (file)
index 59b1acc..a552d91
--- a/src/catalogue/templates/catalogue/inline_tag_list.html
+++ b/src/catalogue/templates/catalogue/inline_tag_list.html
@@ -1,17 +1,27 @@
 {% load i18n %}
 {% load catalogue_tags %}
-{% if one_tag %}
-    {% trans "See full category" %} <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a>
-{% else %}
-       <ul>
-       {% if choices %}
-        {% for tag in tags %}
-            <li><a href="{% catalogue_url choices tag %}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
-        {% endfor %}
-        {% else %}
-        {% for tag in tags %}
-            <li><a href="{{ tag.get_absolute_url }}">{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
-        {% endfor %}
-    {% endif %}
+
+{% if choices %}
+  {% if category_choices %}
+    <ul>
+      {% for tag in category_choices %}
+        <li class="active">{{ tag }} <a href="{% catalogue_url list_type choices -tag %}">X</a></li>
+      {% endfor %}
     </ul>
+  {% endif %}
+{% endif %}
+{% if tags %}
+  <ul>
+    {% for tag in tags %}
+      <li><a href="{% catalogue_url list_type choices tag %}">{{ tag }}{% if tag.count %}&nbsp;({{ tag.count }}){% endif %}</a></li>
+    {% endfor %}
+  </ul>
+{% endif %}
+{% if other %}
+  <ul>
+    <li class="header">{% trans "Other" %}:</li>
+    {% for tag in other %}
+      <li class="other"><a href="{% catalogue_url list_type tag %}">{{ tag }}</a></li>
+    {% endfor %}
+  </ul>
 {% endif %}