From e3428d3e83c285157d4bc33d017d94f0b5ec62ee Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 11 Feb 2013 23:01:48 +0100
Subject: [PATCH] Some style work.

---
 openslides/agenda/static/styles/agenda.css    |   3 +-
 .../agenda/templates/agenda/config.html       |  29 +++++++++---------
 .../agenda/templates/agenda/item_row.html     |   4 +--
 .../agenda/templates/agenda/overview.html     |  18 +++++------
 .../static/img/glyphicons_054_clock.png       | Bin 0 -> 1033 bytes
 openslides/static/styles/base.css             |   5 ++-
 6 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 openslides/static/img/glyphicons_054_clock.png

diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 45c80fda1..2979007c9 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -15,9 +15,10 @@ table#agendatime {
     float: right;
     width: auto;
     margin-bottom: 1em;
+    font-size: 12px;
 }
 
 table#agendatime td {
-    padding: 5px;
+    padding: 3px;
     white-space: nowrap;
 }
diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html
index a749108b2..d0e895c51 100644
--- a/openslides/agenda/templates/agenda/config.html
+++ b/openslides/agenda/templates/agenda/config.html
@@ -8,6 +8,9 @@
 {% block header %}
     <link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.10.0/themes/smoothness/jquery-ui.css" />
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/timepicker.css' %}" />
+{% endblock %}
+
+{% block javascript %}
     <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-1.10.0.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-timepicker-addon.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-sliderAccess.js' %}"></script>
@@ -63,22 +66,20 @@
 {% block title %}{{ block.super }} – {% trans "Agenda settings" %}{% endblock %}
 
 
-
 {% block content %}
-    <h1>{% trans "Configuration" %}: {% trans "Agenda" %}
+    <h1>
+        {% trans "Configuration" %}
+        <small>{% trans "Agenda" %}</small>
         {% block config_submenu %}{{ block.super }}{% endblock %}
     </h1>
     <form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href="{% url 'config_agenda' %}">
-    <button class="button" type="button" onclick="window.location='{% url 'config_agenda' %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_save.html" %}
+        <a href="{% url 'config_agenda' %}" class="btn">
+            {% trans 'Cancel' %}
+        </a>
+        </p>
+        <small>* {% trans "required" %}</small>
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 723cd6915..af495ce33 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -29,9 +29,9 @@
     </td>
     {% endif %}
     {% if perms.agenda.can_see_orga_items %}
-    <td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}>
+    <td>
         {% if item.duration %}
-            {{ item.duration }}h
+            {{ item.duration }}h <i class="icon-clock" {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}></i>
         {% endif %}
     </td>
     {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 4f714cb72..f6fc0916e 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -53,9 +53,17 @@
        {% endif %}
 
         <h1>{% trans "Agenda" %}
+            <small class="pull-right">
+            {% if perms.agenda.can_manage_agenda %}
+            <a href="{% url 'item_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            {% endif %}
+            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
+            </small>
+        </h1>
+        
         {% if perms.agenda.can_see_orga_items %}
         {% if start and end %}
-        <table id="agendatime">
+        <table id="agendatime" class="table table-bordered">
            <tr>
                <td>{% trans "Start of event" %}:</td>
                <td>{{ start|date:"DATETIME_FORMAT" }}</td>
@@ -67,14 +75,6 @@
         </table>
         {% endif %}
         {% endif %}
-	    <small class="pull-right">
-            {% if perms.agenda.can_manage_agenda %}
-            <a href="{% url 'item_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-            {% endif %}
-            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
-            </small>
-        </h1>
-
         <label class="checkbox">
             <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
         </label>
diff --git a/openslides/static/img/glyphicons_054_clock.png b/openslides/static/img/glyphicons_054_clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..984bcc2cbffff674effb23933932631ce56a7c33
GIT binary patch
literal 1033
zcmV+k1or!hP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0NzPNK~yM_ozhKC!$1rL;4dvwfA$;zrF$05Nh*%gRfQUH
z1P*|D2W|pqV9{NaB^!o~6Il@`h>@)E*zb8fo(EMaMJWXuT+pF}brIVqTqPZj3Ebl?
ztWWXdh@X(Y(4xi$TkLR(+(;hU8%T$tVm2)BkjQ({e?c3dHCBmq#x=;Nz+S}Td(@L#
zZt)brbHsLm?L^`o>qtK16(5m%OvSb_u(I&;Dp=tYFHlug74dQX*6JPZ!(YZ;=T_&2
zv&2pKZ640-cLeE>zN48Fz$X0GQ~>{$oWF~_$s+#-Jrn06czm%@00000NkvXXu0mjf
D4m{^B

literal 0
HcmV?d00001

diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 4ab1f07a4..7075a4103 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -311,7 +311,10 @@ legend + .control-group {
     background-image: url("../img/glyphicons_006_user_add.png");
     background-position: 0;
 }
-
+.icon-clock {
+    background-image: url("../img/glyphicons_054_clock.png");
+    background-position: 0;
+}
 
 
 /** Responsive **/