#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)
This commit is contained in:
parent
07b5614fac
commit
053021a08f
@ -11,6 +11,20 @@
|
|||||||
<script type="text/javascript" src="{% static 'javascript/projector-control.js' %}"></script>
|
<script type="text/javascript" src="{% static 'javascript/projector-control.js' %}"></script>
|
||||||
<script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
|
<script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
function switchButtons(which) {
|
||||||
|
if (which == 'stop') {
|
||||||
|
$( "#countdown_play" ).hide();
|
||||||
|
$( "#countdown_stop" ).show();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$( "#countdown_play" ).show();
|
||||||
|
$( "#countdown_stop" ).hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$( ".column" ).sortable({
|
$( ".column" ).sortable({
|
||||||
connectWith: ".column"
|
connectWith: ".column"
|
||||||
@ -30,8 +44,15 @@
|
|||||||
if ($.browser.msie) {
|
if ($.browser.msie) {
|
||||||
$( "#iframe" ).css('zoom', '0.25');
|
$( "#iframe" ).css('zoom', '0.25');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{% if countdown_state == "active" %}
|
||||||
|
switchButtons('stop');
|
||||||
|
{% else %}
|
||||||
|
switchButtons('play');
|
||||||
|
{% endif %}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
@ -115,10 +136,10 @@
|
|||||||
<a class="projector_countdown" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
|
<a class="projector_countdown" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
|
||||||
<img src="{% static 'images/icons/skip-backward.png' %}" />
|
<img src="{% static 'images/icons/skip-backward.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_countdown" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}">
|
<a id="countdown_play" class="projector_countdown" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}" onclick="javascript:switchButtons('stop')">
|
||||||
<img src="{% static 'images/icons/play.png' %}" />
|
<img src="{% static 'images/icons/play.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}">
|
<a id="countdown_stop" class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}" onclick="javascript:switchButtons('play')">
|
||||||
<img src="{% static 'images/icons/pause.png' %}" />
|
<img src="{% static 'images/icons/pause.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -94,6 +94,7 @@ class ControlView(TemplateView):
|
|||||||
context.update({
|
context.update({
|
||||||
'categories': categories,
|
'categories': categories,
|
||||||
'countdown_time': config['agenda_countdown_time'],
|
'countdown_time': config['agenda_countdown_time'],
|
||||||
|
'countdown_state' : config['countdown_state'],
|
||||||
'overlays': self.get_projector_overlays(),
|
'overlays': self.get_projector_overlays(),
|
||||||
})
|
})
|
||||||
return context
|
return context
|
||||||
|
Loading…
Reference in New Issue
Block a user