fix some typos, mostly {%trans to {% trans

This commit is contained in:
Oskar Hahn 2012-07-16 14:00:29 +02:00
parent 7dbbeba624
commit 0b033271f8
40 changed files with 233 additions and 233 deletions

20
INSTALL
View File

@ -19,11 +19,11 @@ I. Installation on Windows (32/64bit)
installed first: Python Programming Language 2.7,
Setuptools, ReportLab Toolkit, Python Imaging Library (PIL),
Django and django-mptt:
a) Download and run 32bit MSI installer from http://www.python.org/:
http://python.org/ftp/python/2.7.3/python-2.7.3.msi
b) Add python dirs to PATH (via Control Panel > System > Advanced):
";C:\Python27;C:\Python27\Scripts"
@ -32,12 +32,12 @@ I. Installation on Windows (32/64bit)
Download and run 32bit binary installer from
http://pypi.python.org/pypi/setuptools:
http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe
d) Install ReportLab Toolkit, Python Imaging Library (PIL), Django
and django-mptt:
Open command line (cmd) and run:
easy_install django django-mptt reportlab pil
@ -54,9 +54,9 @@ I. Installation on Windows (32/64bit)
b) Clone development version from mercurial repository
http://hg.openslides.org. This requires Mercurial source control
management (hg), see http://mercurial.selenic.com.
Open command line (cmd) and run:
hg clone http://hg.openslides.org OpenSlides
3. Start OpenSlides server and open URL in your default browser:
@ -80,7 +80,7 @@ II. Installation on GNU/Linux and MacOSX
OpenSlides requires following programs, which should be
installed first: Python Programming Language 2 (>= 2.5),
virtualenv (>= 1.4.1), ReportLab Toolkit and
virtualenv (>= 1.4.1), ReportLab Toolkit and
Python Imaging Library (PIL):
E.g. for ubuntu run:
@ -95,7 +95,7 @@ II. Installation on GNU/Linux and MacOSX
b) Clone development version from mercurial repository
http://hg.openslides.org. This requires Mercurial source control
management (hg):
E.g. for Ubuntu run:
$ sudo apt-get install mercurial
$ hg clone http://hg.openslides.org OpenSlides
@ -135,5 +135,5 @@ II. Installation on GNU/Linux and MacOSX
7. Restart OpenSlides:
To restart OpenSlides after closing the terminal activate the
virtual envirnonment (see 4.) before starting the server (see 6.).
virtual environment (see 4.) before starting the server (see 6.).

View File

