diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index bdcb74606..1bf0fe4fc 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -124,7 +124,7 @@ register_slidemodel(Item, model_name=_('Agenda Item')) from projector.api import register_slidefunc from agenda.slides import agenda_show -register_slidefunc(_('Agenda'), agenda_show, weight=-1) +register_slidefunc('agenda', agenda_show, weight=-1, name=_('Agenda')) from django.dispatch import receiver diff --git a/openslides/agenda/templates/projector/AgendaSummary.html b/openslides/agenda/templates/projector/AgendaSummary.html new file mode 100644 index 000000000..6264500be --- /dev/null +++ b/openslides/agenda/templates/projector/AgendaSummary.html @@ -0,0 +1,18 @@ + +{% extends "base-projector.html" %} + +{% load i18n %} + +{% block title %}{{ block.super }} - + {% if title %} {{ title }} {% else %} {%trans "Agenda" %} {% endif %} +{% endblock %} + +{% block content %} +

{%trans "Agenda" %}

+ +{% endblock %} + diff --git a/openslides/projector/api.py b/openslides/projector/api.py index 3a09dadc2..e3917b0c4 100644 --- a/openslides/projector/api.py +++ b/openslides/projector/api.py @@ -56,7 +56,7 @@ def register_slidemodel(model, model_name=None, control_template=None, weight=0) ) -def register_slidefunc(key, func, control_template=None, weight=0): +def register_slidefunc(key, func, control_template=None, weight=0, name=''): #TODO: Warn if there already is a slide with this prefix if control_template is None: control_template = 'projector/default_control_slidefunc.html' @@ -68,4 +68,5 @@ def register_slidefunc(key, func, control_template=None, weight=0): key=key, control_template=control_template, weight=weight, + name=name, ) diff --git a/openslides/projector/projector.py b/openslides/projector/projector.py index d2ef0db28..c989b47e0 100644 --- a/openslides/projector/projector.py +++ b/openslides/projector/projector.py @@ -49,7 +49,7 @@ class SlideMixin(object): class Slide(object): def __init__(self, model_slide=False, func=None, model=None, category=None, - key=None, model_name='', control_template='', weight=0): + key=None, model_name='', control_template='', weight=0, name=''): """ model_slide: Boolean if the value is a Model. func: The function to call. Only if modelslide is False. @@ -66,6 +66,7 @@ class Slide(object): self.key = key self.control_template = control_template self.weight = weight + self.name = name def get_items(self): try: diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index 8bc8f2732..8442854f3 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -97,41 +97,6 @@ - - {% for category, slides in categories.items %} - {% if category == 'projector' %} -
-
{% trans "Static Slides" %}
-
- {% for slide in slides %} - {% if slide.model_slide %} - - {% else %} -
- - {% endif %} - {% endfor %} -
-
- {% endif %} - {% endfor %} -
{% trans 'Messages' %}
diff --git a/openslides/projector/templates/projector/default_control_slidefunc.html b/openslides/projector/templates/projector/default_control_slidefunc.html index b65b1f817..f5bab98a3 100644 --- a/openslides/projector/templates/projector/default_control_slidefunc.html +++ b/openslides/projector/templates/projector/default_control_slidefunc.html @@ -3,10 +3,10 @@