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

Some minor style fixes for poll view templates.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-29 19:12:18 +02:00
parent 905d9d546c
commit 79605531c5
3 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<h3>{{ application.title }}</h3> <h3>{{ application.title }}</h3>
<p>{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}</p> <p>{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}</p>
<i>-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 %}
{{ pre_form }} {{ pre_form }}
<span id="poll_id" style="display:none">{{ poll.id }}</span> <span id="poll_id" style="display:none">{{ poll.id }}</span>

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

@ -9,8 +9,10 @@
<p>{{ ballotnumber }}. {%trans "ballot" %}: {{assignment.poll.get_options}} <p>{{ ballotnumber }}. {%trans "ballot" %}: {{assignment.poll.get_options}}
{% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %} {% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %}
</p> </p>
<p><b>{% trans "Short description" %}:</b> {{ assignment.polldescription }}</p> {% if assignment.polldescription %}
<i>-1 := {% trans 'majority' %}, -2 := {% trans 'undocumented' %}</i> <p><b>{% trans "Short description" %}:</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 %} <form action="" method="post" class="small-form">{% csrf_token %}
<table style="width:auto"> <table style="width:auto">
<tr> <tr>
@ -39,28 +41,18 @@
<td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td> <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
</tr> </tr>
</table> </table>
<p>
<p> <button class="button" type="submit">
<a href='{% url print_assignment_poll poll.id %}'> <span class="icon ok">{%trans 'Save' %}</span>
<span class="button"> </button>
<span class="icon pdf">{%trans 'Print ballot' %}</span> <button class="button" type="submit" name="apply">
</span> <span class="icon apply">{%trans 'Apply' %}</span>
</a> </button>
</p> <a href='{% url assignment_view poll.assignment.id %}'>
<button class="button" type="button" onclick="window.location='{% url assignment_view poll.assignment.id %}'">
<p> <span class="icon cancel">{%trans 'Cancel' %}</span>
<button class="button" type="submit"> </button>
<span class="icon ok">{%trans 'Save' %}</span> </a>
</button> </p>
<button class="button" type="submit" name="apply">
<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>
</button>
</a>
</p>
</form> </form>
{% endblock %} {% endblock %}

2
openslides/static/styles/base.css
View File

@ -451,7 +451,7 @@ form .error input, form .error textarea {
form input:after { form input:after {
font-weight: bold; font-weight: bold;
} }
form .helptext { .helptext {
font-size:9px; font-size:9px;
display: block; display: block;
color: #556652; color: #556652;