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

Some more style work for application projector template.

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

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

@ -24,37 +24,37 @@
{% endif %} {% endif %}
</p> </p>
{% with application.polls as polls %}
{% if polls.exists and polls.0.has_votes %}
<p><b>{% trans "Poll result" %}:</b><br>
{% for poll in polls %}
{% if poll.has_votes %}
{% if polls|length > 1 %}
{{forloop.counter}}. {% trans "Vote" %}:
{% endif %}
{% with poll.get_options.0 as option %}
<div class="results">
<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-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
<img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
<hr>
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
</div>
{% endwith %}
{% else %}
{% if poll|length == 1 %}
<i>{% trans "No poll results available." %}</i>
{% endif %}
{% endif %}
{% endfor %}
</p>
{% endif %}
{% endwith %}
<p><b>{% trans "Submitter" %}:</b><br> <p><b>{% trans "Submitter" %}:</b><br>
{{ application.submitter.profile }} {{ application.submitter.profile }}
</p> </p>
{% with application.polls as polls %}
{% if polls.exists and polls.0.has_votes %}
<p><b>{% trans "Poll result" %}:</b><br>
{% for poll in polls %}
{% if poll.has_votes %}
{% if polls|length > 1 %}
{{forloop.counter}}. {% trans "Vote" %}:<br>
{% endif %}
{% 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-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-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
<hr>
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
</div>
{% endwith %}
{% else %}
{% if poll|length == 1 %}
<i>{% trans "No poll results available." %}</i>
{% endif %}
{% endif %}
{% endfor %}
</p>
{% endif %}
{% endwith %}
</div> </div>
</div> </div>

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

@ -138,6 +138,11 @@ body{
text-transform: uppercase; text-transform: uppercase;
} }
.box .results {
font-size: 120%;
margin-top: -12px;
}
/*** Items *** / /*** Items *** /
/* item title centered */ /* item title centered */
.item_fullscreen .item_fullscreen