From f4ed79b68de3c33115570f611f34834d1797880d Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 15 Apr 2012 11:48:31 +0200
Subject: [PATCH] Application view: added link to edit a poll

---
 .../templates/application/view.html           | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index 8a8604030..2d4eefc3c 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -65,45 +65,44 @@
         <ul class="results">
         {% for poll in polls %}
             <li>
-            {% if perms.application.can_manage_application and poll.has_vote %}
-                <a href="{% url application_poll_view poll.id %}">
-            {% endif %}
-            <b>{{ forloop.counter }}. {% trans "Vote" %}:</b>
-            {% if perms.application.can_manage_application %}
-                {% if poll.has_vote %}</a>{% endif %}
-                <a href="{% url application_poll_delete poll.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete Vote' %}"></a>
-            {% endif %}
-            <br>
-            {% if poll.has_votes %}
-                {% with poll.get_options.0 as option %}
-                    <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.contained }}<br>
-                    <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
-                    <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
-                        <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
-                    </div>
-                {% endwith %}
                 {% if perms.application.can_manage_application %}
-                    {% if forloop.last %}
-                    {% if "genpoll" in actions %}
-                    <a href='{% url application_gen_poll application.id %}'>
-                        <span class="button"><span class="icon poll">{%trans 'New vote' %}</span></span>
+                    <a href="{% url application_poll_view poll.id %}">
+                        <b>{{ forloop.counter }}. {% trans "Vote" %}:</b>
                     </a>
+                    <a href="{% url application_poll_delete poll.id %}">
+                        <img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete Vote' %}">
+                    </a>
+                {% endif %}
+                <br>
+                {% if poll.has_votes %}
+                    {% with poll.get_options.0 as option %}
+                        <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.contained }}<br>
+                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                        <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
+                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                        </div>
+                    {% endwith %}
+                    {% if perms.application.can_manage_application %}
+                        {% if forloop.last %}
+                        {% if "genpoll" in actions %}
+                        <a href='{% url application_gen_poll application.id %}'>
+                            <span class="button"><span class="icon poll">{%trans 'New vote' %}</span></span>
+                        </a>
+                        {% endif %}
+                        {% endif %}
                     {% endif %}
+                {% else %}
+                    {% if perms.application.can_manage_application %}
+                    <a href="{% url application_poll_view poll.id %}">{% trans "Enter vote results!" %}</a>
                     {% endif %}
                 {% endif %}
-            {% else %}
-                {% if perms.application.can_manage_application %}
-                <a href="{% url application_poll_view poll.id %}">{% trans "Enter vote results!" %}</a>
-                {% endif %}
-            {% endif %}
             </li>
         {% endfor %}
         </ul>
         {% endwith %}
 
-
     <h4>{% trans "Creation Time" %}:</h4>
     {{ application.creation_time }}