From d22118ac72f014e2740849323197b048aa47fd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Sun, 1 Jul 2012 16:28:11 +0200
Subject: [PATCH] Fix #252

---
 .../templates/application/poll_view.html      | 21 ++++++++++++-------
 .../templates/assignment/poll_view.html       | 18 +++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html
index fa9c8d8ab..3dd418213 100644
--- a/openslides/application/templates/application/poll_view.html
+++ b/openslides/application/templates/application/poll_view.html
@@ -14,13 +14,7 @@
     <form action="" method="post" class="small-form">{% csrf_token %}
         {{ pre_form }}
         <span id="poll_id" style="display:none">{{ poll.id }}</span>
-        <span style="float:right;">
-        <a href='{% url print_application_poll poll.id %}'>
-        <button class="button" type="button" onclick="window.location='{% url print_application_poll poll.id %}'">
-            <span class="icon pdf">{%trans 'Ballot paper as PDF' %}</span>
-        </button>
-        </a>
-        </span>
+
         <table class="table" style="width: auto;">
             <tr>
                 <th>{% trans "Option" %}</th>
@@ -41,8 +35,18 @@
                 <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
             </tr>
         </table>
+
         {{ post_form }}
-        <p></p>
+
+        <p>
+        <a href='{% url print_application_poll poll.id %}'>
+        <button class="button" type="button" onclick="window.location='{% url print_application_poll poll.id %}'">
+            <span class="icon pdf">{%trans 'Ballot paper as PDF' %}</span>
+        </button>
+        </a>
+        </p>
+        
+        <p>
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
@@ -54,5 +58,6 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
     </form>
 {% endblock %}
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index a3c07163a..eceb3278d 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -14,13 +14,7 @@
     {% endif %}
     <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
     <form action="" method="post" class="small-form">{% csrf_token %}
-    <span style="float:right;">
-    <a href='{% url print_assignment_poll poll.id %}'>
-    <button class="button" type="button" onclick="window.location='{% url print_assignment_poll poll.id %}'">
-        <span class="icon pdf">{%trans 'Ballot paper as PDF' %}</span>
-    </button>
-    </a>
-    </span>
+
     <table style="width:auto">
         <tr>
             <th>{% trans "Candidates" %}</th>
@@ -48,6 +42,15 @@
                 <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
             </tr>
     </table>
+    
+    <p>
+    <a href='{% url print_assignment_poll poll.id %}'>
+    <button class="button" type="button" onclick="window.location='{% url print_assignment_poll poll.id %}'">
+        <span class="icon pdf">{%trans 'Ballot paper as PDF' %}</span>
+    </button>
+    </a>
+    </p>
+    
     <p>
     <button class="button" type="submit">
         <span class="icon ok">{%trans 'Save' %}</span>
@@ -61,5 +64,6 @@
     </button>
     </a>
     </p>
+    
     </form>
 {% endblock %}