From 053021a08f82086cb43be9c61c825f4f46029a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Ko=CC=88cher?= Date: Wed, 25 Apr 2012 18:45:02 +0200 Subject: [PATCH] #XX Countdown: Only show valid controls for the active countdown When clicking on 'play' the button will morph into 'stop' and vice-versa. This is persistent across clients e.g. when A starts the countdown and then B opens the control page B will see a pause button. (Updates for all but the local client happen only on page reload) --- .../templates/projector/control.html | 25 +++++++++++++++++-- openslides/projector/views.py | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index c0eac9a3d..428d74a58 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -11,6 +11,20 @@ @@ -115,10 +136,10 @@ - + - + {% endif %} diff --git a/openslides/projector/views.py b/openslides/projector/views.py index dc81bc2f8..21ce3fde0 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -94,6 +94,7 @@ class ControlView(TemplateView): context.update({ 'categories': categories, 'countdown_time': config['agenda_countdown_time'], + 'countdown_state' : config['countdown_state'], 'overlays': self.get_projector_overlays(), }) return context