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

Splitted up hidden agenda items in new table section.

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-21 21:23:22 +02:00
parent 042eae9ecc
commit 54b148a704
3 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,10 @@
{% block content %}
<h1>{% trans "Agenda" %}</h1>
{% if items %}
{% if items_hidden and perms.agenda.can_manage_agenda %}
<a href="#hidden">{% trans "Go to hidden items" %}</a>
{% endif %}
{% if items or items_hidden %}
<form action="/agenda/" method="post">{% csrf_token %}
{% if perms.agenda.can_manage_agenda %}
<div id="changed-order-message" style="display:none" class="notification warning">
@ -175,6 +178,72 @@
</tr>
{% endif %}
{% endfor %}
{% if perms.agenda.can_manage_agenda %}
<tr class="emptyline">
<td colspan="4"></td>
</tr>
<tr class="topline">
<td colspan="4"><a name="hidden"></a>{% trans "Hidden items:" %}</td>
</tr>
{% for item in items_hidden %}
<tr id="item_row_{{ item.id }}" class="draggable{% cycle ' odd' '' %}
{% if item.active %} activeline{% else %}
{% if item.parent.active and summary %} activesummarychildline{% endif %}
{% if perms.agenda.can_manage_agenda %} inactiveline{% endif %}
{% endif %}">
<script type="text/javascript">$(function(){ViewModel.slides.push(new Slide({{ item.json|safe }}))});</script>
<td class="select">
<a id="activate_link_{{ item.id }}" class="activate_link" href="{% url item_activate item.id %}">
<div></div>
</a>
</td>
<td>
{% for p in item.parents %}
<div class="indentation">&nbsp;</div>
{% endfor %}
<div class="dragcell"></div>
{{ item }}
</td>
<td>
{% ifequal item.type 'ItemApplication' %}
<a href="{% url application_view item.cast.application.id %}">{% trans "Application" %} {{ item.cast.application.number }}</a>
{% endifequal %}
{% ifequal item.type 'ItemPoll' %}
{% if item.cast.poll.application %}
<a href="{% url poll_view item.cast.poll.id %}">{% trans "Poll of Application" %}</a>
{% endif %}
{% if item.cast.poll.assignment %}
<a href="{% url poll_view item.cast.poll.id %}">{% trans "Poll of Election" %}</a>
{% endif %}
{% endifequal %}
{% ifequal item.type 'ItemAssignment' %}
<a href="{% url assignment_view item.cast.assignment.id %}">{% trans "Election" %}</a>
{% endifequal %}
{% ifequal item.type 'ItemText' %}
Text
{% endifequal %}
</td>
<td style="width: 1px;white-space: nowrap;">
<a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></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 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 %}">
<div></div>
</a>
{% if item.children.exists %}
<a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
{% endif %}
</td>
<td class="tabledrag-hide">
{% with form=item.weight_form %}
{{ form.weight }}
{{ form.self }}
{{ form.parent }}
{% endwith %}
</td>
</tr>
{% endfor %}
{% endif %}
</table>
</form>

4
openslides/agenda/views.py
View File

@ -160,13 +160,15 @@ def overview(request):
item.weight = form.cleaned_data['weight']
item.save()
items = children_list(Item.objects.filter(parent=None).order_by('weight'))
items = children_list(Item.objects.filter(parent=None).exclude(hidden=True).order_by('weight'))
items_hidden = children_list(Item.objects.filter(parent=None).exclude(hidden=False).order_by('weight'))
try:
overview = is_summary() and not get_active_item()
except Item.DoesNotExist:
overview = True
return {
'items': items,
'items_hidden': items_hidden,
'overview': overview,
'summary': is_summary()
}

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

@ -257,7 +257,12 @@ tr.topline td {
border-bottom: 1px solid #333333;
background-color: #e3e3e3;
}
table tr.emptyline, table tr.emptyline td, table tr.emptyline td:hover {
border-right: 0px;
border-top: 1px solid #CCCCCC;
border-bottom: 1px solid #CCCCCC;
background: none !important;
}
/* Links and Images */
a {