diff --git a/openslides/projector/models.py b/openslides/projector/models.py index 4abf94518..1a34c08ed 100644 --- a/openslides/projector/models.py +++ b/openslides/projector/models.py @@ -13,6 +13,14 @@ class ProjectorSlide(models.Model, SlideMixin): text = models.TextField(null=True, blank=True, verbose_name=_("Text")) weight = models.IntegerField(default=0, verbose_name=_("Weight")) + def slide(self): + return { + 'slide': self, + 'title': self.title, + 'template': 'projector/ProjectorSlide.html', + } + + def __unicode__(self): return self.title diff --git a/openslides/projector/templates/projector/ProjectorSlide.html b/openslides/projector/templates/projector/ProjectorSlide.html new file mode 100644 index 000000000..eb25adcc1 --- /dev/null +++ b/openslides/projector/templates/projector/ProjectorSlide.html @@ -0,0 +1,14 @@ +{% extends "base-projector.html" %} + +{% load i18n %} + +{% block title %}{{ block.super }} - {{ slide.title }}{% endblock %} + +{% block content %} + {% if slide.text %} +

{{ slide.title }}

+ {{ slide.text|safe|linebreaks }} + {% else %} +
{{ slide.title }}
+ {% endif %} +{% endblock %} diff --git a/openslides/projector/views.py b/openslides/projector/views.py index 049b22195..ba83ec9e8 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -90,6 +90,8 @@ def active_slide(request): data['ajax'] = 'on' data['messages'] = [] + + # Projector Messages active_defs = ProjectorMessage.objects.filter(active=True).values_list('def_name', flat=True) for receiver, response in projector_messages.send(sender='active_slide', register=False, call=active_defs): if response is not None: