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

Fixed #1040: Show only last motion poll results on projector.

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-11-11 17:45:05 +01:00
parent 2034852fa8
commit b8e30188ad
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openslides/motion/templates/motion/slide.html
View File

@ -1,4 +1,5 @@
{% load i18n %} {% load i18n %}
{% load humanize %}
{% load staticfiles %} {% load staticfiles %}
<div id="sidebar"> <div id="sidebar">
@ -10,11 +11,12 @@
<!-- poll results --> <!-- poll results -->
{% with motion.polls.all as polls %} {% with motion.polls.all as polls %}
{% if polls.exists and polls.0.has_votes %} {% if polls.exists and polls.0.has_votes %}
<h4>{% trans "Poll result" %}:</h4> {% for poll in polls reversed %}
{% for poll in polls %}
{% if poll.has_votes %} {% if poll.has_votes %}
{% if polls|length > 1 %} {% if polls|length > 1 %}
<p>{{ forloop.counter }}. {% trans "Vote" %}:</p> <h4>{{ poll.poll_number|ordinal|safe }} {% trans "Vote" %}:</h4>
{% else %}
<h4>{% trans "Poll result" %}:</h4>
{% endif %} {% endif %}
{% with poll.get_options.0 as option %} {% with poll.get_options.0 as option %}
<div class="results"> <div class="results">
@ -27,7 +29,7 @@
</div> </div>
{% endwith %} {% endwith %}
{% 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 %}

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

@ -92,7 +92,7 @@ li {
.well h4 { .well h4 {
margin: 20px 0 2px 0; margin: 20px 0 2px 0;
} }
.well h4 .first { .well h4.first {
margin-top: 0; margin-top: 0;
} }
.well .results hr { .well .results hr {