diff --git a/openslides/application/templates/projector/Application.html b/openslides/application/templates/projector/Application.html index d18776717..6231d6bb4 100644 --- a/openslides/application/templates/projector/Application.html +++ b/openslides/application/templates/projector/Application.html @@ -24,37 +24,37 @@ {% endif %}

+ {% with application.polls as polls %} + {% if polls.exists and polls.0.has_votes %} +

{% trans "Poll result" %}:
+ {% for poll in polls %} + {% if poll.has_votes %} + {% if polls|length > 1 %} + {{forloop.counter}}. {% trans "Vote" %}: + {% endif %} + {% with poll.get_options.0 as option %} +

+ {{ option.Yes }}
+ {{ option.No }}
+ {{ option.Abstain }}
+ {{ poll.print_votesinvalid }}
+
+ {{ poll.print_votescast }} +
+ {% endwith %} + {% else %} + {% if poll|length == 1 %} + {% trans "No poll results available." %} + {% endif %} + {% endif %} + {% endfor %} +

+ {% endif %} + {% endwith %} +

{% trans "Submitter" %}:
{{ application.submitter.profile }}

- - {% with application.polls as polls %} - {% if polls.exists and polls.0.has_votes %} -

{% trans "Poll result" %}:
- {% for poll in polls %} - {% if poll.has_votes %} - {% if polls|length > 1 %} - {{forloop.counter}}. {% trans "Vote" %}:
- {% endif %} - {% with poll.get_options.0 as option %} -

- {{ option.Yes }}
- {{ option.No }}
- {{ option.Abstain }}
- {{ poll.print_votesinvalid }}
-
- {{ poll.print_votescast }} -
- {% endwith %} - {% else %} - {% if poll|length == 1 %} - {% trans "No poll results available." %} - {% endif %} - {% endif %} - {% endfor %} -

- {% endif %} - {% endwith %} diff --git a/openslides/projector/static/styles/projector.css b/openslides/projector/static/styles/projector.css index a71df8788..ae8525a2a 100644 --- a/openslides/projector/static/styles/projector.css +++ b/openslides/projector/static/styles/projector.css @@ -138,6 +138,11 @@ body{ text-transform: uppercase; } +.box .results { + font-size: 120%; + margin-top: -12px; +} + /*** Items *** / /* item title centered */ .item_fullscreen