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

Changed motion.number to motion.identifier.

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-03-14 23:04:32 +01:00
parent 88a32dc546
commit b2dc3820bd
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/motion/templates/motion/motion_detail.html
View File

@ -4,14 +4,14 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.number }}{% endblock %} {% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.identifier }}{% endblock %}
{% block content %} {% block content %}
<h1> <h1>
{{ motion.title }} {{ motion.category }} {{ motion.title }} {{ motion.category }}
<br> <br>
<small> <small>
{% if motion.identifier != None %} {% if motion.identifier %}
{% trans "Motion" %} {{ motion.identifier }}, {% trans "Motion" %} {{ motion.identifier }},
{% else %} {% else %}
<i>[{% trans "no number" %}]</i>, <i>[{% trans "no number" %}]</i>,

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

@ -4,7 +4,7 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.number }}{% endblock %} {% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.identifier }}{% endblock %}
{% block header %} {% block header %}
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/motion.css' %}" /> <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/motion.css' %}" />
@ -16,8 +16,8 @@
{{ motion.title }} {{ motion.title }}
<br> <br>
<small> <small>
{% if motion.number != None %} {% if motion.identifier != None %}
{% trans "Motion" %} {{ motion.number }}, {% trans "Motion" %} {{ motion.identifier }},
{% else %} {% else %}
<i>[{% trans "no number" %}]</i>, <i>[{% trans "no number" %}]</i>,
{% endif %} {% endif %}

2
openslides/motion/templates/motion/motion_list.html
View File

@ -61,7 +61,7 @@
</tr> </tr>
{% for motion in motion_list %} {% for motion in motion_list %}
<tr class="{% if motion.active %}activeline{% endif %}"> <tr class="{% if motion.active %}activeline{% endif %}">
<td>{{ motion.number }}</td> <td>{{ motion.identifier }}</td>
<td><a href="{% model_url motion %}">{{ motion.title }}</a></td> <td><a href="{% model_url motion %}">{{ motion.title }}</a></td>
{% if min_supporters > 0 %} {% if min_supporters > 0 %}
<td class="optional">{# motion.count_supporters #}</td> <td class="optional">{# motion.count_supporters #}</td>

4
openslides/motion/templates/motion/poll_form.html
View File

@ -3,7 +3,7 @@
{% load i18n %} {% load i18n %}
{% block title %} {% block title %}
{{ block.super }} - {% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %} {{ block.super }} - {% trans "Motion" %} {{ motion.identifier }}, {{ ballot }}. {% trans "Vote" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@ -11,7 +11,7 @@
{{ motion }} {{ motion }}
<br> <br>
<small> <small>
{% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %} {% trans "Motion" %} {{ motion.identifier }}, {{ ballot }}. {% trans "Vote" %}
</small> </small>
<small class="pull-right"> <small class="pull-right">
<div class="btn-toolbar"> <div class="btn-toolbar">

4
openslides/motion/templates/motion/widget.html
View File

@ -17,8 +17,8 @@
{{ motion.public_version.title }} {{ motion.public_version.title }}
</a> </a>
({% trans "motion" %} ({% trans "motion" %}
{% if motion.number %} {% if motion.identifier %}
{{ motion.number }}) {{ motion.identifier }})
{% else %} {% else %}
<i>[{% trans "no number" %}]</i>) <i>[{% trans "no number" %}]</i>)
{% endif %} {% endif %}

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

@ -4,7 +4,7 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% block title %}{{ block.super }} - {% trans "Motion" %} {{ motion.number }}{% endblock %} {% block title %}{{ block.super }} - {% trans "Motion" %} {{ motion.identifier }}{% endblock %}
{% block content %} {% block content %}
<div id="sidebar"> <div id="sidebar">
<div class="box"> <div class="box">
@ -59,8 +59,8 @@
</div> </div>
<h1> <h1>
{% if motion.number != None %} {% if motion.identifier %}
{% trans "Motion No." %} {{ motion.number }} {% trans "Motion No." %} {{ motion.identifier }}
{% else %} {% else %}
{% trans "Motion" %} <i>[{% trans "no number" %}]</i> {% trans "Motion" %} <i>[{% trans "no number" %}]</i>
{% endif %} {% endif %}

8
openslides/participant/templates/participant/personal_info_widget.html
View File

@ -7,8 +7,8 @@
<li> <li>
<a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a> <a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a>
({% trans "motion" %} ({% trans "motion" %}
{% if motion.number %} {% if motion.identifier %}
{{ motion.number }}) {{ motion.identifier }})
{% else %} {% else %}
<i>[{% trans "no number" %}]</i>) <i>[{% trans "no number" %}]</i>)
{% endif %} {% endif %}
@ -26,8 +26,8 @@
<li> <li>
<a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a> <a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a>
({% trans "motion" %} ({% trans "motion" %}
{% if motion.number %} {% if motion.identifier %}
{{ motion.number }}) {{ motion.identifier }})
{% else %} {% else %}
<i>[{% trans "no number" %}]</i>) <i>[{% trans "no number" %}]</i>)
{% endif %} {% endif %}