Merge pull request #3443 from FinnStutzenstein/ResetCountdown
Reset Countdown when a speech was ended
This commit is contained in:
commit
cd2316652d
@ -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):
|
||||
"""
|
||||
|
@ -10,10 +10,13 @@
|
||||
</p>
|
||||
|
||||
<!-- 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">
|
||||
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
|
||||
</p>
|
||||
<i class="fa fa-microphone fa-lg"></i>
|
||||
<span class="pull-right" style="width:calc(100% - 25px);">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- Next speakers -->
|
||||
<ol class="nextSpeakers">
|
||||
|
@ -18,7 +18,7 @@
|
||||
<!-- Current speaker -->
|
||||
<p ng-repeat="speaker in currentspeakers = (agendaItem.speakers
|
||||
| filter: {end_time: null, begin_time: '!!'})"
|
||||
class="currentSpeaker">
|
||||
class="currentSpeaker nobr">
|
||||
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
|
||||
</p>
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user