ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-15 14:28:34 +02:00
commit da9861b9f7
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/agenda/static/styles/agenda.css
View File

@ -1,5 +1,5 @@
a.close_link.closed span { 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-repeat: no-repeat;
background-position: center; background-position: center;
width: 16px; width: 16px;
@ -7,7 +7,7 @@ a.close_link.closed span {
display: inline-block; display: inline-block;
} }
a.close_link.open span { 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-repeat: no-repeat;
background-position: center; background-position: center;
width: 16px; width: 16px;

2
openslides/agenda/templates/agenda/base_agenda.html
View File

@ -2,6 +2,7 @@
{% load tags %} {% load tags %}
{% load i18n %} {% load i18n %}
{% load staticfiles %}
{% block submenu %} {% block submenu %}
{% url item_overview as url_itemoverview %} {% url item_overview as url_itemoverview %}
@ -12,5 +13,6 @@
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<li class="{% active request '/agenda/new/' %}"><a href="{% url item_new %}">{%trans "New item" %}</a></li> <li class="{% active request '/agenda/new/' %}"><a href="{% url item_new %}">{%trans "New item" %}</a></li>
{% endif %} {% endif %}
<li><a href="{% url print_agenda %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {%trans 'Agenda as PDF' %}</a></li>
</ul> </ul>
{% endblock %} {% endblock %}

11
openslides/agenda/templates/agenda/item_row.html
View File

@ -4,8 +4,12 @@
<tr class="draggable{% cycle ' odd' '' %} <tr class="draggable{% cycle ' odd' '' %}
{% if item.active %}activeline{% endif %}"> {% if item.active %}activeline{% endif %}">
<td> <td>
{% if item.closed %} {% if perms.agenda.can_manage_agenda %}
<img src="{% static 'images/icons/task-complete.png' %}" title="{% trans 'Item closed' %}"> <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 %} {% endif %}
</td> </td>
<td> <td>
@ -22,9 +26,6 @@
{% if perms.agenda.can_manage_agenda %} {% 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_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 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 %} {% endif %}
</span> </span>
</td> </td>

3
openslides/agenda/templates/agenda/overview.html
View File

@ -69,9 +69,6 @@
<span id="action_field" style="width: 1px; white-space: nowrap;"> <span id="action_field" style="width: 1px; white-space: nowrap;">
<span></span> <span></span>
</span> </span>
<a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}" class="pdficon">
<span></span>
</a>
</td> </td>
</tr> </tr>

BIN
openslides/static/images/icons/task-complete-grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 413 B