@ -7,13 +7,13 @@
{% block submenu %}
{% url item_overview as url_itemoverview %}
{% url item_new as url_itemnew %}
<h4 class="sectiontitle">{%trans "Agenda" %}</h4>
<h4 class="sectiontitle">{% trans "Agenda" %}</h4>
<ul>
<li class="{% if request.path == url_itemoverview %}selected{% endif %}"><a href="{% url item_overview %}">{%trans "All items" %}</a></li>
<li class="{% if request.path == url_itemoverview %}selected{% endif %}"><a href="{% url item_overview %}">{% trans "All items" %}</a></li>
{% if perms.agenda.can_manage_agenda %}
<li class="{% active request '/agenda/new/' %}"><a href="{% url item_new %}">{%trans "New item" %}</a></li>
<li class="{% active request '/agenda/new/' %}"><a href="{% url item_new %}">{% trans "New item" %}</a></li>
{% endif %}
<li><a href="{% url print_agenda %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Agenda as PDF' %}</a></li>
<li><a href="{% url print_agenda %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Agenda as PDF' %}</a></li>
</ul>
{# second submenu #}
@ -23,19 +23,19 @@
<ul>
{# view item #}
{% url item_view item.id as url_itemview %}
<li class="{% if request.path == url_itemview %}selected{% endif %}"><a href="{% url item_view item.id %}">{%trans 'View item' %}</a></li>
<li class="{% if request.path == url_itemview %}selected{% endif %}"><a href="{% url item_view item.id %}">{% trans 'View item' %}</a></li>
{% if perms.agenda.can_manage_agenda %}
{# edit item #}
{% url item_edit item.id as url_itemedit %}
<li class="{% if request.path == url_itemedit %}selected{% endif %}"><a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit item' %}</a></li>
<li class="{% if request.path == url_itemedit %}selected{% endif %}"><a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit item' %}</a></li>
{# delete item #}
<li><a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete item' %}</a></li>
<li><a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete item' %}</a></li>
{% endif %}
{# activate item #}
{% if perms.projector.can_manage_projector %}
<li><a href="{% url projector_activate_slide item.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show item' %}</a></li>
<li><a href="{% url projector_activate_slide item.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show item' %}</a></li>
{% endif %}
</ul>
{% endif %}

View File

@ -5,16 +5,16 @@
{% block title %}{{ block.super }} {% trans "Agenda settings" %}{% endblock %}
{% block content %}
<h1>{%trans "Agenda settings" %}</h1>
<h1>{% trans "Agenda settings" %}</h1>
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href='{% url config_agenda %}'>
<button class="button" type="button" onclick="window.location='{% url config_agenda %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}
{{ block.super }}
{{ block.super }}
{% if item %}
{{ item.title }} {% trans "Edit item" %}
{% else %}
@ -13,25 +13,25 @@
{% block content %}
{% if item %}
<h1>{%trans "Edit item" %}</h1>
<h1>{% trans "Edit item" %}</h1>
{% else %}
<h1>{%trans "New item" %}</h1>
<h1>{% trans "New item" %}</h1>
{% endif %}
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url item_overview %}'>
<button class="button" type="button" onclick="window.location='{% url item_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>
<small>* {%trans "required" %}</small>
<small>* {% trans "required" %}</small>
</form>
{% endblock %}

View File

@ -44,7 +44,7 @@
<div id="changed-order-message" style="display:none" class="notification warning">
<em>{% trans "Do you want to save the changed order of agenda items?" %}<br>
<input type="submit" value="{% trans 'Yes' %}">
<input type="button" onclick="window.location.href='{% url item_overview %}';" value="{%trans 'No' %}">
<input type="button" onclick="window.location.href='{% url item_overview %}';" value="{% trans 'No' %}">
</em>
</div>
{% endif %}
@ -52,8 +52,8 @@
<h1>{% trans "Agenda" %}</h1>
<p>
{%trans "Filter" %}:
<input type="checkbox" id="hide_closed_items"> {%trans "Hide closed items" %}
{% trans "Filter" %}:
<input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
</p>
{{ items|length }}
{% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
@ -99,7 +99,7 @@
{% endfor %}
{% else %}
<tr>
<td colspan="4"><i>{%trans "No items available." %}</i></td>
<td colspan="4"><i>{% trans "No items available." %}</i></td>
</tr>
{% endif %}
</table>

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}{{ block.super }} -
{% if title %} {{ title }} {% else %} {%trans "Agenda" %} {% endif %}
{% if title %} {{ title }} {% else %} {% trans "Agenda" %} {% endif %}
{% endblock %}
{% block content %}

View File

@ -6,16 +6,16 @@
{% block submenu %}
{% url application_overview as url_applicationoverview %}
<h4>{%trans "Applications" %}</h4>
<h4>{% trans "Applications" %}</h4>
<ul>
<li class="{% if request.path == url_applicationoverview %}selected{% endif %}"><a href="{% url application_overview %}">{%trans "All applications" %}</a></li>
<li class="{% if request.path == url_applicationoverview %}selected{% endif %}"><a href="{% url application_overview %}">{% trans "All applications" %}</a></li>
{% if perms.application.can_create_application or perms.application.can_manage_application %}
<li class="{% active request '/application/new' %}"><a href="{% url application_new %}">{%trans "New application" %}</a></li>
<li class="{% active request '/application/new' %}"><a href="{% url application_new %}">{% trans "New application" %}</a></li>
{% endif %}
{% if perms.application.can_manage_application %}
<li class="{% active request '/application/import' %}"><a href="{% url application_import %}">{%trans 'Import applications' %}</a></li>
<li class="{% active request '/application/import' %}"><a href="{% url application_import %}">{% trans 'Import applications' %}</a></li>
{% endif %}
<li><a href="{% url print_applications %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'All applications as PDF' %}</a></li>
<li><a href="{% url print_applications %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All applications as PDF' %}</a></li>
</ul>
{# second submenu #}
@ -31,22 +31,22 @@
<ul>
{# view application #}
{% url application_view application.id as url_applicationview %}
<li class="{% if request.path == url_applicationview %}selected{% endif %}"><a href="{% url application_view application.id %}">{%trans 'View application' %}</a></li>
<li class="{% if request.path == url_applicationview %}selected{% endif %}"><a href="{% url application_view application.id %}">{% trans 'View application' %}</a></li>
{# edit application #}
{% if "edit" in actions %}
{% url application_edit application.id as url_applicationedit %}
<li class="{% if request.path == url_applicationedit %}selected{% endif %}"><a href="{% url application_edit application.id %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit application' %}</a></li>
<li class="{% if request.path == url_applicationedit %}selected{% endif %}"><a href="{% url application_edit application.id %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit application' %}</a></li>
{% endif %}
{# delete application #}
{% if "delete" in actions %}
<li><a href="{% url application_delete application.id %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete application' %}</a></li>
<li><a href="{% url application_delete application.id %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete application' %}</a></li>
{% endif %}
{# PDF #}
<li><a href="{% url print_application application.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Application as PDF' %}</a></li>
<li><a href="{% url print_application application.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Application as PDF' %}</a></li>
{# activate and polls #}
{% if perms.projector.can_manage_projector %}
<li>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show Application' %}</a>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Application' %}</a>
</li>
{% endif %}
{% if perms.application.can_manage_application %}
@ -58,7 +58,7 @@
{# Agenda Item #}
{% if perms.agenda.can_manage_agenda %}
<li>
<a href="{% url application_create_agenda application.id %}">{%trans 'New agenda item' %}</a>
<a href="{% url application_create_agenda application.id %}">{% trans 'New agenda item' %}</a>
</li>
{% endif %}
</ul>

View File

@ -5,16 +5,16 @@
{% block title %}{{ block.super }} {% trans "Application settings" %}{% endblock %}
{% block content %}
<h1>{%trans "Application settings" %}</h1>
<h1>{% trans "Application settings" %}</h1>
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href='{% url config_application %}'>
<button class="button" type="button" onclick="window.location='{% url config_application %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}
{{ block.super }}
{{ block.super }}
{% if application %}
{% trans "Edit application" %}
{% else %}
@ -13,9 +13,9 @@
{% block content %}
{% if application %}
<h1>{%trans "Edit application" %}</h1>
<h1>{% trans "Edit application" %}</h1>
{% else %}
<h1>{%trans "New application" %}</h1>
<h1>{% trans "New application" %}</h1>
{% endif %}
<form action="" method="post">{% csrf_token %}
@ -23,18 +23,18 @@
{{ managerform.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url application_overview %}'>
<button class="button" type="button" onclick="window.location='{% url application_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>
<small>* {%trans "required" %}</small>
<small>* {% trans "required" %}</small>
</form>
{% endblock %}

View File

@ -5,7 +5,7 @@
{% block title %}{{ block.super }} {% trans "Import applications" %} {% endblock %}
{% block content %}
<h1>{%trans "Import applications" %}</h1>
<h1>{% trans "Import applications" %}</h1>
<p>{% trans 'Select a CSV file to import applications!' %}</p>
<p>{% trans 'Required comma separated values: <code>{number, title, text, reason, first_name, last_name}</code> (<code>number</code> and <code>reason</code> are optional and may be empty)' %}
@ -20,14 +20,14 @@
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon import">{%trans 'Import' %}</span>
<span class="icon import">{% trans 'Import' %}</span>
</button>
<a href="{% url application_overview%}">
<button class="button" type="button" onclick="window.location='{% url application_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>
<small>* {%trans "required" %}</small>
<small>* {% trans "required" %}</small>
</form>
{% endblock %}

View File

@ -7,24 +7,24 @@
{% block title %}{{ block.super }} {% trans "Applications" %}{% endblock %}
{% block content %}
<h1>{%trans "Applications" %}</h1>
<h1>{% trans "Applications" %}</h1>
<p><form action="{{request.url}}" name="filter" method="get">
{%trans "Filter" %}:
{% trans "Filter" %}:
{% if min_supporters > 0 %}
<input type="checkbox" name="needsup" onchange="document.forms['filter'].submit()"
{% if 'on' in request.GET.needsup %}checked{% endif %}> {%trans "Need supporters" %} &nbsp;
{% if 'on' in request.GET.needsup %}checked{% endif %}> {% trans "Need supporters" %} &nbsp;
{% endif %}
<input type="checkbox" name="number" onchange="document.forms['filter'].submit()"
{% if 'on' in request.GET.number %}checked{% endif %}> {%trans "Without number" %} &nbsp;
{% if 'on' in request.GET.number %}checked{% endif %}> {% trans "Without number" %} &nbsp;
<input type="checkbox" name="status" onchange="document.forms['filter'].submit()"
{% if 'on' in request.GET.status %}checked{% endif %}> {%trans "Status" %}:
{% if 'on' in request.GET.status %}checked{% endif %}> {% trans "Status" %}:
<select class="default-input" name="statusvalue" onchange="{% if 'on' in request.GET.status %}document.forms['filter'].submit(){% endif %}">
<option value="pub" {% if 'pub' in request.GET.statusvalue %}selected{% endif %}>{%trans "Not yet permitted" %}</option>
<option value="per" {% if 'on' in request.GET.status and 'per' in request.GET.statusvalue %}selected{% endif %}>{%trans "Permitted" %}</option>
<option value="acc" {% if 'on' in request.GET.status and 'acc' in request.GET.statusvalue %}selected{% endif %}>{%trans "Accepted" %}</option>
<option value="rej" {% if 'on' in request.GET.status and 'rej' in request.GET.statusvalue %}selected{% endif %}>{%trans "Rejected" %}</option>
<option value="wit" {% if 'on' in request.GET.status and 'wit' in request.GET.statusvalue %}selected{% endif %}>{%trans "Withdrawed (by submitter)" %}</option>
<option value="rev" {% if 'rev' in request.GET.statusvalue %}selected{% endif %}>{%trans "Needs Review" %}</option>
<option value="pub" {% if 'pub' in request.GET.statusvalue %}selected{% endif %}>{% trans "Not yet permitted" %}</option>
<option value="per" {% if 'on' in request.GET.status and 'per' in request.GET.statusvalue %}selected{% endif %}>{% trans "Permitted" %}</option>
<option value="acc" {% if 'on' in request.GET.status and 'acc' in request.GET.statusvalue %}selected{% endif %}>{% trans "Accepted" %}</option>
<option value="rej" {% if 'on' in request.GET.status and 'rej' in request.GET.statusvalue %}selected{% endif %}>{% trans "Rejected" %}</option>
<option value="wit" {% if 'on' in request.GET.status and 'wit' in request.GET.statusvalue %}selected{% endif %}>{% trans "Withdrawed (by submitter)" %}</option>
<option value="rev" {% if 'rev' in request.GET.statusvalue %}selected{% endif %}>{% trans "Needs Review" %}</option>
</select>
</form>
</p>
@ -32,19 +32,19 @@
{% blocktrans count counter=applications|length %}application{% plural %}applications{% endblocktrans %}
<table>
<tr>
<th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Number" %}</a></th>
<th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Application title" %}</a></th>
<th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number" %}</a></th>
<th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Application title" %}</a></th>
{% if min_supporters > 0 %}
<th><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Number of supporters" %}</a></th>
<th><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th>
{% endif %}
<th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Status" %}</a></th>
<th><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Submitter" %}</a></th>
<th><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Creation Time" %}<a></th>
<th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
<th><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
<th><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
<th style="width: 1px;">{% trans "Actions" %}</th>
</tr>
{% for app_info in applications %}
{% with application=app_info.application useractions=app_info.actions %}
<tr class="{% cycle '' 'odd' %}
<tr class="{% cycle '' 'odd' %}
{% if application.active %}activeline{% endif %}">
<td>{% if application.number %}{{ application.number }}{% else %}-{% endif %}</td>
<td><a href="{% url application_view application.id %}">{{ application.public_version.title }}</a></td>
@ -74,14 +74,14 @@
<a href="{% url application_delete application.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete application' %}"></a>
{% endif %}
{% endif %}
<a href="{% url print_application application.id %}" title="{%trans 'Application as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
<a href="{% url print_application application.id %}" title="{% trans 'Application as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
</span>
</td>
</tr>
{% endwith %}
{% empty %}
<tr>
<td colspan="7"><i>{%trans "No applications available." %}</i></td>
<td colspan="7"><i>{% trans "No applications available." %}</i></td>
</tr>
{% endfor %}
</table>

View File

@ -42,21 +42,21 @@
<p>
<a href='{% url print_application_poll poll.id %}'>
<button class="button" type="button" onclick="window.location='{% url print_application_poll poll.id %}'">
<span class="icon pdf">{%trans 'Ballot paper as PDF' %}</span>
<span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
</button>
</a>
</p>
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url application_view application.id %}'>
<button class="button" type="button" onclick="window.location='{% url application_view application.id %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -51,7 +51,7 @@
{% if "genpoll" in actions %}
<a href='{% url application_gen_poll application.id %}'>
<span class="button">
<span class="icon statistics">{%trans 'New vote' %}</span>
<span class="icon statistics">{% trans 'New vote' %}</span>
</span>
</a>
{% else %}
@ -91,7 +91,7 @@
{% if forloop.last %}
{% if "genpoll" in actions %}
<a href='{% url application_gen_poll application.id %}'>
<span class="button"><span class="icon statistics">{%trans 'New vote' %}</span></span>
<span class="button"><span class="icon statistics">{% trans 'New vote' %}</span></span>
</a>
{% endif %}
{% endif %}
@ -99,7 +99,7 @@
{% else %}
{% if perms.application.can_manage_application %}
<a href='{% url application_poll_view poll.id %}'>
<span class="button"><span class="icon statistics">{%trans 'Enter result' %}</span></span>
<span class="button"><span class="icon statistics">{% trans 'Enter result' %}</span></span>
</a>
{% endif %}
{% endif %}
@ -116,7 +116,7 @@
{% if "wit" in actions and user == application.submitter %}
<p></p>
<a href='{% url application_set_status application.id 'wit' %}'>
<span class="button"><span class="icon revert">{%trans 'Withdraw' %}</span></span>
<span class="button"><span class="icon revert">{% trans 'Withdraw' %}</span></span>
</a>
{% endif %}
@ -167,12 +167,12 @@
<h4>{% trans "Result after vote" %}:</h4>
{% if "acc" in actions %}
<a href='{% url application_set_status application.id 'acc' %}'>
<span class="button"><span class="icon done">{%trans 'Accepted' %}</span></span>
<span class="button"><span class="icon done">{% trans 'Accepted' %}</span></span>
</a>
{% endif %}
{% if "rej" in actions %}
<a href='{% url application_set_status application.id 'rej' %}'>
<span class="button"><span class="icon reject">{%trans 'Rejected' %}</span></span>
<span class="button"><span class="icon reject">{% trans 'Rejected' %}</span></span>
</a>
{% endif %}
{% endif %}
@ -194,9 +194,9 @@
{% endif %}
<p></p>
<hr>
<h4>{%trans "For Administration only:" %}</h4>
<h4>{% trans "For Administration only:" %}</h4>
<a href='{% url application_reset application.id %}'>
<span class="button"><span class="icon undo">{%trans 'Reset' %}</span></span>
<span class="button"><span class="icon undo">{% trans 'Reset' %}</span></span>
</a>
</div>
{% endif %} {# end perms.application.can_support_application #}
@ -256,7 +256,7 @@
<td style="white-space:nowrap;">
{% if application.status != "pub" %}
{% if revision == application.permitted %}
<img title="{%trans 'Version permitted' %}" src="{% static 'images/icons/accept.png' %}">
<img title="{% trans 'Version permitted' %}" src="{% static 'images/icons/accept.png' %}">
{% else %}
{% if perms.application.can_manage_application %}
<a href="{% url application_version_permit revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>

View File

@ -4,11 +4,11 @@
{% load i18n %}
{% load staticfiles %}
{% block title %}{{ block.super }} - {%trans "Application" %} {{ application.number }}{% endblock %}
{% block title %}{{ block.super }} - {% trans "Application" %} {{ application.number }}{% endblock %}
{% block content %}
<div id="sidebar">
<div class="box">
<p><b>{%trans "Status" %}:</b><br>
<p><b>{% trans "Status" %}:</b><br>
{% if application.status != "pub" %}
{% if application.status == "acc" %}
<img src="{% static 'images/icons/voting-yes.png' %}">
@ -16,7 +16,7 @@
{% if application.status == "rej" %}
<img src="{% static 'images/icons/voting-no.png' %}">
{% endif %}
{%trans application.get_status_display %}
{% trans application.get_status_display %}
{% else %}
{% for note in application.notes %}
{{ note }}

View File

@ -11,13 +11,13 @@
{% block submenu %}
{% url assignment_overview as url_assignment_overview %}
<h4 class="sectiontitle">{%trans "Elections" %}</h4>
<h4 class="sectiontitle">{% trans "Elections" %}</h4>
<ul>
<li class="{% if request.path == url_assignment_overview %}selected{% endif %}"><a href="{% url assignment_overview %}">{%trans "All elections" %}</a></li>
<li class="{% if request.path == url_assignment_overview %}selected{% endif %}"><a href="{% url assignment_overview %}">{% trans "All elections" %}</a></li>
{% if perms.assignment.can_manage_assignment %}
<li class="{% active request '/assignment/new' %}"><a href="{% url assignment_new %}">{%trans "New election" %}</a></li>
<li class="{% active request '/assignment/new' %}"><a href="{% url assignment_new %}">{% trans "New election" %}</a></li>
{% endif %}
<li><a href="{% url print_assignment %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'All elections as PDF' %}</a></li>
<li><a href="{% url print_assignment %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All elections as PDF' %}</a></li>
</ul>
{# second submenu #}
@ -28,7 +28,7 @@
{# view assignemnt #}
{% url assignment_view assignment.id as url_assignmentview %}
<li class="{% if request.path == url_assignmentview %}selected{% endif %}">
<a href="{% url assignment_view assignment.id %}">{%trans 'View election' %}</a>
<a href="{% url assignment_view assignment.id %}">{% trans 'View election' %}</a>
</li>
{% if perms.assignment.can_manage_assignment %}
@ -36,31 +36,31 @@
{# edit assignemnt #}
{% url assignment_edit assignment.id as url_assignmentedit %}
<li class="{% if request.path == url_assignmentedit %}selected{% endif %}">
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit election' %}</a>
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit election' %}</a>
</li>
{# delete assignment #}
<li>
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete election' %}</a>
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete election' %}</a>
</li>
{% endif %}
{# PDF #}
<li>
<a href="{% url print_assignment assignment.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Election as PDF' %}</a>
<a href="{% url print_assignment assignment.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Election as PDF' %}</a>
</li>
{# activate #}
{% if perms.projector.can_manage_projector %}
<li>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide assignment.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show election' %}</a>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide assignment.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show election' %}</a>
</li>
{% endif %}
{# agenda #}
{% if perms.agenda.can_manage_agenda %}
<li>
<a href="{% url assignment_create_agenda assignment.id %}">{%trans 'New agenda item' %}</a>
<a href="{% url assignment_create_agenda assignment.id %}">{% trans 'New agenda item' %}</a>
</li>
{% endif %}

View File

@ -5,16 +5,16 @@
{% block title %}{{ block.super }} {% trans "Election settings" %}{% endblock %}
{% block content %}
<h1>{%trans "Election settings" %}</h1>
<h1>{% trans "Election settings" %}</h1>
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href='{% url config_assignment %}'>
<button class="button" type="button" onclick="window.location='{% url config_assignment %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}
{{ block.super }}
{{ block.super }}
{% if assignment %}
{% trans "Edit election" %}
{% else %}
@ -14,23 +14,23 @@
{% block content %}
{% if assignment %}
<h1>{%trans "Edit election" %}</h1>
<h1>{% trans "Edit election" %}</h1>
{% else %}
<h1>{%trans "New election" %}</h1>
<h1>{% trans "New election" %}</h1>
{% endif %}
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url assignment_overview %}'>
<button class="button" type="button" onclick="window.location='{% url assignment_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -6,15 +6,15 @@
{% block title %}{{ block.super }} {% trans "Elections" %}{% endblock %}
{% block content %}
<h1>{%trans "Elections" %}</h1>
<h1>{% trans "Elections" %}</h1>
<p><form action="{{request.url}}" name="filter" method="get">
{%trans "Filter" %}:
{% trans "Filter" %}:
<select class="default-input" name="status" onchange="document.forms['filter'].submit()">
<option value="---">-- {%trans "Status" %}--</option>
<option value="sea" {% if 'sea' in request.GET.status %}selected{% endif %}>{%trans "Searching for candidates" %}</option>
<option value="vot" {% if 'vot' in request.GET.status %}selected{% endif %}>{%trans "Voting" %}</option>
<option value="fin" {% if 'fin' in request.GET.status %}selected{% endif %}>{%trans "Finished" %}</option>
<option value="---">-- {% trans "Status" %}--</option>
<option value="sea" {% if 'sea' in request.GET.status %}selected{% endif %}>{% trans "Searching for candidates" %}</option>
<option value="vot" {% if 'vot' in request.GET.status %}selected{% endif %}>{% trans "Voting" %}</option>
<option value="fin" {% if 'fin' in request.GET.status %}selected{% endif %}>{% trans "Finished" %}</option>
</select>
</form>
</p>
@ -22,9 +22,9 @@
{% blocktrans count counter=assignments|length %}election{% plural %}elections{% endblocktrans %}
<table>
<tr>
<th><a href="?sort=name{% if 'name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Election" %}</a></th>
<th>{%trans "Candidates" %}</th>
<th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Status" %}</a></th>
<th><a href="?sort=name{% if 'name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Election" %}</a></th>
<th>{% trans "Candidates" %}</th>
<th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
<th style="width: 1px;">{% trans "Actions" %}</th>
</tr>
{% for assignment in assignments %}
@ -41,8 +41,8 @@
</a>
{% endif %}
{% if perms.assignment.can_manage_assignment %}
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{%trans 'Edit election' %}"></a>
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{%trans 'Delete election' %}"></a>
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit election' %}"></a>
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete election' %}"></a>
{% endif %}
<a href="{% url print_assignment assignment.id %}" title="{% trans 'Election as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
</span>
@ -50,7 +50,7 @@
</tr>
{% empty %}
<tr>
<td colspan="4"><i>{%trans "No assignments available." %}</i></td>
<td colspan="4"><i>{% trans "No assignments available." %}</i></td>
</tr>
{% endfor %}
</table>

View File

@ -2,15 +2,15 @@
{% load i18n %}
{% block title %}{{ block.super }} {% trans "Election" %} "{{ assignment }}" {{ ballotnumber }}. {%trans "ballot" %}{% endblock %}
{% block title %}{{ block.super }} {% trans "Election" %} "{{ assignment }}" {{ ballotnumber }}. {% trans "ballot" %}{% endblock %}
{% block content %}
<h1>{{ assignment }} {{ ballotnumber }}. {%trans "ballot" %}</h1>
<h1>{{ assignment }} {{ ballotnumber }}. {% trans "ballot" %}</h1>
{% if assignment.polldescription %}
<p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
{% endif %}
<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
<form action="" method="post" class="small-form">{% csrf_token %}
<table style="width:auto">
@ -52,25 +52,25 @@
{% endfor %}
</tr>
</table>
<p>
<a href='{% url print_assignment_poll poll.id %}'>
<button class="button" type="button" onclick="window.location='{% url print_assignment_poll poll.id %}'">
<span class="icon pdf">{%trans 'Ballot paper as PDF' %}</span>
<span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
</button>
</a>
</p>
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url assignment_view poll.assignment.id %}'>
<button class="button" type="button" onclick="window.location='{% url assignment_view poll.assignment.id %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -60,14 +60,14 @@
<a href='{% url assignment_delrun assignment.id %}'>
<span class="button">
<span class="icon removeuser">{%trans 'Withdraw self candidature' %}</span>
<span class="icon removeuser">{% trans 'Withdraw self candidature' %}</span>
</span>
</a>
{% else %}
{% if user.profile %}
<a href='{% url assignment_run assignment.id %}'>
<span class="button">
<span class="icon adduser">{%trans 'Self candidature' %}</span>
<span class="icon adduser">{% trans 'Self candidature' %}</span>
</span>
</a>
{% endif %}
@ -85,7 +85,7 @@
{% endfor %}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Apply' %}</span>
<span class="icon ok">{% trans 'Apply' %}</span>
</button>
</p>
{% endif %}
@ -118,7 +118,7 @@
<br>
<a class="publish_link {% if poll.published %}published{% endif %}"
href="{% url assignment_poll_publish_status poll.id %}"
title="{%trans 'Publish/unpublish results' %}">
title="{% trans 'Publish/unpublish results' %}">
<span></span>
</a>
<a href="{% url assignment_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit' %}"></a>
@ -130,7 +130,7 @@
<th>
<a href='{% url assignment_gen_poll assignment.id %}'>
<span class="button">
<span class="icon statistics">{%trans 'New ballot' %}</span>
<span class="icon statistics">{% trans 'New ballot' %}</span>
</span>
</a>
</th>
@ -177,7 +177,7 @@
{% endfor %}
<tr>
<td>{%trans 'Invalid votes' %}</td>
<td>{% trans 'Invalid votes' %}</td>
{% for poll in polls %}
{% if poll.published or perms.assignment.can_manage_assignment %}
<td style="white-space:nowrap;"><img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}</td>
@ -189,7 +189,7 @@
</tr>
<tr class="total">
<td><strong>{%trans 'Votes cast' %}</strong></td>
<td><strong>{% trans 'Votes cast' %}</strong></td>
{% for poll in polls %}
{% if poll.published or perms.assignment.can_manage_assignment %}
<td style="white-space:nowrap;"><img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> <strong>{{ poll.print_votescast }}</strong></td>
@ -208,7 +208,7 @@
{% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
<p><a href='{% url assignment_gen_poll assignment.id %}'>
<span class="button">
<span class="icon statistics">{%trans 'New ballot' %}</span>
<span class="icon statistics">{% trans 'New ballot' %}</span>
</span>
</a></p>
{% endif %}

View File

@ -92,7 +92,7 @@
{% endfor %}
<tr>
<td>{%trans 'Invalid votes' %}</td>
<td>{% trans 'Invalid votes' %}</td>
{% for poll in polls %}
{% if poll.published %}
<td style="white-space:nowrap;"><img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}</td>
@ -101,7 +101,7 @@
</tr>
<tr class="total">
<td><b>{%trans 'Votes cast' %}</b></td>
<td><b>{% trans 'Votes cast' %}</b></td>
{% for poll in polls %}
{% if poll.published %}
<td style="white-space:nowrap;"><img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> <b>{{ poll.print_votescast }}</b></td>

View File

@ -4,7 +4,7 @@
{% load i18n %}
{% block submenu %}
<h4 class="sectiontitle">{%trans "Configuration" %}</h4>
<h4 class="sectiontitle">{% trans "Configuration" %}</h4>
<ul>
{% for menu_link in menu_links %}
<li{% if menu_link.2 %} class="selected"{% endif %}><a href="{{ menu_link.0 }}">{{ menu_link.1 }}</a></li>

View File

@ -5,10 +5,10 @@
{% block title %}{{ block.super }} {% trans "General settings" %}{% endblock %}
{% block content %}
<h1>{%trans "General settings" %}</h1>
<h1>{% trans "General settings" %}</h1>
<form action="" method="post">{% csrf_token %}
<fieldset>
<legend>{%trans "Event" %}</legend>
<legend>{% trans "Event" %}</legend>
{% for field in form %}
{% if "id_event" in field.label_tag %}
<p>
@ -23,7 +23,7 @@
</fieldset>
<p></p>
<fieldset>
<legend>{%trans "Frontpage" %}</legend>
<legend>{% trans "Frontpage" %}</legend>
{% for field in form %}
{% if "id_frontpage" in field.label_tag %}
<p>
@ -38,7 +38,7 @@
</fieldset>
<p></p>
<fieldset style="width: 410px;">
<legend>{%trans "System" %}</legend>
<legend>{% trans "System" %}</legend>
{% for field in form %}
{% if "id_system" in field.label_tag %}
<p>
@ -53,11 +53,11 @@
</fieldset>
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href='{% url config_general %}'>
<button class="button" type="button" onclick="window.location='{% url config_general %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -9,19 +9,19 @@
{% url user_new as url_usernew %}
{% url user_group_overview as url_usergroups %}
{% url user_import as url_userimport %}
<h4 class="sectiontitle">{%trans "Participants" %}</h4>
<h4 class="sectiontitle">{% trans "Participants" %}</h4>
<ul>
{% if perms.participant.can_see_participant %}
<li class="{% if request.path == url_users %}selected{% endif %}"><a href="{% url user_overview %}">{%trans "All participants" %}</a></li>
<li class="{% if request.path == url_users %}selected{% endif %}"><a href="{% url user_overview %}">{% trans "All participants" %}</a></li>
{% endif %}
{% if perms.participant.can_manage_participant %}
<li class="{% active request url_usernew %}"><a href="{% url user_new %}">{%trans "New participant" %}</a></li>
<li class="{% if request.path == url_usergroups %}selected{% endif %}"><a href="{% url user_group_overview %}">{%trans "All user groups" %}</a></li>
<li class="{% active request '/participant/group/new' %}"><a href="{% url user_group_new %}">{%trans "New user group" %}</a></li>
<li class="{% if request.path == url_userimport %}selected{% endif %}"><a href="{% url user_import %}"> {%trans 'Import participants' %}</a></li>
<li class="{% active request url_usernew %}"><a href="{% url user_new %}">{% trans "New participant" %}</a></li>
<li class="{% if request.path == url_usergroups %}selected{% endif %}"><a href="{% url user_group_overview %}">{% trans "All user groups" %}</a></li>
<li class="{% active request '/participant/group/new' %}"><a href="{% url user_group_new %}">{% trans "New user group" %}</a></li>
<li class="{% if request.path == url_userimport %}selected{% endif %}"><a href="{% url user_import %}"> {% trans 'Import participants' %}</a></li>
{% endif %}
{% if perms.participant.can_see_participant %}
<li><a href="{% url user_print %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'List of participants as PDF' %}</a></li>
<li><a href="{% url user_print %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'List of participants as PDF' %}</a></li>
{% endif %}
{% if perms.participant.can_manage_participant %}
<li><a href="{% url print_passwords %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'First time passwords as PDF' %}</a></li>

View File

@ -5,16 +5,16 @@
{% block title %}{{ block.super }} {% trans "Participant settings" %}{% endblock %}
{% block content %}
<h1>{%trans "Participant settings" %}</h1>
<h1>{% trans "Participant settings" %}</h1>
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href='{% url config_application %}'>
<button class="button" type="button" onclick="window.location='{% url config_application %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}
{{ block.super }}
{{ block.super }}
{% if edituser %}
{% trans "Edit participant" %}
{% else %}
@ -14,9 +14,9 @@
{% block content %}
{% if edituser %}
<h1>{%trans "Edit participant" %}</h1>
<h1>{% trans "Edit participant" %}</h1>
{% else %}
<h1>{%trans "New participant" %}</h1>
<h1>{% trans "New participant" %}</h1>
{% endif %}
<form action="" method="post">{% csrf_token %}
@ -27,14 +27,14 @@
{% endif %}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url user_overview %}'>
<button class="button" type="button" onclick="window.location='{% url user_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}
{{ block.super }}
{{ block.super }}
{% if group %}
{% trans "Edit user group" %}
{% else %}
@ -13,23 +13,23 @@
{% block content %}
{% if group %}
<h1>{%trans "Edit user group" %}</h1>
<h1>{% trans "Edit user group" %}</h1>
{% else %}
<h1>{%trans "New user group" %}</h1>
<h1>{% trans "New user group" %}</h1>
{% endif %}
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url user_group_overview %}'>
<button class="button" type="button" onclick="window.location='{% url user_group_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -6,24 +6,24 @@
{% block title %}{{ block.super }} {% trans "User groups" %}{% endblock %}
{% block content %}
<h1>{%trans "User groups" %}</h1>
<h1>{% trans "User groups" %}</h1>
<table>
<tr>
<th>{%trans "User Group" %}</th>
<th>{%trans "Actions" %}</th>
<th>{% trans "User Group" %}</th>
<th>{% trans "Actions" %}</th>
</tr>
{% for group in groups %}
<tr class="{% cycle '' 'odd' %}">
<td>{{ group.name }}</td>
<td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{%trans 'Edit group' %}"></a>
<td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
{% if group.name != 'Anonymous' %}
<a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{%trans 'Delete group' %}"></a>
<a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
{% endif %}
</td>
</tr>
{% empty %}
<tr>
<td colspan="5"><i>{%trans "No user groups available." %}</i></td>
<td colspan="5"><i>{% trans "No user groups available." %}</i></td>
</tr>
{% endfor %}
</table>

View File

@ -20,11 +20,11 @@
{{ form.as_p }}
<p>
<button class="button" type="submit">
<span class="icon import">{%trans 'Import' %}</span>
<span class="icon import">{% trans 'Import' %}</span>
</button>
<a href="{% url user_overview%}">
<button class="button" type="button" onclick="window.location='{% url user_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</p>

View File

@ -5,7 +5,7 @@
{% block mainmenu %}
<ul>
<li class="selected"><a href="{% url user_login %}" title="">{%trans "Login" %}</a></li>
<li class="selected"><a href="{% url user_login %}" title="">{% trans "Login" %}</a></li>
</ul>
{% endblock %}
@ -13,7 +13,7 @@
{% endblock %}
{% block content %}
<h1>{%trans "Login" %}</h1>
<h1>{% trans "Login" %}</h1>
{% if form.errors %}
<div class="notification error">
@ -24,7 +24,7 @@
<em>{{ msg }}</em>
{% if not forloop.last %}<br />{% endif %}
{% empty %}
<em>{%trans "Your username and password were not accepted. Please try again." %}</em>
<em>{% trans "Your username and password were not accepted. Please try again." %}</em>
{% endfor %}
</div>
<script>
@ -47,11 +47,11 @@
</table>
<p>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Login' %}</span>
<span class="icon ok">{% trans 'Login' %}</span>
</button>
{% if os_enable_anonymous_login %}
<button class="button" id="anonymous_login">
<span class="icon guest">{%trans 'Continue as guest' %}</span>
<span class="icon guest">{% trans 'Continue as guest' %}</span>
</button>
{% endif %}
<input type="hidden" name="next" value="{{ next }}" />

View File

@ -18,39 +18,39 @@
<p><form action="{{request.url}}" name="filter" method="post">
{% csrf_token %}
{%trans "Filter" %}:
{% trans "Filter" %}:
<select class="default-input" name="gender" onchange="document.forms['filter'].submit()">
<option value="---">-- {%trans "Gender" %} --</option>
<option value="male" {% if 'male' in sortfilter.gender %}selected{% endif %}>{%trans "Male" %}</option>
<option value="female" {% if 'female' in sortfilter.gender %}selected{% endif %}>{%trans "Female" %}</option>
<option value="" {% if '' in sortfilter.gender %}selected{% endif %}>{%trans "Not specified" %}</option>
<option value="---">-- {% trans "Gender" %} --</option>
<option value="male" {% if 'male' in sortfilter.gender %}selected{% endif %}>{% trans "Male" %}</option>
<option value="female" {% if 'female' in sortfilter.gender %}selected{% endif %}>{% trans "Female" %}</option>
<option value="" {% if '' in sortfilter.gender %}selected{% endif %}>{% trans "Not specified" %}</option>
</select>
<select class="default-input" name="group" onchange="document.forms['filter'].submit()">
<option value="---">-- {%trans "Group" %} --</option>
<option value="---">-- {% trans "Group" %} --</option>
{% for group in groups %}
<option value="{{ group }}" {% if group in sortfilter.group %}selected{% endif %}>
{{ group }}</option>
{% endfor %}
</select>
<select class="default-input" name="type" onchange="document.forms['filter'].submit()">
<option value="---">-- {%trans "Type" %} --</option>
<option value="delegate" {% if 'delegate' in sortfilter.type %}selected{% endif %}>{%trans "Delegate" %}</option>
<option value="observer" {% if 'observer' in sortfilter.type %}selected{% endif %}>{%trans "Observer" %}</option>
<option value="staff" {% if 'staff' in sortfilter.type %}selected{% endif %}>{%trans "Staff" %}</option>
<option value="guest" {% if 'guest' in sortfilter.type %}selected{% endif %}>{%trans "Guest" %}</option>
<option value="" {% if '' in sortfilter.type %}selected{% endif %}>{%trans "Not specified" %}</option>
<option value="---">-- {% trans "Type" %} --</option>
<option value="delegate" {% if 'delegate' in sortfilter.type %}selected{% endif %}>{% trans "Delegate" %}</option>
<option value="observer" {% if 'observer' in sortfilter.type %}selected{% endif %}>{% trans "Observer" %}</option>
<option value="staff" {% if 'staff' in sortfilter.type %}selected{% endif %}>{% trans "Staff" %}</option>
<option value="guest" {% if 'guest' in sortfilter.type %}selected{% endif %}>{% trans "Guest" %}</option>
<option value="" {% if '' in sortfilter.type %}selected{% endif %}>{% trans "Not specified" %}</option>
</select>
<select class="default-input" name="committee" onchange="document.forms['filter'].submit()">
<option value="---">-- {%trans "Committee" %} --</option>
<option value="---">-- {% trans "Committee" %} --</option>
{% for committee in committees %}
<option value="{{ committee }}" {% if committee in sortfilter.committee %}selected{% endif %}>
{{ committee }}</option>
{% endfor %}
</select>
<select class="default-input" name="status" onchange="document.forms['filter'].submit()">
<option value="---">-- {%trans "Status" %} --</option>
<option value="1" {% if '1' in sortfilter.status %}selected{% endif %}>{%trans "Active" %}</option>
<option value="0" {% if '0' in sortfilter.status %}selected{% endif %}>{%trans "Inactive" %}</option>
<option value="---">-- {% trans "Status" %} --</option>
<option value="1" {% if '1' in sortfilter.status %}selected{% endif %}>{% trans "Active" %}</option>
<option value="0" {% if '0' in sortfilter.status %}selected{% endif %}>{% trans "Inactive" %}</option>
</select>
</form>
</p>
@ -62,15 +62,15 @@
{% endif %}
<table>
<tr>
<th><a href="?sort=first_name&reverse={% if 'first_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "First Name" %}</a></th>
<th><a href="?sort=last_name&reverse={% if 'last_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Last Name" %}</a></th>
<th><a href="?sort=group&reverse={% if 'group' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Group" %}</a></th>
<th><a href="?sort=type&reverse={% if 'type' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Type" %}</a></th>
<th><a href="?sort=committee&reverse={% if 'committee' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Committee" %}</a></th>
<th><a href="?sort=first_name&reverse={% if 'first_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "First Name" %}</a></th>
<th><a href="?sort=last_name&reverse={% if 'last_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Last Name" %}</a></th>
<th><a href="?sort=group&reverse={% if 'group' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Group" %}</a></th>
<th><a href="?sort=type&reverse={% if 'type' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Type" %}</a></th>
<th><a href="?sort=committee&reverse={% if 'committee' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Committee" %}</a></th>
{% if perms.participant.can_manage_participant %}
<th><a href="?sort=comment&reverse={% if 'comment' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Comment" %}</a></th>
<th><a href="?sort=last_login&reverse={% if 'last_login' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Last Login" %}</a></th>
<th>{%trans "Actions" %}</th>
<th><a href="?sort=comment&reverse={% if 'comment' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Comment" %}</a></th>
<th><a href="?sort=last_login&reverse={% if 'last_login' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Last Login" %}</a></th>
<th>{% trans "Actions" %}</th>
{% endif %}
</tr>
{% for user in users %}
@ -86,11 +86,11 @@
{{ user.last_login }}
{% endif %}</td>
<td><span style="width: 1px; white-space: nowrap;">
<a href="{% url user_edit user.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{%trans 'Edit participant' %}"></a>
<a href="{% url user_delete user.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{%trans 'Delete participant' %}"></a>
<a href="{% url user_edit user.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit participant' %}"></a>
<a href="{% url user_delete user.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete participant' %}"></a>
<a class="status_link {% if user.is_active %}active{% endif %}"
href="{% url user_status user.id %}"
title="{%trans 'Change status (active/inactive)' %}">
title="{% trans 'Change status (active/inactive)' %}">
<span></span>
</a>
</span>
@ -99,7 +99,7 @@
</tr>
{% empty %}
<tr>
<td colspan="9"><i>{%trans "No participants available." %}</i></td>
<td colspan="9"><i>{% trans "No participants available." %}</i></td>
</tr>
{% endfor %}
</table>

