From e822efdc81fec8666452a3a698b88c17389bc273 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 4 Feb 2013 13:06:36 +0100
Subject: [PATCH] Some template style work.

---
 .../templates/assignment/poll_view.html       |  5 +-
 .../assignment/templates/assignment/view.html |  2 +-
 .../motion/templates/motion/poll_view.html    | 85 ++++++++++---------
 openslides/static/styles/base.css             |  3 +
 4 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index f7c90ad9f..6ac33793d 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -25,8 +25,9 @@
     <p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
 {% endif %}
 
-<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
-
+<p>
+{% trans "Special values" %}: <span class="badge badge-success">-1</span> = {% trans 'majority' %} | <span class="badge">-2</span> = {% trans 'undocumented' %}
+</p>
 <form action="" method="post" class="small-form">{% csrf_token %}
     <table class="table table-striped table-bordered" style="width: auto;">
         <tr>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index f7ab63059..c74623b39 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -98,7 +98,7 @@
 {% endif %}
 
 {% if perms.assignment.can_manage_assignments and blocked_candidates and assignment.status != "fin" %}
-    <h3>{% trans "Blocked Candidates" %}</h3>
+    <h4>{% trans "Blocked Candidates" %}</h4>
     <ul>
     {% for person in blocked_candidates %}
         <li>
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index 11c61baf6..e4d9c7465 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -39,49 +39,50 @@
     </small>
 </h1>
 
-<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
-
-    <form action="" method="post" class="small-form">{% csrf_token %}
-        {{ pre_form }}
-        <span id="poll_id" style="display:none">{{ poll.id }}</span>
-        <table class="table table-striped table-bordered" style="width: auto;">
+<p>
+{% trans "Special values" %}: <span class="badge badge-success">-1</span> = {% trans 'majority' %} | <span class="badge">-2</span> = {% trans 'undocumented' %}
+</p>
+<form action="" method="post" class="small-form">{% csrf_token %}
+    {{ pre_form }}
+    <span id="poll_id" style="display:none">{{ poll.id }}</span>
+    <table class="table table-striped table-bordered" style="width: auto;">
+        <tr>
+            <th>{% trans "Option" %}</th>
+            <th>{% trans "Votes" %}</th>
+        </tr>
+        {% for value in forms.0 %}
             <tr>
-                <th>{% trans "Option" %}</th>
-                <th>{% trans "Votes" %}</th>
+                <td>{{ value.label }}</td>
+                <td>{{ value.errors }}{{ value }}</td>
             </tr>
-            {% for value in forms.0 %}
-                <tr>
-                    <td>{{ value.label }}</td>
-                    <td>{{ value.errors }}{{ value }}</td>
-                </tr>
-            {% endfor %}
-            <tr>
-                <td>{% trans "Invalid votes" %}</td>
-                <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
-            </tr>
-            <tr class="total warning">
-                <td>{% trans "Votes cast" %}</td>
-                <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
-            </tr>
-        </table>
-        {{ post_form }}
-        <!-- ballot paper button -->
-        <p>
-        <a href="{% url 'print_motion_poll' poll.id %}" class="btn">
-            <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
+        {% endfor %}
+        <tr>
+            <td>{% trans "Invalid votes" %}</td>
+            <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
+        </tr>
+        <tr class="total warning">
+            <td>{% trans "Votes cast" %}</td>
+            <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
+        </tr>
+    </table>
+    {{ post_form }}
+    <!-- ballot paper button -->
+    <p>
+    <a href="{% url 'print_motion_poll' poll.id %}" class="btn">
+        <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
+    </a>
+    </p>
+    <!-- Control buttons -->
+    <div class="control-group">
+        <button type="submit" class="btn btn-primary">
+            {% trans 'Save' %}
+        </button>
+        <button type="submit" name="apply" class="btn">
+            {% trans 'Apply' %}
+        </button>
+        <a href="{% url 'motion_view' motion.id %}" class="btn">
+            {% trans 'Cancel' %}
         </a>
-        </p>
-        <!-- Control buttons -->
-        <div class="control-group">
-            <button type="submit" class="btn btn-primary">
-                {% trans 'Save' %}
-            </button>
-            <button type="submit" name="apply" class="btn">
-                {% trans 'Apply' %}
-            </button>
-            <a href="{% url 'motion_view' motion.id %}" class="btn">
-                {% trans 'Cancel' %}
-            </a>
-        </div>
-    </form>
+    </div>
+</form>
 {% endblock %}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 771beedeb..51e2458de 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -116,6 +116,9 @@ tr.total td {
 input, textarea {
     width: 320px;
 }
+.small-form input {
+    width: 33px;
+}
 textarea {
     height: 100px;
 }