ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3443 from FinnStutzenstein/ResetCountdown 

Reset Countdown when a speech was ended
This commit is contained in:
Norman Jäckel 2017-10-13 18:23:34 +02:00 committed by GitHub
parent 9b64bd5646 256c12af8e
commit cd2316652d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/models.py
View File

@ -446,7 +446,7 @@ class Speaker(RESTModelMixin, models.Model):
except Countdown.DoesNotExist: except Countdown.DoesNotExist:
pass # Do not create a new countdown on stop action pass # Do not create a new countdown on stop action
else: else:
countdown.control(action='stop') countdown.control(action='reset')
def get_root_rest_element(self): def get_root_rest_element(self):
""" """

9
openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers-overlay.html
View File

@ -10,10 +10,13 @@
</p> </p>
<!-- Current speaker --> <!-- Current speaker -->
<p ng-repeat="speaker in agendaItem.speakers | filter: {end_time: null, begin_time: '!!'} " <div ng-repeat="speaker in agendaItem.speakers | filter: {end_time: null, begin_time: '!!'} "
class="currentSpeaker"> class="currentSpeaker">
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }} <i class="fa fa-microphone fa-lg"></i>
</p> <span class="pull-right" style="width:calc(100% - 25px);">
{{ speaker.user.get_full_name() }}
</span>
</div>
<!-- Next speakers --> <!-- Next speakers -->
<ol class="nextSpeakers"> <ol class="nextSpeakers">

2
openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html
View File

@ -18,7 +18,7 @@
<!-- Current speaker --> <!-- Current speaker -->
<p ng-repeat="speaker in currentspeakers = (agendaItem.speakers <p ng-repeat="speaker in currentspeakers = (agendaItem.speakers
| filter: {end_time: null, begin_time: '!!'})" | filter: {end_time: null, begin_time: '!!'})"
class="currentSpeaker"> class="currentSpeaker nobr">
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }} <i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
</p> </p>

1
openslides/core/static/css/projector.css
View File

@ -239,6 +239,7 @@ h3 {
padding: 0px 7px 10px 19px; padding: 0px 7px 10px 19px;
z-index: 99; z-index: 99;
box-shadow: 3px 3px 10px 1px rgba(0,0,0,0.5); box-shadow: 3px 3px 10px 1px rgba(0,0,0,0.5);
overflow: hidden;
} }
ul, ol { ul, ol {
margin: 0 0 10px 2em; margin: 0 0 10px 2em;