From ad38a8eead7c7b747c03b2b8755f4a9446d8e8e5 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 18 Mar 2012 15:11:01 +0100
Subject: [PATCH] put some lines in agenda template in seperate File

---
 .../agenda/templates/agenda/item_row.html     |  58 ++++++++
 .../agenda/templates/agenda/overview.html     | 131 ++++++------------
 openslides/static/styles/agenda.css           |   2 +-
 openslides/static/styles/base.css             |  12 +-
 4 files changed, 109 insertions(+), 94 deletions(-)
 create mode 100644 openslides/agenda/templates/agenda/item_row.html

diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
new file mode 100644
index 000000000..7b685b90b
--- /dev/null
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -0,0 +1,58 @@
+{% load i18n %}
+
+<tr id="item_row_{{ item.id }}" class="draggable{% cycle ' odd' '' %}
+    {% if item.active %} activeline{% else %}
+    {% if perms.agenda.can_manage_agenda %} inactiveline{% endif %}
+    {% endif %}">
+    {% if perms.agenda.can_manage_agenda %}
+        <td class="select">
+            <a id="activate_link_{{ item.id }}" class="activate_link" href="{% url item_activate item.id %}">
+                <div></div>
+            </a>
+        </td>
+    {% else %}
+        <td>
+            {% if item.closed %}
+                <img src="/static/images/icons/task-complete.png" title="{% trans 'Item closed' %}">
+            {% endif %}
+        </td>
+    {% endif %}
+    <td>
+        {% for p in item.get_ancestors %}
+            <div class="indentation">&nbsp;</div>
+        {% endfor %}
+
+        {% if perms.agenda.can_manage_agenda %}
+            <div class="dragcell"></div>
+        {% endif %}
+
+        {{ item }}
+
+    </td>
+    <td>
+        <span style="width: 1px;white-space: nowrap;">
+            <a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></a>
+
+            {% if perms.agenda.can_manage_agenda %}
+                <a href="{% url item_edit item.id %}"><img src="/static/images/icons/document-edit.png" title="{% trans 'Edit item' %}"></a>
+                <a href="{% url item_delete item.id %}"><img src="/static/images/icons/edit-delete.png" title="{% trans 'Delete item' %}"></a>
+                <a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
+                    <span></span>
+                </a>
+
+                {% if item.children.exists %}
+                    <a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
+                {% endif %}
+            {% endif %}
+        </span>
+    </td>
+    {% if perms.agenda.can_manage_agenda %}
+    <td class="tabledrag-hide">
+        {% with form=item.weight_form %}
+            {{ form.weight }}
+            {{ form.self }}
+            {{ form.parent }}
+        {% endwith %}
+    </td>
+    {% endif %}
+</tr>
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 914418c41..83a5e8484 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -36,111 +36,60 @@
     {% endif %}
 {% endblock %}
 
+
 {% block content %}
     <h1>{% trans "Agenda" %}</h1>
     {% if items %}
         <form action="/agenda/" method="post">{% csrf_token %}
-        {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage_agenda %}
             <div id="changed-order-message" style="display:none" class="notification warning">
                 <em>{% trans "Do you want to save the changed order of agenda items?" %}<br>
                     <input type="submit" value="{% trans 'Yes' %}">
                     <input type="button" onclick="window.location.href='{% url item_overview %}';" value="{%trans 'No' %}">
                 </em>
             </div>
-        {% endif %}
-
-        <table id="menu-overview" class="agendatable">
-            <tr>
-                {% if perms.agenda.can_manage_agenda %}
-                    <th style="width: 1px;">{% trans "Projector" %}</th>
-                {% else %}
-                    <th style="width: 1px;">{% trans "Done" %}</th>
-                {% endif %}
-                <th>{% trans "Item" %}</th>
-                <th style="width: 1px;">{% if perms.agenda.can_manage_agenda %}{% trans "Actions" %}{% endif %}</th>
-                {% if perms.agenda.can_manage_agenda %}
-                    <th class="tabledrag-hide">{% trans "Weight" %}</th>
-                {% endif %}
-            </tr>
-            <tr id="item_row_0" class="topline {% if overview %} activeline {% else %}{% if perms.agenda.can_manage_agenda %} inactiveline {% endif %}{% endif %}">
-                {% if perms.agenda.can_manage_agenda %}
-                    <td class="select">
-                        <a href="{% url item_activate 0 %}" class="activate_link">
-                            <div></div>
-                        </a>
-                    </td>
-                {% else %}
-                    <td></td>
-                {% endif %}
-                <td>
-                    <b>{% trans "Agenda" %} ({{ items|length }} {% trans "items" %}<span id="hiddencount"></span>)</b>
-                </td>
-                <td>
-                    <span id="action_field" style="width: 1px;white-space: nowrap;">
-                        <span></span>
-                        <a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}"><img src="/static/images/icons/application-pdf.png"></a>
-                    </span>
-                </td>
-            </tr>
-            {% for item in items %}
-                <tr id="item_row_{{ item.id }}" class="draggable{% cycle ' odd' '' %}
-                {% if item.active %} activeline{% else %}
-                {% if perms.agenda.can_manage_agenda %} inactiveline{% endif %}
-                {% endif %}">
-                {% if perms.agenda.can_manage_agenda %}
-                    <td class="select">
-                        <a id="activate_link_{{ item.id }}" class="activate_link" href="{% url item_activate item.id %}">
-                            <div></div>
-                        </a>
-                    </td>
-                {% else %}
-                    <td>
-                        {% if item.closed %}
-                            <img src="/static/images/icons/task-complete.png" title="{% trans 'Item closed' %}">
-                        {% endif %}
-                    </td>
-                {% endif %}
-                <td>
-                    {% for p in item.get_ancestors %}
-                        <div class="indentation">&nbsp;</div>
-                    {% endfor %}
+            {% endif %}
 
