Automated merge with ssh://openslides.org/openslides

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;

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 %}

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>

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>