View File

@ -19,11 +19,11 @@
{{ form.as_p }}
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href=''>
<button class="button" type="button">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</form>

View File

@ -19,11 +19,11 @@
{{ form_user.as_p }}
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<a href=''>
<button class="button" type="button">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</form>

View File

@ -8,7 +8,7 @@
{% block submenu %}
{% url projector_control as url_projectoroverview %}
<h4 class="sectiontitle">{%trans "Projector" %}</h4>
<h4 class="sectiontitle">{% trans "Projector" %}</h4>
<ul>
{% if perms.projector.can_manage_projector %}
<li class="{% if request.path == url_projectoroverview %}selected{% endif %}">

View File

@ -10,14 +10,14 @@
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
<span class="icon ok">{% trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
<span class="icon apply">{% trans 'Apply' %}</span>
</button>
<a href='{% url projector_control %}'>
<button class="button" type="button" onclick="window.location='{% url projector_control %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a>
</form>

View File

@ -39,7 +39,7 @@
<hr>
<a href='{% url customslide_new %}'>
<button class="button" type="button" onclick="window.location='{% url customslide_new %}'">
<span class="icon add">{%trans 'New slide' %}</span>
<span class="icon add">{% trans 'New slide' %}</span>
</button>
</a>

View File

@ -4,5 +4,5 @@
{% load i18n %}
{% block content %}
<h1>{%trans "Page not found."%}</h1>
<h1>{% trans "Page not found." %}</h1>
{% endblock %}

View File

@ -4,5 +4,5 @@
{% load i18n %}
{% block content %}
<h1>{%trans "Server Error"%}</h1>
<h1>{% trans "Server Error" %}</h1>
{% endblock %}

View File

@ -24,12 +24,12 @@
<div id="header_userprofile">
<ul>
{% if user.is_authenticated %}
<li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li>
<li>|<a href="{% url user_logout %}">{% trans "Logout" %}</a></li>
{% url user_settings as url_usersettings %}
<li>|<a href="{% url user_settings %}">{% if request.path == url_usersettings %}<strong>{% endif %}{% trans "User Settings" %}{% if request.path == url_usersettings %}</strong>{% endif %}</a></li>
<li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
<li>{% trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
{% else %}
<li><a href="{% url user_login %}">{%trans "Login" %}</a></li>
<li><a href="{% url user_login %}">{% trans "Login" %}</a></li>
{% endif %}
</ul>
</div>

View File

@ -19,11 +19,11 @@
{% block submenu %}
{% if perms.projector.can_see_projector %}
<h4 class="sectiontitle">{%trans "Home" %}</h4>
<h4 class="sectiontitle">{% trans "Home" %}</h4>
<ul>
<li>
<a href="{% url projector_show %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Projector view' %}</a>
</li>
</ul>
{% endif %}
{% endblock %}
{% endblock %}