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

fixed error by activating a message, if it was only on a specific slide.

Browse Source
This commit is contained in:
Oskar Hahn 2012-06-03 09:05:12 +02:00
parent 7e7ab210ab
commit 79893687f3
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
openslides/projector/templates/projector/control.html
View File

@ -11,7 +11,7 @@
<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) { function switchButtons(which) {
if (which == 'stop') { if (which == 'stop') {
$( "#countdown_play" ).hide(); $( "#countdown_play" ).hide();
@ -194,8 +194,8 @@
<ul> <ul>
{% for overlay in overlays %} {% for overlay in overlays %}
<li> <li>
<input type="checkbox" name="{{ overlay }}" onchange="submit()" <input type="checkbox" name="{{ overlay.def_name }}" onchange="submit()"
{% if overlay.active %} checked="checked"{% endif %}> {{ overlay }}: {% if overlay.active %} checked="checked"{% endif %}> {{ overlay }}:
{# Countdown #} {# Countdown #}
{% if overlay.def_name == "Countdown" %} {% if overlay.def_name == "Countdown" %}
<span class="projector_countdown_spinbox"> <span class="projector_countdown_spinbox">
@ -204,7 +204,7 @@
<img src="{% static 'images/icons/document-save.png' %}" /> <img src="{% static 'images/icons/document-save.png' %}" />
</a> </a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a class="projector_countdown_btn" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}" onclick="javascript:switchButtons('play')"><button <a class="projector_countdown_btn" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}" onclick="javascript:switchButtons('play')"><button
type="submit" class="button" style="padding:4px;" name='message-clean'> type="submit" class="button" style="padding:4px;" name='message-clean'>
<span class="icon backward">&nbsp;</span> <span class="icon backward">&nbsp;</span>
</button></a>&nbsp; </button></a>&nbsp;
@ -221,21 +221,18 @@
<p></p> <p></p>
{% endif %} {% endif %}
{% if overlay.def_name == "Message" %} {% if overlay.def_name == "Message" %}
<form action="" method="post">{% csrf_token %} <nobr>
<br> <input name='message_text' type='text' style='width: 70%'
<nobr>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; value="{% get_config 'projector_message' %}">
<input name='message_text' type='text' style='width: 70%' <button type="submit"
value="{% get_config 'projector_message' %}"> class="button" style="padding:4px 0;" name='message-clean'>
<button type="submit" <span class="icon clear">&nbsp;</span>
class="button" style="padding:4px 0;" name='message-clean'> </button>
<span class="icon clear">&nbsp;</span> </nobr>
</button> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</nobr> <button type="submit" class="button" name='message'>
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="icon ok">{% trans 'Apply' %}</span>
<button type="submit" class="button" name='message'> </button>
<span class="icon ok">{% trans 'Apply' %}</span>
</button>
</form>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}