From 71eb529adf9f1622f7ec6837fa7fae89dcd16bea Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 17 Nov 2012 20:59:30 +0100
Subject: [PATCH] Fixed #403: Moved projector control icons into projector live
 widget (Added RequestContext to check perms in template.)

---
 .../templates/projector/dashboard.html        | 21 --------------
 .../templates/projector/live_view_widget.html | 29 +++++++++++++++++++
 openslides/projector/views.py                 |  2 ++
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 5b6b9091e..4debd4139 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -15,27 +15,6 @@
 
 {% block content %}
     <h1>{% trans 'Dashboard' %}</h1>
-    {% if perms.projector.can_manage_projector %}
-        <div style="text-align: right; padding: 0 10px 5px 0; margin-top:-20px;">
-            <!-- control projector view -->
-            {% trans "Adjust projector view" %}:
-            <a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
-                <img src="{% static 'images/icons/zoom-in.png' %}" />
-            </a>
-            <a class="projector_edit" href="{% url projector_smaller %}" title="{% trans 'Zoom out' %}">
-                <img src="{% static 'images/icons/zoom-out.png' %}" />
-            </a>
-            <a class="projector_edit" href="{% url projector_up %}" title="{% trans 'Scroll text up' %}">
-                <img src="{% static 'images/icons/go-up.png' %}" />
-            </a>
-            <a class="projector_edit" href="{% url projector_down %}" title="{% trans 'Scroll text down' %}">
-                <img src="{% static 'images/icons/go-down.png' %}" />
-            </a>
-            <a class="projector_edit" href="{% url projector_clean %}" title="{% trans 'Reset projector view' %}">
-                <img src="{% static 'images/icons/view-reset.png' %}" />
-            </a>
-        </div>
-    {% endif %}
 
     <div class="column" id="col1">
         {% for name, widget in widgets.items %}
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index 69672f157..0904868f1 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/openslides/projector/templates/projector/live_view_widget.html
@@ -1,7 +1,36 @@
 {% load i18n %}
 {% load tags %}
+{% load staticfiles %}
 
 
+<!-- projector control buttons -->
+{% if perms.projector.can_manage_projector %}
+    <div style="float: right;">
+        <p>
+        <a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
+            <img src="{% static 'images/icons/zoom-in.png' %}" />
+        </a><br>
+        <a class="projector_edit" href="{% url projector_smaller %}" title="{% trans 'Zoom out' %}">
+            <img src="{% static 'images/icons/zoom-out.png' %}" />
+        </a>
+        </p>
+        <p>
+        <a class="projector_edit" href="{% url projector_up %}" title="{% trans 'Scroll text up' %}">
+            <img src="{% static 'images/icons/go-up.png' %}" />
+        </a><br>
+        <a class="projector_edit" href="{% url projector_down %}" title="{% trans 'Scroll text down' %}">
+            <img src="{% static 'images/icons/go-down.png' %}" />
+        </a>
+        </p>
+        <p>
+        <a class="projector_edit" href="{% url projector_clean %}" title="{% trans 'Reset projector view' %}">
+            <img src="{% static 'images/icons/view-reset.png' %}" />
+        </a>
+        </p>
+    </div>
+{% endif %}
+
+<!-- projector view -->
 <a href="{% url projector_show %}" target="_blank">
     <div id="iframewrapper">
         <iframe id="iframe" src="{% url projector_show %}" frameborder="0"></iframe>
diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index 7f008c87e..2b117ce38 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -22,6 +22,7 @@ from django.db import transaction
 from django.db.models import Q
 from django.dispatch import receiver
 from django.shortcuts import redirect
+from django.template import RequestContext
 from django.utils.datastructures import SortedDict
 from django.utils.importlib import import_module
 from django.utils.translation import ugettext_lazy as _
@@ -410,6 +411,7 @@ def get_widgets(request):
         name='live_view',
         display_name=_('Projector live view'),
         template='projector/live_view_widget.html',
+        context = RequestContext(request, {}),
         permission_required='projector.can_see_projector',
         default_column=2))