From f1fd3208bdd477992608efab9af0d304668ebc19 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 23 Nov 2013 14:07:32 +0100
Subject: [PATCH] Template fixes

- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
---
 openslides/agenda/static/styles/agenda.css    |  1 -
 .../agenda/static/styles/agenda_sort.css      |  4 +-
 .../agenda/templates/agenda/overview.html     | 52 ++++++++++---------
 .../assignment/assignment_detail.html         |  2 +-
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 0c591d880..9b02ab5a1 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -11,7 +11,6 @@ tr.topline td {
 }
 
 table#agendatime {
-    float: right;
     width: auto;
     margin-bottom: 1em;
     font-size: 12px;
diff --git a/openslides/agenda/static/styles/agenda_sort.css b/openslides/agenda/static/styles/agenda_sort.css
index 39866ec2d..1e0eedeff 100644
--- a/openslides/agenda/static/styles/agenda_sort.css
+++ b/openslides/agenda/static/styles/agenda_sort.css
@@ -54,8 +54,8 @@ ol.agenda_list {
 }
         
 .agenda_list .openclose { width: 40px; float: left; min-height: 1px; }
-.agenda_list .duration { width: 92px; float: right; min-height: 1px; padding-right: 25px; text-align: right; }
-.agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 5px; }
+.agenda_list .duration { width: 92px; float: right; min-height: 1px; text-align: right; }
+.agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 15px; }
 .agenda_list .title { float: left; padding-left: 5px;}
 .agenda_list .optional { float: left; }
 .agenda_list .opener_closer { float: left; margin-right: 8px; margin-left:-4px;}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index e7b9a9158..e40a4ab2e 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -43,31 +43,35 @@
             </small>
         </h1>
 
-        {% if perms.agenda.can_see_orga_items %}
-            {% if start and end %}
-                <table id="agendatime" class="table table-bordered">
-                    <tr>
-                        <td>{% trans "Start of event" %}:</td>
-                        <td>{{ start|date:"DATETIME_FORMAT" }}</td>
-                    </tr>
-                    <tr>
-                        <td>{% trans "Estimated end" %}:</td>
-                        <td>{{ end|date:"DATETIME_FORMAT" }}</td>
-                    </tr>
-                </table>
-            {% else %}
-                <div style="float: right;">
-                    <a href="{% url 'config_agenda' %}" class="btn btn-mini">{% trans 'Set start time of event' %}</a>
-                </div>
-            {% endif %}
-        {% endif %}
-        <label class="checkbox">
-            <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
-        </label>
+        <div class="row-fluid">
+            <div class="span6">
+                <label class="checkbox">
+                    <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
+                </label>
+                <small><i>{{ items|length }}
+                {% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
+                </i></small>
+            </div>
+            <div class="span6">
+                {% if perms.agenda.can_see_orga_items %}
+                    {% if start and end %}
+                        <table id="agendatime" class="table table-bordered pull-right">
+                            <tr>
+                                <td>{% trans "Start of event" %}:</td>
+                                <td>{{ start|date:"DATETIME_FORMAT" }}</td>
+                            </tr>
+                            <tr>
+                                <td>{% trans "Estimated end" %}:</td>
+                                <td>{{ end|date:"DATETIME_FORMAT" }}</td>
+                            </tr>
+                        </table>
+                    {% else %}
+                        <a href="{% url 'config_agenda' %}" class="btn btn-mini pull-right">{% trans 'Set start time of event' %}</a>
+                    {% endif %}
+                {% endif %}
+            </div>
+        </div>
 
-        <small><i>{{ items|length }}
-        {% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
-        </i></small>
         <table id="menu-overview" class="table table-striped table-bordered">
             <tr>
                 <th class="title">{% trans "Item" %}</th>
diff --git a/openslides/assignment/templates/assignment/assignment_detail.html b/openslides/assignment/templates/assignment/assignment_detail.html
index eed245690..5620b62af 100644
--- a/openslides/assignment/templates/assignment/assignment_detail.html
+++ b/openslides/assignment/templates/assignment/assignment_detail.html
@@ -150,7 +150,7 @@
             <th>{% trans "Candidates" %}</th>
             {% for poll in polls %}
                 <th style="white-space:nowrap;" class="span1">
-                    {% if perms.assignment.can_manage_assignment %}<p>{% endif %}
+                    {% if perms.assignment.can_manage_assignment %}<p class="text-center">{% endif %}
                     {{ poll.get_ballot|ordinal|safe }} {% trans 'ballot' %}
                     {% if perms.assignment.can_manage_assignment %}
                         <a class="publish_link btn btn-mini btn-danger {% if poll.published %}btn-primary{% endif %}"