From ddeaea88c4f6177936647d1471a143eaa088eb6d Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 15 Apr 2012 14:16:00 +0200
Subject: [PATCH 1/2] Moved agenda pdf link to submenu.

---
 openslides/agenda/templates/agenda/base_agenda.html | 2 ++
 openslides/agenda/templates/agenda/overview.html    | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
index 4f5ff982d..6760fad73 100644
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ b/openslides/agenda/templates/agenda/base_agenda.html
@@ -2,6 +2,7 @@
 
 {% load tags %}
 {% load i18n %}
+{% load staticfiles %}
 
 {% block submenu %}
     {% url item_overview as url_itemoverview %}
@@ -12,5 +13,6 @@
         {% if perms.agenda.can_manage_agenda %}
         <li class="{% active request '/agenda/new/' %}"><a href="{% url item_new %}">{%trans "New item" %}</a></li>
         {% endif %}
+        <li><a href="{% url print_agenda %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {%trans 'Agenda as PDF' %}</a></li>
     </ul>
 {% endblock %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 7e0095c22..dd6eb24f4 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -69,9 +69,6 @@
                         <span id="action_field" style="width: 1px; white-space: nowrap;">
                             <span></span>
                         </span>
-                        <a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}" class="pdficon">
-                            <span></span>
-                        </a>
                     </td>
                 </tr>
 

From 0657ff340d0a2c969f865ee078a2145d0d08480d Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 15 Apr 2012 14:28:01 +0200
Subject: [PATCH 2/2] Show clickable done action in first column in agenda
 overview.

---
 openslides/agenda/static/styles/agenda.css        |   4 ++--
 openslides/agenda/templates/agenda/item_row.html  |  11 ++++++-----
 .../static/images/icons/task-complete-grey.png    | Bin 0 -> 413 bytes
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 openslides/static/images/icons/task-complete-grey.png

diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index c9dd461d6..2123bf169 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -1,5 +1,5 @@
 a.close_link.closed span {
-    background-image: url(../images/icons/user-offline.png);
+    background-image: url(../images/icons/task-complete-grey.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -7,7 +7,7 @@ a.close_link.closed span {
     display: inline-block;
 }
 a.close_link.open span {
-    background-image: url(../images/icons/user-online.png);
+    background-image: url(../images/icons/task-complete.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 09dc44907..d1fdfd1f4 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -4,8 +4,12 @@
 <tr class="draggable{% cycle ' odd' '' %}
     {% if item.active %}activeline{% endif %}">
     <td>
-        {% if item.closed %}
-            <img src="{% static 'images/icons/task-complete.png' %}" title="{% trans 'Item closed' %}">
+        {% if perms.agenda.can_manage_agenda %}
+            <a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
+                <span></span>
+            </a>
+        {% elif item.closed %}
+                <img src="{% static 'images/icons/task-complete.png' %}" title="{% trans 'Item closed' %}">
         {% endif %}
     </td>
     <td>
@@ -22,9 +26,6 @@
             {% if perms.agenda.can_manage_agenda %}
                 <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>
-                <a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
-                    <span></span>
-                </a>
             {% endif %}
         </span>
     </td>
diff --git a/openslides/static/images/icons/task-complete-grey.png b/openslides/static/images/icons/task-complete-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e5e16f47925a9515a8e3d9b831621bd8323c8c7
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%5$by$-^RP8zc-fP(BLp1!W^cUbs&#0?{R_O1e&py=u17@~2$_2OQy
z<V2CyhtF%|Or?1LnP~A8GhS<ob9%$#Jv)=d(OUGP^@#?B%f5-p#=Tox6LeRsXyxEC
zQ}!{8knr)F@}wqMB{Rvediv|T*#~d^Nf-LD@oH4h{FZ%_d$~C8Z})!6n#q5mWL?#!
zNY9g};%z(TpE+)NTC1^q=B%po`x1FIc}*+NmxgTd5nu6*#YK7F!%e&?_nvgciL&VG
zE;cK8%g|UJdbmvY=Y{ntxA@k*xy<^@H|ZW%Q|X-><|^6lSDw`U&b+FVR`@=^Q!m>(
zg^hQ$^}7@PeZ7)XGPX3bv5BOd`|##UN64zHte<vAKVEiLW7qc=-I~E_e=hD(QT_94
zcX_~xmsdnpni3wU%9QT2G?(HMNbc!W=ogR{Fa5`OLL%wM=G9VjfZ@mB>FVdQ&MBb@
E08?nDQvd(}

literal 0
HcmV?d00001