From 97228f65583330c153b64a9ad975275f22e83dd3 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 3 Sep 2011 12:16:47 +0200 Subject: [PATCH] Show invalid votes in application view. --- .../templates/application/view.html | 107 +++++++++--------- openslides/static/styles/base.css | 7 +- 2 files changed, 58 insertions(+), 56 deletions(-) diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 7ec8742df..ed7f245af 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -41,28 +41,60 @@ {% if not forloop.last %}
{% endif %} {% endfor %} - {% with application.poll_set.all as polls %} - {% if poll|length > 0 %} -

{% trans "Poll result" %}:

- {% for poll in polls %} - {% if poll.has_vote %} - {% if polls|length > 1 %} - {{forloop.counter}}. {% trans "Poll" %}:
    - {% endif %} - {% for option in poll.options %} - {% trans "Yes" %}: {{ option.yes }} | - {% trans "No" %}: {{ option.no }} | - {% trans "Abstention" %}: {{ option.undesided }} - {% endfor %} -
- {% else %} - {% if polls|length == 1 %} - {% trans "Not (yet) available." %} +

{% trans "Vote results" %}:

+ {% with application.poll_set.all as polls %} + {% if polls|length == 0 %} + {% if perms.application.can_manage_application %} + {% if "genpoll" in actions %} + + + + {% else %} + - + {% endif %} + {% else %} + - {% endif %} {% endif %} - {% endfor %} - {% endif %} - {% endwith %} + + {% endwith %} +

{% trans "Creation Time" %}:

{{ application.creation_time }} @@ -126,41 +158,6 @@ {% endif %} - {% if application.status != "pub" %} -

- {% for poll in application.poll_set.all %} - {% if poll.has_vote %}{% endif %} - {{ forloop.counter }}. {% trans "Poll" %}: - {% if poll.has_vote %}{% endif %} - -
    - {% if poll.has_vote %} - {% for option in poll.options %} - {% trans "Yes" %}: {{ option.yes }} | - {% trans "No" %}: {{ option.no }} | - {% trans "Abstention" %}: {{ option.undesided }} - {% endfor %} - {% if forloop.last %} - {% if "genpoll" in actions %} -
- - - - {% endif %} - {% endif %} - {% else %} - {% trans "Enter vote results!" %} - {% endif %} - {% if not forloop.last %}
{% endif %} - {% empty %} - {% if "genpoll" in actions %} - - - - {% endif %} - {% endfor %} - {% endif %} - {% if "acc" in actions or "rej" in actions %}

{% trans "Result after vote" %}:

{% if "acc" in actions %} diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 2b2fb375e..c395fc778 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -441,7 +441,12 @@ ol { margin:0; padding-left:20px; } - +ul.results { + list-style:square outside none; + -moz-padding-start:0px; + margin-left: 20px; + padding:0; +} /* Fieldsets */ fieldset {