From 67384d0644504ad7239faf7033847509b3dc695d Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 18 Apr 2012 14:53:19 +0200
Subject: [PATCH] indent items in control view

---
 openslides/agenda/models.py                     |  2 +-
 .../agenda/templates/agenda/control_item.html   | 17 +++++++++++++++++
 .../projector/default_control_slidemodel.html   |  2 +-
 openslides/projector/urls.py                    |  5 -----
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 openslides/agenda/templates/agenda/control_item.html

diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index c55087a73..14298daa4 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -117,7 +117,7 @@ class Item(MPTTModel, SlideMixin):
         order_insertion_by = ['weight', 'title']
 
 
-register_slidemodel(Item)
+register_slidemodel(Item, control_template='agenda/control_item.html')
 
 # TODO: put this in another file
 
diff --git a/openslides/agenda/templates/agenda/control_item.html b/openslides/agenda/templates/agenda/control_item.html
new file mode 100644
index 000000000..8e75bebdb
--- /dev/null
+++ b/openslides/agenda/templates/agenda/control_item.html
@@ -0,0 +1,17 @@
+{% load staticfiles %}
+{% load i18n %}
+
+<ul style="line-height: 180%">
+{% for slide in slides.get_items %}
+    <li class="{% if slide.active %}activeline{% endif %}">
+        <a href="{% url projector_activate_slide slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
+            <div></div>
+        </a>
+        {% for p in slide.get_ancestors %}
+            <span class="indentation">&nbsp;</span>
+        {% endfor %}
+        <a href="{% url item_edit slide.id %}">{{ slide }}</a>
+    </li>
+{% endfor %}
+</ul>
+
diff --git a/openslides/projector/templates/projector/default_control_slidemodel.html b/openslides/projector/templates/projector/default_control_slidemodel.html
index f2c5ce499..ff875557d 100644
--- a/openslides/projector/templates/projector/default_control_slidemodel.html
+++ b/openslides/projector/templates/projector/default_control_slidemodel.html
@@ -7,7 +7,7 @@
         <a href="{% url projector_activate_slide slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
             <div></div>
         </a>
-        <a href="{% url projector_edit_slide slide.id %}">{{ slide }}</a>
+        <a href="{{ slide.get_absolute_url }}">{{ slide }}</a>
     </li>
 {% endfor %}
 </ul>
diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py
index 0138ede2a..04bb39708 100644
--- a/openslides/projector/urls.py
+++ b/openslides/projector/urls.py
@@ -39,11 +39,6 @@ urlpatterns = patterns('projector.views',
         name='projector_activate_summary',
     ),
 
-    url(r'^edit/(?P<pk>\d+)/$',
-        ItemUpdate.as_view(),
-        name='projector_edit_slide',
-    ),
-
     url(r'^new/$',
         CreateView.as_view(
             success_url='projector_control',