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

#96 Countdown: Improve control icons

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-27 17:42:05 +02:00
parent 0818a78cf4
commit 710882c28a
5 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
openslides/projector/static/images/icons/pause.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 721 B

BIN
openslides/projector/static/images/icons/play.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 736 B

BIN
openslides/projector/static/images/icons/skip-backward.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 511 B

After

Width:  |  Height:  |  Size: 753 B

35
openslides/projector/static/styles/projector-control.css
View File

@ -67,6 +67,23 @@
margin-top: auto;
}
/* countdown control buttons */
.play{
background:url(../images/icons/play.png) no-repeat 0px 0px;
text-indent:22px !important;
height: 22px !important;
}
.pause{
background:url(../images/icons/pause.png) no-repeat 0px 0px;
text-indent:22px !important;
height: 22px !important;
}
.backward{
background:url(../images/icons/skip-backward.png) no-repeat 0px 0px;
text-indent:22px !important;
height: 22px !important;
}
/* iframe */
#iframe {
-ms-zoom: 0.25;
@ -97,23 +114,7 @@
display: block;
z-index: 1;
}
/* countdown */
a.countdown_visible_link.closed div {
background-image: url(../images/icons/off.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
height: 16px;
display: inline-block;
}
a.countdown_visible_link.open div {
background-image: url(../images/icons/on.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
height: 16px;
display: inline-block;
}
/* activate link */
a.activate_link div {
background-image: url(../images/icons/accept-grey.png);

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

@ -139,38 +139,43 @@
{% for overlay in overlays %}
<li>
<input type="checkbox" name="{{ overlay }}" onchange="submit()"
{% if overlay.active %} checked="checked"{% endif %}> {{ overlay }}
{% if overlay.active %} checked="checked"{% endif %}> {{ overlay }}:
{# Countdown #}
{% if overlay.def_name == "Countdown" %}
|
<span class="projector_countdown_spinbox">
<input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{countdown_time}}">
{% trans "sec" %}
&nbsp;
<input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{countdown_time}}">{% trans "sec" %}
<a id="countdown_set" class="projector_countdown_btn" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
<img src="{% static 'images/icons/document-save.png' %}" />
</a>
<span class="icon clear">&nbsp;&nbsp;&nbsp;&nbsp;</span>
<a class="projector_countdown_btn" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}" onclick="javascript:switchButtons('play')">
<img src="{% static 'images/icons/skip-backward.png' %}" />
</a>
<a id="countdown_play" class="projector_countdown_btn" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}" onclick="javascript:switchButtons('stop')">
<img src="{% static 'images/icons/play.png' %}" />
</a>
&nbsp;&nbsp;&nbsp;
<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'>
<span class="icon backward">&nbsp;</span>
</button></a>&nbsp;
<a id="countdown_play" class="projector_countdown_btn" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}" onclick="javascript:switchButtons('stop')"><button
type="submit" class="button" style="padding:4px;" name='message-clean'>
<span class="icon play">&nbsp;</span>
</button></a>
<a id="countdown_stop" class="projector_countdown_btn" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}" onclick="javascript:switchButtons('play')">
<img src="{% static 'images/icons/pause.png' %}" />
<button type="submit" class="button" style="padding:4px;" name='message-clean'>
<span class="icon pause">&nbsp;</span>
</button>
</a>
</span>
<p></p>
{% endif %}
{% if overlay.def_name == "Message" %}
<form action="" method="post">{% csrf_token %}
<form action="" method="post">{% csrf_token %}
<br>
<nobr>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<input name='message_text' type='text' style='width: 70%'
value="{% get_config 'projector_message' %}">
<button type="submit"
class="button" style="padding:4px 0;" name='message-clean'>
<span class="icon
clear">&nbsp;</span>
<span class="icon clear">&nbsp;</span>
</button>
</nobr>
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button type="submit" class="button" name='message'>
<span class="icon ok">{% trans 'Apply' %}</span>
</button>