+            <table id="menu-overview" class="agendatable">
+                <tr>
                     {% if perms.agenda.can_manage_agenda %}
-                        <div class="dragcell"></div>
+                        <th style="width: 1px;">{% trans "Projector" %}</th>
+                    {% else %}
+                        <th style="width: 1px;">{% trans "Done" %}</th>
+                    {% endif %}
+                    <th>{% trans "Item" %}</th>
+                    <th style="width: 1px;">{% if perms.agenda.can_manage_agenda %}{% trans "Actions" %}{% endif %}</th>
+                    {% if perms.agenda.can_manage_agenda %}
+                        <th class="tabledrag-hide">{% trans "Weight" %}</th>
                     {% endif %}
-
-                    {{ item }}
-
-                </td>
-                <td>
-                    <span style="width: 1px;white-space: nowrap;">
-                        <a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></a>
-
-                        {% if perms.agenda.can_manage_agenda %}
-                            <a href="{% url item_edit item.id %}"><img src="/static/images/icons/document-edit.png" title="{% trans 'Edit item' %}"></a>
-                            <a href="{% url item_delete item.id %}"><img src="/static/images/icons/edit-delete.png" title="{% trans 'Delete item' %}"></a>
-                            <a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
-                                <span></span>
-                            </a>
-
-                            {% if item.children.exists %}
-                                <a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
-                            {% endif %}
-                        {% endif %}
-                    </span>
-                </td>
-                {% if perms.agenda.can_manage_agenda %}
-                <td class="tabledrag-hide">
-                    {% with form=item.weight_form %}
-                        {{ form.weight }}
-                        {{ form.self }}
-                        {{ form.parent }}
-                    {% endwith %}
-                </td>
-                {% endif %}
                 </tr>
-            {% endfor %}
-        </table>
+                <tr id="item_row_0" class="topline{% if overview %} activeline{% else %}{% if perms.agenda.can_manage_agenda %} inactiveline {% endif %}{% endif %}">
+                    {% if perms.agenda.can_manage_agenda %}
+                        <td class="select">
+                            <a href="{% url item_activate 0 %}" class="activate_link">
+                                <div></div>
+                            </a>
+                        </td>
+                    {% else %}
+                        <td></td>
+                    {% endif %}
+                    <td>
+                        <b>{% trans "Agenda" %} ({{ items|length }} {% trans "items" %}<span id="hiddencount"></span>)</b>
+                    </td>
+                    <td>
+                        <span id="action_field" style="width: 1px;white-space: nowrap;">
+                            <span></span>
+                        </span>
+                        <a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}" class="pdficon">
+                            <span></span>
+                        </a>
+                    </td>
+                </tr>
+
+                {% for item in items %}
+                    {% include "agenda/item_row.html" %}
+                {% endfor %}
+            </table>
         </form>
     {% else %}
         <i>{% trans "No items available." %}</i>
diff --git a/openslides/static/styles/agenda.css b/openslides/static/styles/agenda.css
index d176a52ab..2bd046516 100644
--- a/openslides/static/styles/agenda.css
+++ b/openslides/static/styles/agenda.css
@@ -62,4 +62,4 @@ a.countdown_visible_link.open div {
     width: 16px;
     height: 16px;
     display: inline-block;
-}
\ No newline at end of file
+}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index c2a90bb2c..0792b9973 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -477,8 +477,8 @@ ul.results {
 
 /* Misc */
 #sidebar {
-    width: 250px; 
-    float: right; 
+    width: 250px;
+    float: right;
     margin:50px 0 20px 10px;
 }
 .box {
@@ -553,3 +553,11 @@ ul.results {
     border-color: #A2B4EE;
     color: #585B66;
 }
+
+.pdficon span {
+    background-image: url("/static/images/icons/application-pdf.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: inline-block;