From eb7672074e955547a943c31e0688cf759f9f72fc Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 30 Apr 2012 08:30:04 +0200
Subject: [PATCH] Some more style work for application projector template.

---
 .../templates/projector/Application.html      | 56 +++++++++----------
 .../projector/static/styles/projector.css     |  5 ++
 2 files changed, 33 insertions(+), 28 deletions(-)

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 %}
         </p>
 
+        {% with application.polls as polls %}
+        {% if polls.exists and polls.0.has_votes %}
+        <p><b>{% trans "Poll result" %}:</b><br>
+        {% for poll in polls %}
+            {% if poll.has_votes %}
+                {% if polls|length > 1 %}
+                    {{forloop.counter}}. {% trans "Vote" %}:
+                {% endif %}
+                {% with poll.get_options.0 as option %}
+                <div class="results">
+                    <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.Abstain }}<br>
+                    <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                    <hr>
+                    <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                </div>
+                {% endwith %}
+            {% else %}
+                {% if poll|length  == 1 %}
+                <i>{% trans "No poll results available." %}</i>
+                {% endif %}
+            {% endif %}
+        {% endfor %}
+        </p>
+        {% endif %}
+        {% endwith %}
+
         <p><b>{% trans "Submitter" %}:</b><br>
         {{ application.submitter.profile }}
         </p>
-
-    {% with application.polls as polls %}
-    {% if polls.exists and polls.0.has_votes %}
-    <p><b>{% trans "Poll result" %}:</b><br>
-    {% for poll in polls %}
-        {% if poll.has_votes %}
-            {% if polls|length > 1 %}
-                {{forloop.counter}}. {% trans "Vote" %}:<br>
-            {% endif %}
-            {% with poll.get_options.0 as option %}
-            <div class="results" style="font-size: 120%;">
-                <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.Abstain }}<br>
-                <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
-                <hr>
-                <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
-            </div>
-            {% endwith %}
-        {% else %}
-            {% if poll|length  == 1 %}
-            <i>{% trans "No poll results available." %}</i>
-            {% endif %}
-        {% endif %}
-    {% endfor %}
-    </p>
-    {% endif %}
-    {% endwith %}
     </div>
     </div>
 
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