From 4967b2b358cdb55bdb186134e74e18d2971a8a17 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 15 Apr 2012 15:21:19 +0200
Subject: [PATCH 1/2] New agenda view template.

---
 openslides/agenda/templates/agenda/view.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index a264d50b3..688e2a79f 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -6,6 +6,11 @@
 
 {% block content %}
     <h1>{{ item.title }}</h1>
-    {{ item.text }}
+    <p>{{ item.text|safe|linebreaks }}</p>
+
+    {% if perms.agenda.can_manage_agenda and item.comment %}
+    <h2>{% trans "Comment" %}</h2>
+    <p>{{ item.comment|linebreaks }}</p>
+    {% endif %}
 
 {% endblock %}

From f44f2723dc6452ca59ea998d15f7ba9b86c6348b Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 15 Apr 2012 15:53:05 +0200
Subject: [PATCH 2/2] Added link to activate agenda item in overview table.

---
 openslides/agenda/static/javascript/agenda.js | 19 +++++++++++++++++++
 openslides/agenda/static/styles/agenda.css    | 12 ++++++++++++
 .../agenda/templates/agenda/item_row.html     |  3 +++
 3 files changed, 34 insertions(+)

diff --git a/openslides/agenda/static/javascript/agenda.js b/openslides/agenda/static/javascript/agenda.js
index 5dc2eb9b0..0dfdfd92d 100644
--- a/openslides/agenda/static/javascript/agenda.js
+++ b/openslides/agenda/static/javascript/agenda.js
@@ -46,6 +46,25 @@ $(function() {
             }
         });
     });
+    // activate an element to show it on projector
+    $('.activate_link').click(function(event) {
+        event.preventDefault();
+        link = $(this);
+        $.ajax({
+            type: 'GET',
+            url: $(this).attr('href'),
+            dataType: 'json',
+            data: '',
+            success: function(data) {
+                $('.activate_link').removeClass('active');
+                //$('li').removeClass('activeline');
+                link.addClass('active');
+            },
+            error: function () {
+                alert("Ajax Error");
+            }
+        });
+    });
     // hide closed items
     $('#action_field span').after($('<a id="hidelink" class="hidelink hide" title="hide" href="#"><span></span></a>').click(function () {
         if ($.cookie('Slide.HideClosed') == 1) {
diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 2123bf169..42cde9622 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -31,4 +31,16 @@ a.hidelink.show span {
     height: 16px;
     display: inline-block;
 }
+/* activate link */
+a.activate_link span {
+    background-image: url(../images/icons/task-accepted-grey.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
+a.activate_link.active span {
+    background-image: url(../images/icons/task-accepted.png);
+}
 
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index d1fdfd1f4..d43a41fdc 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -24,6 +24,9 @@
     <td>
         <span style="width: 1px; white-space: nowrap;">
             {% if perms.agenda.can_manage_agenda %}
+                <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide item.sid %}">
+                    <span></span>
+                </a>
                 <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>
             {% endif %}