From 6a3bead5f65137e8103d48685aae584da032c405 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 6 Sep 2012 23:59:03 +0200
Subject: [PATCH] Cleanup template code and style.

---
 openslides/agenda/templates/agenda/edit.html  | 16 +++++++--------
 .../agenda/templates/agenda/overview.html     | 12 +++++------
 .../templates/application/import.html         |  6 +++---
 .../templates/application/overview.html       |  5 +++--
 openslides/static/styles/base.css             | 20 +++++++------------
 openslides/templates/base.html                |  1 -
 6 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 39b319c96..2291fbc2a 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -13,14 +13,14 @@
 
 {% block content %}
     <h1>
-    {% if item %}
-        {% trans "Edit item" %}
-    {% else %}
-        {% trans "New item" %}
-    {% endif %}
-    <small class="pull-right">
-    <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-    </small>
+        {% if item %}
+            {% trans "Edit item" %}
+        {% else %}
+            {% trans "New item" %}
+        {% endif %}
+        <small class="pull-right">
+        <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
         {% for field in form %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index f529f693b..ed8f6f8e6 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -54,12 +54,12 @@
        {% 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>
+            <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">
diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html
index e87ca7436..e92dbad56 100644
--- a/openslides/application/templates/application/import.html
+++ b/openslides/application/templates/application/import.html
@@ -6,9 +6,9 @@
 
 {% block content %}
     <h1>{% trans "Import motions" %}
-    <small class="pull-right">
-    <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-    </small>
+        <small class="pull-right">
+        <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
     </h1>
 
     <p>{% trans 'Select a CSV file to import motions!' %}</p>
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index a26da98cb..ef4b9a7ca 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -7,8 +7,9 @@
 {% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Motions" %}
-    <small class="pull-right">
+    <h1>
+        {% trans "Motions" %}
+        <small class="pull-right">
         {% if perms.application.can_manage_application %}
             <a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
             <a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 648b55204..9cc393605 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -30,18 +30,6 @@ h1 {
 h5 {
     margin-bottom: 0px;
 }
-/*h1 small a {
-    background: none repeat scroll 0 0 #F1F1F1;
-    border: 0 none;
-    font-family: sans-serif;
-    font-size: 14px;
-    margin-left: 4px;
-    padding: 3px 8px;
-    position: relative;
-    text-decoration: none;
-    top: -7px;
-}*/
-
 
 a:hover {
     text-decoration: none;
@@ -151,7 +139,7 @@ a:hover {
     background-position: -24px -24px;
 }
 .icon-assignment {
-    background-position: -408px 0;
+    background-position: -144px -72px;
 }
 .icon-participant {
     background-position: -168px 0;
@@ -167,6 +155,12 @@ a:hover {
 .alert form {
     margin-bottom: 0;
 }
+tr.total td {
+    border-top: 1px solid #333333;
+}
+.nobr {
+    white-space: nowrap;
+}
 
 /** Forms **/
 .errorlist{
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index 0fd26c505..0164770e3 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -15,7 +15,6 @@
     <link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet">
-
     <link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
     {% block header %}
     {% endblock %}