From d5becd5c183e22c2acc233d840f4569c023e97a8 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 30 May 2013 23:25:49 +0200
Subject: [PATCH] Fixed #431: Template improvements (removed unused loaded tags
 and check of all html template files)

---
 .../templates/agenda/overlay_speaker_projector.html   |  1 -
 .../templates/agenda/overlay_speaker_widget.html      |  1 -
 openslides/agenda/templates/agenda/overview.html      |  1 -
 .../agenda/templates/agenda/speaker_widget.html       |  7 +++----
 .../templates/projector/agenda_list_of_speaker.html   |  1 -
 .../assignment/templates/projector/Assignment.html    |  1 -
 openslides/core/templates/core/version.html           |  2 +-
 openslides/motion/templates/motion/category_form.html |  1 -
 openslides/motion/templates/motion/motion_diff.html   |  1 -
 openslides/motion/templates/projector/Motion.html     |  1 -
 .../templates/participant/group_widget.html           |  6 +-----
 .../templates/participant/user_detail.html            |  1 -
 .../participant/templates/projector/GroupSlide.html   | 11 +----------
 .../participant/templates/projector/UserSlide.html    |  5 +++--
 .../projector/templates/projector/dashboard.html      |  1 -
 .../templates/projector/live_view_widget.html         |  1 -
 openslides/projector/templates/projector/new.html     |  1 -
 .../templates/projector/overlay_countdown_widget.html |  1 -
 .../projector/templates/projector/overlay_widget.html |  1 -
 .../projector/templates/projector/welcome_widget.html |  1 -
 openslides/templates/403.html                         |  3 ---
 openslides/templates/404.html                         |  1 -
 openslides/templates/500.html                         |  1 -
 openslides/utils/templatetags/tags.py                 |  7 -------
 24 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/openslides/agenda/templates/agenda/overlay_speaker_projector.html b/openslides/agenda/templates/agenda/overlay_speaker_projector.html
index 64657f208..cb86881ef 100644
--- a/openslides/agenda/templates/agenda/overlay_speaker_projector.html
+++ b/openslides/agenda/templates/agenda/overlay_speaker_projector.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <style type="text/css">
     /* List of speakers – overlay */
diff --git a/openslides/agenda/templates/agenda/overlay_speaker_widget.html b/openslides/agenda/templates/agenda/overlay_speaker_widget.html
index f16ed747d..dce965148 100644
--- a/openslides/agenda/templates/agenda/overlay_speaker_widget.html
+++ b/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>
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index aa7bc918a..6cda8851f 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load mptt_tags %}
 {% load staticfiles %}
diff --git a/openslides/agenda/templates/agenda/speaker_widget.html b/openslides/agenda/templates/agenda/speaker_widget.html
index f01b901c4..0e5567ec7 100644
--- a/openslides/agenda/templates/agenda/speaker_widget.html
+++ b/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>
-<a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
+    <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>
 {% endif %}
diff --git a/openslides/agenda/templates/projector/agenda_list_of_speaker.html b/openslides/agenda/templates/projector/agenda_list_of_speaker.html
index 2af7fa492..726180c39 100644
--- a/openslides/agenda/templates/projector/agenda_list_of_speaker.html
+++ b/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 %}
 
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 761e70bf1..0819069d9 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -1,6 +1,5 @@
 {% extends "base-projector.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/core/templates/core/version.html b/openslides/core/templates/core/version.html
index b83508bcc..90d251749 100644
--- a/openslides/core/templates/core/version.html
+++ b/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 %}
diff --git a/openslides/motion/templates/motion/category_form.html b/openslides/motion/templates/motion/category_form.html
index 421b3a019..facb2d6b0 100644
--- a/openslides/motion/templates/motion/category_form.html
+++ b/openslides/motion/templates/motion/category_form.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block title %}
diff --git a/openslides/motion/templates/motion/motion_diff.html b/openslides/motion/templates/motion/motion_diff.html
index a390596fc..c9d0720e2 100644
--- a/openslides/motion/templates/motion/motion_diff.html
+++ b/openslides/motion/templates/motion/motion_diff.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/motion/templates/projector/Motion.html b/openslides/motion/templates/projector/Motion.html
index 66037a134..ce27266dc 100644
--- a/openslides/motion/templates/projector/Motion.html
+++ b/openslides/motion/templates/projector/Motion.html
@@ -1,6 +1,5 @@
 {% extends "base-projector.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/participant/templates/participant/group_widget.html b/openslides/participant/templates/participant/group_widget.html
index 40adca27d..8f418dc6f 100644
--- a/openslides/participant/templates/participant/group_widget.html
+++ b/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>
diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html
index a19289414..50a384da2 100644
--- a/openslides/participant/templates/participant/user_detail.html
+++ b/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 %}
 
diff --git a/openslides/participant/templates/projector/GroupSlide.html b/openslides/participant/templates/projector/GroupSlide.html
index 3de117e95..742d624fd 100644
--- a/openslides/participant/templates/projector/GroupSlide.html
+++ b/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 %}
diff --git a/openslides/participant/templates/projector/UserSlide.html b/openslides/participant/templates/projector/UserSlide.html
index c338cda02..4c426a8ee 100644
--- a/openslides/participant/templates/projector/UserSlide.html
+++ b/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>
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 11532e60f..cadcc45d3 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index fff19fb7c..3c48813a1 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/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 %}
diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html
index f61e5a049..d7d0c0144 100644
--- a/openslides/projector/templates/projector/new.html
+++ b/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 %}
diff --git a/openslides/projector/templates/projector/overlay_countdown_widget.html b/openslides/projector/templates/projector/overlay_countdown_widget.html
index c79e4fc40..22152373e 100644
--- a/openslides/projector/templates/projector/overlay_countdown_widget.html
+++ b/openslides/projector/templates/projector/overlay_countdown_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <span>
     {% trans "Countdown for speaking time" %}:
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index 006136248..e132da98c 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 <ul class="overlay_list">
     {% for overlay in overlays %}
diff --git a/openslides/projector/templates/projector/welcome_widget.html b/openslides/projector/templates/projector/welcome_widget.html
index 68461cacb..95917be00 100644
--- a/openslides/projector/templates/projector/welcome_widget.html
+++ b/openslides/projector/templates/projector/welcome_widget.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load tags %}
 
 {% if welcometext %}
     <p>{{ welcometext|safe|linebreaks }}</p>
diff --git a/openslides/templates/403.html b/openslides/templates/403.html
index acb867cbb..c21b8cb3c 100644
--- a/openslides/templates/403.html
+++ b/openslides/templates/403.html
@@ -1,8 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
-{% load i18n %}
-
 {% block content %}
     <h1>{{ error }}</h1>
 {% endblock %}
diff --git a/openslides/templates/404.html b/openslides/templates/404.html
index ba0690928..4aeb91eb7 100644
--- a/openslides/templates/404.html
+++ b/openslides/templates/404.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/openslides/templates/500.html b/openslides/templates/500.html
index 4469ff3b0..3fd96db4a 100644
--- a/openslides/templates/500.html
+++ b/openslides/templates/500.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/openslides/utils/templatetags/tags.py b/openslides/utils/templatetags/tags.py
index 7563ebfb2..87c17e4e1 100644
--- a/openslides/utils/templatetags/tags.py
+++ b/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