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

replace -2 with undocumented in beamer view of polls

Browse Source
This commit is contained in:
Oskar Hahn 2011-09-09 22:34:55 +02:00
parent d32fe2902d
commit 10c3d624fe
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/agenda/templates/beamer/ItemApplication.html
View File

@ -30,9 +30,9 @@
<img src="/static/images/icons/voting-yes.png" title="{% trans 'Yes' %}"> {{ option.yes }} <br> <img src="/static/images/icons/voting-yes.png" title="{% trans 'Yes' %}"> {{ option.yes }} <br>
<img src="/static/images/icons/voting-no.png" title="{% trans 'No' %}"> {{ option.no }} <br> <img src="/static/images/icons/voting-no.png" title="{% trans 'No' %}"> {{ option.no }} <br>
<img src="/static/images/icons/voting-abstention.png" title="{% trans 'Abstention' %}"> {{ option.undesided }}<br> <img src="/static/images/icons/voting-abstention.png" title="{% trans 'Abstention' %}"> {{ option.undesided }}<br>
<img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ p.votesinvalid }}<br> <img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ p.votesinvalidf }}<br>
<div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 5em;"> <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 5em;">
<img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> {{ p.votescast }} <img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> {{ p.votescastf }}
</div> </div>
{% endfor %} {% endfor %}
<br> <br>
@ -46,7 +46,7 @@
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
<h1>{% trans "Application No." %} {{ item.application.number }}</h1> <h1>{% trans "Application No." %} {{ item.application.number }}</h1>
<b>{{ item.title }}</b> <b>{{ item.title }}</b>
<p> <p>

12
openslides/agenda/templates/beamer/ItemAssignment.html
View File

@ -21,7 +21,7 @@
<p> <p>
<div class="text">{{ item.assignment.description|linebreaks }}</div> <div class="text">{{ item.assignment.description|linebreaks }}</div>
</p> </p>
{% if item.assignment.status != "fin" %} {% if item.assignment.status != "fin" %}
<h3>{% trans "Candidates" %}</h3> <h3>{% trans "Candidates" %}</h3>
<ol> <ol>
@ -34,7 +34,7 @@
{% endfor %} {% endfor %}
</ol> </ol>
{% endif %} {% endif %}
{% with polls|first as firstpoll %} {% with polls|first as firstpoll %}
{% if polls.count > 0 and firstpoll.published %} {% if polls.count > 0 and firstpoll.published %}
@ -72,7 +72,7 @@
{% else %}&empty;{% endif %} {% else %}&empty;{% endif %}
</td> </td>
{% endfor %} {% endfor %}
</tr> </tr>
{% empty %} {% empty %}
<tr> <tr>
<td {% if item.assignment.profile.exist %}colspan="2"{% endif %}><i>{% trans "No ballots available." %}</i></td> <td {% if item.assignment.profile.exist %}colspan="2"{% endif %}><i>{% trans "No ballots available." %}</i></td>
@ -82,7 +82,7 @@
<td>{%trans 'Invalid votes' %}</td> <td>{%trans 'Invalid votes' %}</td>
{% for p in polls %} {% for p in polls %}
{% if p.published %} {% if p.published %}
<td style="white-space:nowrap;"><img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ p.votesinvalid }}</td> <td style="white-space:nowrap;"><img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ p.votesinvalidf }}</td>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</tr> </tr>
@ -90,13 +90,13 @@
<td><b>{%trans 'Votes cast' %}</b></td> <td><b>{%trans 'Votes cast' %}</b></td>
{% for p in polls %} {% for p in polls %}
{% if p.published %} {% if p.published %}
<td style="white-space:nowrap;"><img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> <b>{{ p.votescast }}</b></td> <td style="white-space:nowrap;"><img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> <b>{{ p.votescastf }}</b></td>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</tr> </tr>
</table> </table>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
<br> <br>
{% endblock %} {% endblock %}