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

Improve projector style of application voting results.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-30 08:23:50 +02:00
parent 3faa91f5a4
commit e28c15eff9
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openslides/application/templates/projector/Application.html
View File

@ -10,8 +10,13 @@
<div class="box"> <div class="box">
<p><b>{%trans "Status" %}:</b><br> <p><b>{%trans "Status" %}:</b><br>
{% if application.status != "pub" %} {% if application.status != "pub" %}
{% if application.status == "acc" %}
<img src="{% static 'images/icons/voting-yes.png' %}">
{% endif %}
{% if application.status == "rej" %}
<img src="{% static 'images/icons/voting-no.png' %}">
{% endif %}
{%trans application.get_status_display %} {%trans application.get_status_display %}
<br>
{% else %} {% else %}
{% for note in application.notes %} {% for note in application.notes %}
{{ note }} {{ note }}
@ -20,31 +25,34 @@
</p> </p>
<p><b>{% trans "Submitter" %}:</b><br> <p><b>{% trans "Submitter" %}:</b><br>
{{ application.submitter.profile }}</p> {{ application.submitter.profile }}
</p>
{% with application.polls as polls %} {% with application.polls as polls %}
{% if polls.exists and polls.0.has_votes %} {% if polls.exists and polls.0.has_votes %}
<p><b>{% trans "Poll result" %}:</b></p> <p><b>{% trans "Poll result" %}:</b><br>
{% for poll in polls %} {% for poll in polls %}
{% if poll.has_votes %} {% if poll.has_votes %}
{% if polls|length > 1 %} {% if polls|length > 1 %}
{{forloop.counter}}. {% trans "Vote" %}:<br> {{forloop.counter}}. {% trans "Vote" %}:<br>
{% endif %} {% endif %}
{% with poll.get_options.0 as option %} {% with poll.get_options.0 as option %}
<div class="results" style="font-size: 120%;">
<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.Abstain }}<br> <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
<img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br> <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
<div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;"> <hr>
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }} <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
</div> </div>
{% endwith %} {% endwith %}
<br>
{% else %} {% else %}
{% if poll|length == 1 %} {% if poll|length == 1 %}
<i>{% trans "No poll results available." %}</i> <i>{% trans "No poll results available." %}</i>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</p>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</div> </div>

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

@ -122,7 +122,7 @@ body{
color: #FAFAFB; color: #FAFAFB;
} }
#sidebar { #sidebar {
width: 250px; width: 255px;
float: right; float: right;
margin: 0 0 20px 10px; margin: 0 0 20px 10px;
} }