ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-05-30 23:25:49 +02:00
parent 17778ac80f
commit d5becd5c18
24 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/agenda/templates/agenda/overlay_speaker_projector.html
View File

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

1
openslides/agenda/templates/agenda/overlay_speaker_widget.html
View File

@ -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>

1
openslides/agenda/templates/agenda/overview.html
View File

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

7
openslides/agenda/templates/agenda/speaker_widget.html
View File

@ -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 %}

1
openslides/agenda/templates/projector/agenda_list_of_speaker.html
View File

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

1
openslides/assignment/templates/projector/Assignment.html
View File

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

2
openslides/core/templates/core/version.html
View File

@ -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 %}

1
openslides/motion/templates/motion/category_form.html
View File

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

1
openslides/motion/templates/motion/motion_diff.html
View File

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

1
openslides/motion/templates/projector/Motion.html
View File

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

6
openslides/participant/templates/participant/group_widget.html
View File

@ -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>

1
openslides/participant/templates/participant/user_detail.html
View File

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

11
openslides/participant/templates/projector/GroupSlide.html
View File

@ -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 %}

5
openslides/participant/templates/projector/UserSlide.html
View File

@ -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>

1
openslides/projector/templates/projector/dashboard.html
View File

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

1
openslides/projector/templates/projector/live_view_widget.html
View File

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

1
openslides/projector/templates/projector/new.html
View File

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

1
openslides/projector/templates/projector/overlay_countdown_widget.html
View File

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

1
openslides/projector/templates/projector/overlay_widget.html
View File

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

1
openslides/projector/templates/projector/welcome_widget.html
View File

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

3
openslides/templates/403.html
View File

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

1
openslides/templates/404.html
View File

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

1
openslides/templates/500.html
View File

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

7
openslides/utils/templatetags/tags.py
View File

@ -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