diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html index c25a87a28..41f8e9d70 100644 --- a/openslides/application/templates/application/poll_view.html +++ b/openslides/application/templates/application/poll_view.html @@ -10,7 +10,7 @@

{{ application.title }}

{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}

- -1 := {% trans 'majority' %}, -2 := {% trans 'undocumented' %} + {% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}
{% csrf_token %} {{ pre_form }} diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html index c63118426..de1b943f7 100644 --- a/openslides/assignment/templates/assignment/poll_view.html +++ b/openslides/assignment/templates/assignment/poll_view.html @@ -9,8 +9,10 @@

{{ ballotnumber }}. {%trans "ballot" %}: {{assignment.poll.get_options}} {% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %}

-

{% trans "Short description" %}: {{ assignment.polldescription }}

- -1 := {% trans 'majority' %}, -2 := {% trans 'undocumented' %} + {% if assignment.polldescription %} +

{% trans "Short description" %}: {{ assignment.polldescription }}

+ {% endif %} + {% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %} {% csrf_token %} @@ -39,28 +41,18 @@
{{ pollform.votescast.errors }}{{ pollform.votescast }}
- -

- - - {%trans 'Print ballot' %} - - -

- -

- - - - - -

+

+ + + + + +

- {% endblock %} diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index d38cc131a..c99ec0796 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -451,7 +451,7 @@ form .error input, form .error textarea { form input:after { font-weight: bold; } -form .helptext { +.helptext { font-size:9px; display: block; color: #556652;