From 6c206fa7409c238d13726cc2f04058967dadc450 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 1 Jul 2012 11:07:04 +0200
Subject: [PATCH] #246 open activate slide view ajax

---
 .../application/base_application.html         |  4 ++-
 .../templates/assignment/base_assignment.html | 28 +++++++++++++------
 openslides/projector/views.py                 |  4 ---
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html
index 9265fa5ab..8d5ec33d8 100644
--- a/openslides/application/templates/application/base_application.html
+++ b/openslides/application/templates/application/base_application.html
@@ -45,7 +45,9 @@
             <li><a href="{% url print_application application.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Application as PDF' %}</a></li>
         {# activate and polls #}
             {% if perms.projector.can_manage_projector %}
-                <li><a href="{% url projector_activate_slide application.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show Application' %}</a></li>
+                <li>
+                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show Application' %}</a>
+                </li>
             {% endif %}
             {% if perms.application.can_manage_application %}
                 {% for poll in application.polls %}
diff --git a/openslides/assignment/templates/assignment/base_assignment.html b/openslides/assignment/templates/assignment/base_assignment.html
index 98840cec0..c54f078be 100644
--- a/openslides/assignment/templates/assignment/base_assignment.html
+++ b/openslides/assignment/templates/assignment/base_assignment.html
@@ -27,22 +27,34 @@
         <ul>
             {# view assignemnt #}
             {% url assignment_view assignment.id as url_assignmentview %}
-            <li class="{% if request.path == url_assignmentview %}selected{% endif %}"><a href="{% url assignment_view assignment.id  %}">{%trans 'View election' %}</a></li>
+            <li class="{% if request.path == url_assignmentview %}selected{% endif %}">
+                <a href="{% url assignment_view assignment.id  %}">{%trans 'View election' %}</a>
+            </li>
 
             {% if perms.assignment.can_manage_assignment %}
-            {# edit assignemnt #}
-            {% url assignment_edit assignment.id as url_assignmentedit %}
-            <li class="{% if request.path == url_assignmentedit %}selected{% endif %}"><a href="{% url assignment_edit assignment.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit election' %}</a></li>
-            {# delete assignment #}
-            <li><a href="{% url assignment_delete assignment.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete election' %}</a></li>
+
+                {# edit assignemnt #}
+                {% url assignment_edit assignment.id as url_assignmentedit %}
+                <li class="{% if request.path == url_assignmentedit %}selected{% endif %}">
+                    <a href="{% url assignment_edit assignment.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit election' %}</a>
+                </li>
+
+                {# delete assignment #}
+                <li>
+                    <a href="{% url assignment_delete assignment.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete election' %}</a>
+                </li>
             {% endif %}
 
             {# PDF #}
-            <li><a href="{% url print_assignment assignment.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Election as PDF' %}</a></li>
+            <li>
+                <a href="{% url print_assignment assignment.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Election as PDF' %}</a>
+            </li>
 
             {# activate #}
             {% if perms.projector.can_manage_projector %}
-            <li><a href="{% url projector_activate_slide assignment.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show election' %}</a></li>
+            <li>
+                <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide assignment.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show election' %}</a>
+            </li>
             {% endif %}
 
             {# agenda #}
diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index c1a582cc9..ee7bb2daa 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -105,12 +105,8 @@ class ActivateView(RedirectView):
 
     def pre_redirect(self, request, *args, **kwargs):
         set_active_slide(kwargs['sid'])
-
-    def get_ajax_context(self, **kwargs):
-        context = super(ActivateView, self).get_ajax_context()
         config['up'] = 0
         config['bigger'] = 100
-        return context
 
 
 class CustomSlideCreateView(CreateView):