diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index cc943ffc6..bc121d5f5 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -55,13 +55,15 @@ + {% if overview %} {% else %} {% if perms.agenda.can_manage_agenda %}{% endif %} {% endif %} + {% trans "Agenda" %} ({{ items|length }} {% trans "items" %}) {% if perms.agenda.can_manage_agenda %} @@ -77,13 +79,15 @@ {% if item.parent.active and summary %}activesummarychildline{% endif %} {% endif %}"> + {% if item.active %} {% else %} {% if perms.agenda.can_manage_agenda %} {% endif %} {% endif %} + {% for p in item.parents %} @@ -135,7 +139,7 @@ {% if item.children.exists %} {% endif %} - {% endif %} + {% endif %} {% if perms.agenda.can_manage_agenda %} diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index 41f2d57dc..bfbde10f2 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -43,7 +43,7 @@ def view(request, item_id): """ item = Item.objects.get(id=item_id) votes = assignment_votes(item) - + return render_to_response('beamer/%s.html' % item.type, { 'item': item.cast(),