From dc863cc3b91ac776922628cca5c93b7a8fa9cef5 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 23 Apr 2012 22:07:52 +0200
Subject: [PATCH] Added custom slides portlet.

---
 openslides/projector/models.py                |  2 +-
 .../static/javascript/projector-control.js    |  1 +
 .../templates/projector/control.html          | 26 ++++++++++++++++++-
 .../projector/templates/projector/new.html    |  4 +--
 openslides/projector/urls.py                  |  2 +-
 openslides/static/styles/base.css             |  2 +-
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/openslides/projector/models.py b/openslides/projector/models.py
index cd6334516..c3e25840f 100644
--- a/openslides/projector/models.py
+++ b/openslides/projector/models.py
@@ -16,7 +16,7 @@ class ProjectorSlide(models.Model, SlideMixin):
 
     title = models.CharField(max_length=100, verbose_name=_("Title"))
     text = models.TextField(null=True, blank=True, verbose_name=_("Text"))
-    weight = models.IntegerField(default=0, verbose_name=_("Weight"))
+    #weight = models.IntegerField(default=0, verbose_name=_("Weight"))
 
     def slide(self):
         return {
diff --git a/openslides/projector/static/javascript/projector-control.js b/openslides/projector/static/javascript/projector-control.js
index 3948cb97b..ad4ceac32 100644
--- a/openslides/projector/static/javascript/projector-control.js
+++ b/openslides/projector/static/javascript/projector-control.js
@@ -11,6 +11,7 @@ $(function() {
             success: function(data) {
                 $('.activate_link').removeClass('active');
                 $('li').removeClass('activeline');
+                $('div').removeClass('activeline');
                 link.addClass('active');
                 link.parent().addClass('activeline');
             },
diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html
index f685e4a40..c0eac9a3d 100644
--- a/openslides/projector/templates/projector/control.html
+++ b/openslides/projector/templates/projector/control.html
@@ -64,7 +64,7 @@
         {% if category != 'projector' %}
         <div class="portlet">
             {% with category_big=category|capfirst %}
-            <div class="portlet-header">{% trans  category_big %}</div>
+            <div class="portlet-header">{% trans category_big %}</div>
             {% endwith %}
             <div class="portlet-content">
             {% for slides in group %}
@@ -143,5 +143,29 @@
                 </ul>
             </div>
         </div> <!-- end portlet-->
+
+        <!-- Custom slides -->
+        {% for category, group in categories.items %}
+            {% if category == 'projector' %}
+            <div class="portlet">
+                <div class="portlet-header">{% trans "Custom slides" %}</div>
+                <div class="portlet-content">
+                {% for slides in group %}
+                    {% if slides.control_template %}
+                        {% include slides.control_template %}
+                    {% endif %}
+                    {% if not forloop.last %}
+                        <hr>
+                    {% endif %}
+                {% endfor %}
+                <a href='{% url custom_slides_new %}'>
+                <button class="button" type="button" onclick="window.location='{% url custom_slides_new %}'">
+                    <span class="icon add">{%trans 'New slide' %}</span>
+                </button>
+                </a>
+                </div>
+            </div> <!-- end portlet-->
+           {% endif %}
+        {% endfor %}
     </div> <!-- end column -->
 {% endblock %}
diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html
index 607a4bc31..927839d2c 100644
--- a/openslides/projector/templates/projector/new.html
+++ b/openslides/projector/templates/projector/new.html
@@ -3,10 +3,10 @@
 {% load tags %}
 {% load i18n %}
 
-{% block title %}{{ block.super }} – {%trans "New Slide" %}{% endblock %}
+{% block title %}{{ block.super }} – {%trans "New custom slide" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans 'New Slide' %}</h1>
+    <h1>{% trans 'New custom slide' %}</h1>
     <form action="" method="post">{% csrf_token %}
         {{ form.as_p }}
         <button class="button" type="submit">
diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py
index 68f00d1f6..f2a88e9d9 100644
--- a/openslides/projector/urls.py
+++ b/openslides/projector/urls.py
@@ -53,7 +53,7 @@ urlpatterns = patterns('projector.views',
             template_name='projector/new.html',
             permission_required='projector.can_manage_projector'
         ),
-        name='projector_new',
+        name='custom_slides_new',
     ),
 
     url(r'^bigger/$', 'projector_edit', {'direction': 'bigger'},
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 978e7c142..bc3aebc76 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -395,7 +395,7 @@ input[type="submit"], input[type="button"]  {
 .button .import{
     background:url(../images/icons/import.png) no-repeat 0px 0px;
 }
-.button .add{
+.add{
     background:url(../images/icons/add.png) no-repeat 0px 0px;
 }
 .button .number{