From 256c12af8e9f936a23077af4f8070f5a09819881 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 13 Oct 2017 08:14:55 +0200 Subject: [PATCH] Reset Countdown when a speech was ended --- openslides/agenda/models.py | 2 +- .../partial-slide-current-list-of-speakers-overlay.html | 9 ++++++--- .../agenda/partial-slide-current-list-of-speakers.html | 2 +- openslides/core/static/css/projector.css | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index d8f9ed6c1..8386daa86 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -446,7 +446,7 @@ class Speaker(RESTModelMixin, models.Model): except Countdown.DoesNotExist: pass # Do not create a new countdown on stop action else: - countdown.control(action='stop') + countdown.control(action='reset') def get_root_rest_element(self): """ diff --git a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers-overlay.html b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers-overlay.html index 6dd85be5d..c5d9ebcca 100644 --- a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers-overlay.html +++ b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers-overlay.html @@ -10,10 +10,13 @@

-

- {{ speaker.user.get_full_name() }} -

+ + + {{ speaker.user.get_full_name() }} + +
    diff --git a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html index 4fc7676aa..19e56a5de 100644 --- a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html +++ b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html @@ -18,7 +18,7 @@

    + class="currentSpeaker nobr"> {{ speaker.user.get_full_name() }}

    diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index 3dd9920c5..cb1e5458a 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -239,6 +239,7 @@ h3 { padding: 0px 7px 10px 19px; z-index: 99; box-shadow: 3px 3px 10px 1px rgba(0,0,0,0.5); + overflow: hidden; } ul, ol { margin: 0 0 10px 2em;