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

Added icons to hide/show hidden agenda items. Some style changes.

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-03 18:11:05 +02:00
parent 762f09197d
commit ba28afdc49
6 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@
<th style="width: 1px;">{% trans "Beamer" %}</th>
<th>{% trans "Item" %}</th>
{% if perms.agenda.can_manage_agenda %}
<th>{% trans "Item Type" %}</th>
<th>{% trans "Type" %}</th>
{% endif %}
<th style="width: 1px;">{% if perms.agenda.can_manage_agenda %}{% trans "Actions" %}{% endif %}</th>
{% if perms.agenda.can_manage_agenda %}
@ -59,9 +59,7 @@
{% endif %}
</tr>
<tr id="item_row_0"{% if overview %} class="activeline"{% else %}{% if perms.agenda.can_manage_agenda %} class="inactiveline"{% endif %}{% endif %}>
<td {% if perms.agenda.can_manage_agenda %}
class="select"
{% endif %}>
<td class="select">
<a href="{% url item_activate 0 %}" class="activate_link">
<div></div>
</a>
@ -70,7 +68,10 @@
{% if perms.agenda.can_manage_agenda %}
<td></td>
{% endif %}
<td id="action_field" style="width: 1px;white-space: nowrap;"><a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}"><img src="/static/images/icons/application-pdf.png"></a></td>
<td id="action_field" style="width: 1px;white-space: nowrap;">
<div></div>
<a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}"><img src="/static/images/icons/application-pdf.png"></a>
</td>
</tr>
{% for item in items %}
{% if not item.hidden or perms.agenda.can_manage_agenda %}
@ -81,11 +82,9 @@
{% if perms.agenda.can_manage_aenda %} inactiveline{% endif %}
{% endif %}">
<script type="text/javascript">$(function(){ViewModel.slides.push(new Slide({{ item.json|safe }}))});</script>
<td {% if perms.agenda.can_manage_agenda %} {# TODO: welchen Sinn hat das? #}
class="select"
{% endif %}>
<td class="select">
<a id="activate_link_{{ item.id }}" class="activate_link" href="{% url item_activate item.id %}">
<div></div>
<div></div>
</a>
</td>
<td>

BIN
openslides/static/images/icons/layer-visible-off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 783 B

BIN
openslides/static/images/icons/layer-visible-on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 838 B

8
openslides/static/javascript/agenda.js
View File

@ -36,7 +36,8 @@ function hideLine(object) {
function hideClosedSlides(hide) {
if (hide) {
$('#hidelink').text('show');
$('#hidelink').attr('title','show');
$('#hidelink').removeClass('hide').addClass('show');
$('.close_link.closed').parent().parent().each(function() {
hideLine($(this));
});
@ -44,7 +45,8 @@ function hideClosedSlides(hide) {
$('#hiddencount').text(' ' + hidden + ' davon verborgen.');
} else {
$('#menu-overview tr').show();
$('#hidelink').text('hide');
$('#hidelink').attr('title','hide');
$('#hidelink').removeClass('show').addClass('hide');
$('#hiddencount').text('');
}
return false;
@ -87,7 +89,7 @@ $(function() {
});
});
// hide closed items
$('#action_field a').after($('<a id="hidelink" href="#">hide</a>').click(function () {
$('#action_field div').after($('<a id="hidelink" class="hidelink hide" title="hide" href="#"><div></div></a>').click(function () {
if ($.cookie('Slide.HideClosed') == 1) {
$.cookie('Slide.HideClosed', 0);
hideClosedSlides(false);

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

@ -2,35 +2,48 @@ tr.activeline a.activate_link div {
background-image: url(/static/images/icons/task-accepted.png);
background-repeat: no-repeat;
background-position: center;
width: 20px;
height: 20px;
width: 16px;
height: 16px;
}
tr.inactiveline a.activate_link div {
background-image: url(/static/images/icons/task-accepted-grey.png);
background-repeat: no-repeat;
background-position: center;
width: 20px;
height: 20px;
width: 16px;
height: 16px;
}
a.close_link.closed div {
background-image: url(/static/images/icons/user-offline.png);
background-repeat: no-repeat;
background-position: center;
width: 20px;
height: 20px;
width: 16px;
height: 16px;
display: inline-block;
}
a.close_link.open div {
background-image: url(/static/images/icons/user-online.png);
background-repeat: no-repeat;
background-position: center;
width: 20px;
height: 20px;
width: 16px;
height: 16px;
display: inline-block;
}
a.hidelink.hide div {
background-image: url(/static/images/icons/layer-visible-off.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
height: 16px;
display: inline-block;
}
a.hidelink.show div {
background-image: url(/static/images/icons/layer-visible-on.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
height: 16px;
display: inline-block;
}

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

@ -230,10 +230,6 @@ table a.table_edit {
.agendatable tr.activeline td {
background-color: #bed4de;
}
.agendatable td.select:hover {
cursor:pointer;
background-color: #bed4de;
}
.agendatable td img.center {
margin-left: 10px;
}