From a51a29643418503173105a54ab88a0f78ee12aaa Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 9 Feb 2013 22:59:15 +0100
Subject: [PATCH] Changed agenda start/end time to djangos DATETIME_FORMAT.

---
 openslides/agenda/static/styles/agenda.css       | 3 ++-
 openslides/agenda/templates/agenda/item_row.html | 2 +-
 openslides/agenda/templates/agenda/overview.html | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 3a656f47c..3a35060b3 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -25,10 +25,11 @@ table#menu-overview {
 
 table#agendatime {
     float: right;
-    width: 25%;
+    width: auto;
     margin-bottom: 1em;
 }
 
 table#agendatime td {
     padding: 5px;
+    white-space: nowrap;
 }
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 9be06172f..2f86d27d0 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -29,7 +29,7 @@
     </td>
     {% endif %}
     {% if perms.agenda.can_see_orga_items %}
-    <td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"D d M Y H.i" }}"{% endif %}>
+    <td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}>
         {% if item.duration %}
             {{ item.duration }}h
         {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 591f38def..a72a8b286 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -55,11 +55,11 @@
         <table id="agendatime">
            <tr>
                <td>{% trans "Start of event" %}:</td>
-               <td>{{ start|date:"D d M Y H.i" }}h</td>
+               <td>{{ start|date:"DATETIME_FORMAT" }}</td>
            </tr>
            <tr>
                <td>{% trans "Estimated end" %}:</td>
-               <td>{{ end|date:"D d M Y H.i" }}h</td>
+               <td>{{ end|date:"DATETIME_FORMAT" }}</td>
            </tr>
         </table>
         {% endif %}