Merge branch 'display-tags' into 'develop'

Tags mit Icon prefixen & für Events anzeigen

Closes #669

See merge request hub/hub!1112

src/plainui/jinja2/plainui/assembly.html.j2

@@ -41,7 +41,7 @@
             {{ assembly.assembly_location }}
           </div>
         {% endif %}
-        {{ tagboxMacro.tagbox(assembly.public_tags) }}
+        {{ tagboxMacro.tagbox(assembly.public_tags, icon='tag') }}
         {% if assembly.description != None and assembly.description != "" -%}
           <div class="hub-text">{{- markdownMacro.markdown(markdown=assembly.description_html | safe, border=False) -}}</div>
         {% endif %}

src/plainui/jinja2/plainui/components/list_assemblies.html.j2

@@ -56,10 +56,10 @@
             ) }}
           {% endif %}
         {% endif %}
-        {% if assembly.prefetched_tags and (assembly.events__count or assembly.projects__count) %}
+        {% if assembly.prefetched_tags and (assembly.public_events_count or assembly.public_projects_count) %}
           <div class="hub-tag-divider"></div>
         {% endif %}
-        {{ tagboxMacro.tagbox(assembly.prefetched_tags) }}
+        {{ tagboxMacro.tagbox(assembly.prefetched_tags, icon='tag') }}
       </div>
     {% endif %}
   </li>

src/plainui/jinja2/plainui/event.html.j2

@@ -117,7 +117,7 @@
                   </div>
                 {% endif %}
 
-                {% if tags %}{{ tagboxMacro.tagbox(event.prefetched_tags, icon='tag') }}{% endif %}
+                {% if tags %}{{ tagboxMacro.tagbox(tags, icon='tag') }}{% endif %}
               </div>
             </div>
 

src/plainui/jinja2/plainui/projects/detail.html.j2

@@ -59,7 +59,7 @@
               </div>
             {% endif %}
           </div>
-          {{ tagMacros.tagbox(project.prefetched_tags) }}
+          {{ tagMacros.tagbox(project.prefetched_tags, icon='tag') }}
 
           {% if project.description %}
             {{ markdownMacro.markdown(markdown=project.description_html | safe, border=False) }}