Tags & produsers

generator/templates/event-with-programme-items.html

@@ -50,11 +50,7 @@
       {% for item in events %}
         <li id="{{ item.key }}">
           <h2>{% if item.time.value %}{{ item.time }}{% endif %} {{ item }}</h2>
-          <p class="event-infos"> 
-            {% for produser in item.produser|link_target_iterator %}
-            <a href="{{ produser.link }}" class="produser">{{ produser }}</a>
-            {% endfor %}
-          </p>
+          {% with item=item %}{% include "snippets/metadata.html" %}{% endwith %}
           {% if item.summary %}
             {{ item.summary }}
           {% else %}
@@ -68,7 +64,6 @@
             {% endfor %}
           </ul>
           {% endif %}
-          {% with item=item %}{% include "snippets/metadata.html" %}{% endwith %}
         </li>
       {% endfor %}
     {% endfor %}

generator/templates/produser.html

@@ -15,6 +15,11 @@
         <h2>Trajectory</h2>
         {{ trajectory.content }}
       </section>
+      {% with trajectory.tags|without_inline_links as tags %}
+        {% if tags %}
+          {% include "snippets/tags.html" %}
+        {% endif %}
+      {% endwith %}
     {% endfor %}
   {% endif %}
   

generator/templates/snippets/metadata.html

 {% load generator_utils %}
 
+{% with item.tags|without_inline_links as tags %}
+  {% if tags %}
+    <section class="item--metadata item--tags">
+      <h4>Tags</h4>
+      {% include "snippets/tags.html" %}
+    </section>
+  {% endif %}
+{% endwith %}
+
 {% combine_linkfields item.produser item.participant as produser_combined %}
 
-{% if item.tags and item.tags|without_inline_links %}
-<section class="item--metadata item--tags">
-  <h4>Tags</h4>
-  <ul class="inlinelist">
-  {% for tag in item.tags|without_inline_links|link_target_iterator %}
-    <li><a href="{{ tag.link }}" class="tag">{{ tag }}</a></li>
-  {% endfor %}
-  </ul>
-</section>
-{% endif %}
 {% if produser_combined %}
-<section class="item--produsers item--metadata">
-  <h4>Produsers</h4>
-  <ul class="inlinelist">
-  {% for produser in produser_combined|link_target_iterator %}
-    <li><a class="produser" href="{{ produser.link }}">{{ produser }}</a></li>
-  {% endfor %}
-</section>
+  <section class="item--produsers item--metadata">
+    <h4>Produsers</h4>
+    {% with produsers=produser_combined %}    
+      {% include "snippets/produsers.html" %}
+    {% endwith %}
+  </section>
 {% endif %}
\ No newline at end of file

generator/templates/snippets/produsers.html

+{% load generator_utils %}
+
+<ul class="inlinelist">
+  {% for produser in produsers|link_target_iterator %}
+    <li><a class="produser" href="{{ produser.link }}">{{ produser }}</a></li>
+  {% endfor %}
+</ul>
\ No newline at end of file

generator/templates/snippets/tags.html

+{% load generator_utils %}
+
+<ul class="inlinelist">
+{% for tag in tags|link_target_iterator %}
+  <li><a href="{{ tag.link }}" class="tag">{{ tag }}</a></li>
+{% endfor %}
+</ul>
\ No newline at end of file