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

Fix #252

Browse Source
This commit is contained in:
Norman Jäckel 2012-07-01 16:28:11 +02:00
parent 6c206fa740
commit d22118ac72
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openslides/application/templates/application/poll_view.html
View File

@ -14,13 +14,7 @@
<form action="" method="post" class="small-form">{% csrf_token %} <form action="" method="post" class="small-form">{% csrf_token %}
{{ pre_form }} {{ pre_form }}
<span id="poll_id" style="display:none">{{ poll.id }}</span> <span id="poll_id" style="display:none">{{ poll.id }}</span>
<span style="float:right;">
<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>
</button>
</a>
</span>
<table class="table" style="width: auto;"> <table class="table" style="width: auto;">
<tr> <tr>
<th>{% trans "Option" %}</th> <th>{% trans "Option" %}</th>
@ -41,8 +35,18 @@
<td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td> <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
</tr> </tr>
</table> </table>
{{ post_form }} {{ post_form }}
<p></p>
<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>
</button>
</a>
</p>
<p>
<button class="button" type="submit"> <button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span> <span class="icon ok">{%trans 'Save' %}</span>
</button> </button>
@ -54,5 +58,6 @@
<span class="icon cancel">{%trans 'Cancel' %}</span> <span class="icon cancel">{%trans 'Cancel' %}</span>
</button> </button>
</a> </a>
</p>
</form> </form>
{% endblock %} {% endblock %}

18
openslides/assignment/templates/assignment/poll_view.html
View File

@ -14,13 +14,7 @@
{% endif %} {% endif %}
<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i> <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
<form action="" method="post" class="small-form">{% csrf_token %} <form action="" method="post" class="small-form">{% csrf_token %}
<span style="float:right;">
<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>
</button>
</a>
</span>
<table style="width:auto"> <table style="width:auto">
<tr> <tr>
<th>{% trans "Candidates" %}</th> <th>{% trans "Candidates" %}</th>
@ -48,6 +42,15 @@
<td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td> <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
</tr> </tr>
</table> </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>
</button>
</a>
</p>
<p> <p>
<button class="button" type="submit"> <button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span> <span class="icon ok">{%trans 'Save' %}</span>
@ -61,5 +64,6 @@
</button> </button>
</a> </a>
</p> </p>
</form> </form>
{% endblock %} {% endblock %}