Fixed #431: Template improvements (removed unused loaded tags and check of all html template files)

openslides/agenda/templates/agenda/overlay_speaker_projector.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <style type="text/css">
     /* List of speakers – overlay */

openslides/agenda/templates/agenda/overlay_speaker_widget.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <span>
     {% trans "List of speakers" %} <small class="grey">({% trans 'This overlay only appears on agenda slides if it is activated' %}.)</small>

openslides/agenda/templates/agenda/overview.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load mptt_tags %}
 {% load staticfiles %}

openslides/agenda/templates/agenda/speaker_widget.html

@@ -1,13 +1,12 @@
 {% load i18n %}
-{% load tags %}
 
 {% if perms.agenda.can_be_speaker %}
-<p><a href="{% url 'agenda_add_to_current_list_of_speakers' %}" class="btn"><i class="icon icon-speaker"></i> {% trans 'Put me on the current list of speakers' %}</a></p>
+    <p><a href="{% url 'agenda_add_to_current_list_of_speakers' %}" class="btn"><i class="icon icon-speaker"></i> {% trans 'Put me on the current list of speakers' %}</a></p>
 {% endif %}
 
 <p><a href="{% url 'agenda_current_list_of_speakers' %}" class="btn"><i class="icon icon-bell"></i> {% trans 'Go to current list of speakers' %}</a></p>
 
 {% if perms.agenda.can_manage_agenda %}
-<hr>
+    <hr>
-<a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
+    <a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
 {% endif %}

openslides/agenda/templates/projector/agenda_list_of_speaker.html

@@ -1,7 +1,6 @@
 {% extends 'base-projector.html' %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} – {{ item }}{% endblock %}
 

openslides/assignment/templates/projector/Assignment.html

@@ -1,6 +1,5 @@
 {% extends "base-projector.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 

openslides/core/templates/core/version.html

@@ -8,7 +8,7 @@
     <h1>{% trans 'Version' %}</h1>
     <ul>
     {% for version in versions %}
-        <li>{{ version.0 }} – {% trans "Version" %} {{ version.1 }}</li>
+        <li>{{ version.0 }} – {% trans 'Version' %} {{ version.1 }}</li>
     {% endfor %}
     </ul>
 {% endblock %}

openslides/motion/templates/motion/category_form.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block title %}

openslides/motion/templates/motion/motion_diff.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 

openslides/motion/templates/projector/Motion.html

@@ -1,6 +1,5 @@
 {% extends "base-projector.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 

openslides/participant/templates/participant/group_widget.html

@@ -3,7 +3,6 @@
 
 <ul style="line-height: 180%">
 {% for group in groups %}
-    {% if group.pk != 1 and group.pk != 2 %}
     <li class="{% if group.active %}activeline{% endif %}">
         <a href="{% url 'projector_activate_slide' group.sid  %}" class="activate_link btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
             <i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
@@ -14,10 +13,7 @@
         <a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
             <i class="icon-search"></i>
         </a>
-        <a href="{% model_url group 'view' %}">{{ group }}</a>
+        <a href="{% model_url group 'view' %}">{% trans group.name %}</a>
     </li>
-    {% endif %}
-{% empty %}
-    <li>{% trans 'No groups available.' %}</li>
 {% endfor %}
 </ul>

openslides/participant/templates/participant/user_detail.html

@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} – {{ shown_user }}{% endblock %}
 

openslides/participant/templates/projector/GroupSlide.html

@@ -1,22 +1,13 @@
 {% extends "base-projector.html" %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} - {{ title }}{% endblock %}
 
 {% block content %}
-    <div class="item_fullscreen">{{ group }}
+    <div class="item_fullscreen">{% trans group.name %}
         <span>
         <p><i>{{ group.user_set.all.count }} {% trans "participants" %}</i></p>
-        {% comment %}
-            TODO: print fullname (not username) of all group users [see #420]
-            <p>
-                {% if group.user_set.all %}
-                    {{ group.user_set.all|join:", " }}
-                {% endif %}
-            </p>
-        {% endcomment %}
         </span>
     </div>
 {% endblock %}

openslides/participant/templates/projector/UserSlide.html

@@ -1,7 +1,6 @@
 {% extends "base-projector.html" %}
 
 {% load i18n %}
-{% load tags %}
 
 {% block title %}{{ block.super }} - {{ title }}{% endblock %}
 
@@ -13,7 +12,9 @@
         {% endif %}
         <p>
             {% if shown_user.groups.all %}
-                {{ shown_user.groups.all|join:", " }}
+                {% for group in shown_user.groups.all %}
+                    {% trans group.name %}{% if not forloop.last %}, {% endif %}
+                {% endfor %}
             {% endif %}
         </p>
         </span>

openslides/projector/templates/projector/dashboard.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 

openslides/projector/templates/projector/live_view_widget.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <!-- projector control buttons -->
 {% if perms.projector.can_manage_projector %}

openslides/projector/templates/projector/new.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block title %}{{ block.super }} – {% trans "Custom slide" %}{% endblock %}

openslides/projector/templates/projector/overlay_countdown_widget.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <span>
     {% trans "Countdown for speaking time" %}:

openslides/projector/templates/projector/overlay_widget.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <ul class="overlay_list">
     {% for overlay in overlays %}

openslides/projector/templates/projector/welcome_widget.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 {% if welcometext %}
     <p>{{ welcometext|safe|linebreaks }}</p>

openslides/templates/403.html

@@ -1,8 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
-{% load i18n %}
-
 {% block content %}
     <h1>{{ error }}</h1>
 {% endblock %}

openslides/templates/404.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block content %}

openslides/templates/500.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block content %}

openslides/utils/templatetags/tags.py

@@ -27,13 +27,6 @@ def get_config(key):
     return config[key]
 
 
-@register.simple_tag
-def active(request, pattern):
-    if request.path.startswith(pattern):
-        return 'selected'
-    return ''
-
-
 @register.simple_tag
 def model_url(object, link='view'):
     # TODO: Rename to object_url