From 710882c28a114fa984fbb4789ddec99e184cbd64 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 27 Apr 2012 17:42:05 +0200
Subject: [PATCH] #96 Countdown: Improve control icons

---
 .../projector/static/images/icons/pause.png   | Bin 484 -> 721 bytes
 .../projector/static/images/icons/play.png    | Bin 501 -> 736 bytes
 .../static/images/icons/skip-backward.png     | Bin 511 -> 753 bytes
 .../static/styles/projector-control.css       |  35 +++++++++--------
 .../templates/projector/control.html          |  37 ++++++++++--------
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/openslides/projector/static/images/icons/pause.png b/openslides/projector/static/images/icons/pause.png
index a9b3113fb0b3067163f8186bc42d66151b6f7b73..d133bdc5f4221189327a648dcc85d0de65a2fd1e 100644
GIT binary patch
delta 675
zcmV;U0$ly%1JMN`iBL{Q4GJ0x0000DNk~Le0000M0000M2m}BC0B*gcu#q7c3j$#P
z00LnF!7x?&kwhnd0#HdrK~xwS1;IUNoMiw2;OBk6@9w-_Jaa}dc8F4uPK7`c5P~2$
zba07+rjiV9lA)7}bdciEO_zWjoCH()Gnh#X(naW$M1n#=XrmOxQ>Y=A#{2!=x6czY
z0Is#uvZb(S0sDE+ZoGG;2SCUGuCBN~nH`&$pj4_UyEd+WZUcl2KI^2-w04TN8E0jG
zd#s0+xD_vdegq-oN+%x-=X%b0(+iqPR0eu}bf~TID9m3wqJ+ujXm04D3#QeSf*`51
zt@_oDG*{oWPRKr4slGe%jwNk%rBVcyv4K;+xTB+Z_lxb~xSf7@GIh>H(;6yKP!kOd
z@QgyoKe}pvZ|!^?$IF9R-Zrga?4~d6fbV_kV<(zg-os#ayc{P>L(h9jO{p}}(+9z^
z$D*2smX{4pmSS2QdC^cMVxVUP==o0))YQFVBrV3YFm_f0LGsW8C!liVUs+TrylyNl
z#3UgI$o{bBPtbSl7!U+W64QS0mn?(A83hPRX8_rMLqXb)X)o#;s#LOujs}QYI)bE9
zITWS6GVMlPC#H=tWkwV5oI;e1_5ChNyWzuj{;fZI!AGVwJwem6IQ74*qjKsSKWTQu
z`FNw3H|l<N;M7ptj238_F{9FV-(7Wi<3=xJtbRLLE3BK>(oj=?%Gl6-Ul}R4ZmknC
zE_L#1!DO!Q4VO%*D+F1k@3y;|%12@T<`E%-)lS|_YeP-1dd+#k0}mZK)eyJB<y%J(
zGJyA2T(4#;l?sJIq3GJUvkee306u8vWlI(<VBenIaPM{xfT!J$@p|nWOgaDn002ov
JPDHLkV1o4vHB0~i

delta 436
zcmV;l0ZabT1>^%EiBL{Q4GJ0x0000DNk~Le0000G0000G2m}BC0JZuz>X9KB3jw<T
z00FxJI_%@(kwhnd0b@x-K~yNuMUlNq!(bGKPp-qwA(!CnE>aC?L`t;<|IkADnqsX#
z#2|Ik!AZQ26mjqpq@WH`TwG#B37^6@#IHOK#(Li2fy3b)&LhZgdhSUaCs7)uadHy(
z+`qjbNaP%;u4&OGBBD);t~pYXQylC&-F}k}Hw<`U$OAWj?9!y$-**r}Lbby=_q>wv
z$rqY8o;hQOP$8n+h6#D(1H(6C##nMRFSKbG<;r$k=azR2m-GPWP{*PfP-pvC){_nH
z&{!^L0MKL>$QiN4dLp$nWI%?c!yEuLrU6UF0ku@BX^TfRW9AWnf@3s?R8y%WwW7ge
z3ZS4RV~t9CB9++Znh`lG%m5V38RAnpmSwkWHhD&4`5%iWq->U5K?1eFDKBVp?Bowu
zED$I}kR>PRm)K&!hzw1}kQOC^{*qJ33LIZ~rbLxp_E@EaXM7bn6PpN9cKz5(7SqMl
eOZ>Pz(ftDwiElIZXxcXb0000<MNUMnLSTZmD!SPK

diff --git a/openslides/projector/static/images/icons/play.png b/openslides/projector/static/images/icons/play.png
index 80ff3a1d50871134d810bc38d2637fcedccc0404..2820368e8596875c15fe786090cbcf7690d489b5 100644
GIT binary patch
delta 690
zcmV;j0!{t(1K<TAiBL{Q4GJ0x0000DNk~Le0000M0000M2m}BC0B*gcu#q7c3j$#P
z00LnF!7x?&kwhnd0$)i)K~xwS1;M{-Ty+2d@Xz<XcR7zMXU;ZlnjzJSI0=CyAf$rS
zA)rfCG=aoFphI!6QwAvxMG$can88s)e?%~YgQaxLViHI!I++wA>S--!ewn<yd*A2h
z6Dk1QYQ+iTVazBts&#A0>ij+cp#pGo%3^P@(9=UEQ<HUnT)Vjf5GwF-J1)f8Bea|~
zr1Gby_R*9qCD%XcLZ~p`t~T@GeV4uFoQ4dg6Z;<6(Nf<HBe%L_&|5ei&P{qnznV-C
zM5UH#kK7lB`xeX*Dj!Xi-*vrZTuYxl7bKumIC11B%i7YnKVM1rTJeX&GnY;3_l&xS
z9=oJ25oA(-iMGFV)Ly^;RZ>ix4DyD4b$wE7`OGE~shWnScW^RTOeDSW+;c9d$)pmw
z1Aq9!f&-*#>Y6Uf^~RGpc4|PblnBTj+SB#Ghkis*)8~>?aV&|Wg&}nW0Z%;fuc!X8
z>r;!4q*5;_#L+B@2m;_YTmE+9yz}}*5Cl<_#f>n3^t(z0NM-60nRDh{K~H5{5I2&z
zp6JMxN)a_pZD+mfjw^^tr5%a5p2f99$ANx@3=Pj3aKlwVrEu)AL|jYas?LADcPv*Z
zHNEM!tAJ7=x9pHkTumS4-)<)}yDl1#NW5TD14L2b*w4P!5I(rQ6)H@B)0<7r8PQZ%
zlY&xtA@_?foywN(&Jiliw5!eD@Ud6TIHON0sFaS~^H4*!8%FMQ2^E-bR||1A*YLa-
zy)5|EwjD?6lBIC{ZWlrY;Jqn}<zT5)B9%&|9oLpu073<T_gmG3abrfYVcl9-y|)j*
Y|AA=pv(4B{NB{r;07*qoM6N<$f+mAL!~g&Q

delta 454
zcmV;%0XhEQ1@!|ViBL{Q4GJ0x0000DNk~Le0000G0000G2m}BC0JZuz>X9KB3jw<T
z00FxJI_%@(kwhnd0dz@3K~xwS1;If}Qvn<R@c%pY5$f8ZeS|JuJVqCFZL=7bLYk-`
zZxd^l%!laBx^(Je1aE{vU!bT#c?j|1Wf{eK2JbN5`1SjR5JDW*4zeuokNTr5KgbSi
zLI@E;^pm}`S9Wac>)Y1REBDfVB1DMYq&L{|%!#2N&U|-&V#k)=U^fvVy6J{jzWHhF
z%0Go)&K=v(O+}=&&9dv%AEkG$OjRZd7q)GdX)V^XWgq=knmTsmE2tEPmaXr{O1|og
zLWMo69(e5v6PMPk<gqmB8XBvxYTk?)k9<}cdtqr5i=&QHg(+^k?wVWf`(&!{(&8xE
z`I4cr3U}OpbVJ8qRK}iY=h4m@-n%rxJ$HQoOq^+G@5jShvwZ4Yq4Guns1&-I<-=Nt
zRyya%g~CK-sxnb{YfdW_Ar_L>VAh(UOJjwxGaa*9gM~zd5Ur$<*2`Ioc0Bjkta{l<
wTZs@Mgb>YIBdh20qxn%iZ)DAy5JLP1do6CCFD*9>i~s-t07*qoM6N<$f@HhWYybcN

diff --git a/openslides/projector/static/images/icons/skip-backward.png b/openslides/projector/static/images/icons/skip-backward.png
index 1de5dbacf00bd8584fbc67c67881bb9eda5458f1..120c1e02f313afe851cb0b297519e517c6e97ade 100644
GIT binary patch
delta 708
zcmV;#0z3Wx1MvkRiBL{Q4GJ0x0000DNk~Le0000M0000M2m}BC0B*gcu#q7c3j$#P
z00LnF!7x?&kwhnd0&q!0K~xwS1;I~9-E{x}@Xz=6`#qngd(KVKd9W~Ir^P^pfkZ*j
z4qa?fGgi=bhh5ffgBTrl>kvYte}@Rk%_yNu7F}XHsbENlAYWx`KCO89)Sl1xe&1i8
zPbdIzyAr2Og-H`wD^{%}4{kI72nB#!GwyUo+B!POWJ<Dsnya^#073!Y9*A@C${{LF
z8&%l$j|O@r^U1Y$>JSRt7%0|TV-4e;F{np|+>wUwR8^F>!ui{EGU&`5kF{KM&PgSi
zAc%4mmu*-U$GYacPAI%JlYdqBqA3+!GMNPA+73PR$f5!1OYbhFdzJXjLEpHGDiU-{
zr4or?$H!8C6L!>;o?HGXX-^-G@Vt|Lx99`A5|I1aO&bcmF5zgTJ)L!?T80cON&IJD
z1dn`Z!-0;rvR-FAWGai3$A+}z+M4!7(S2Xq_OFKAk&-Ttt13-qaiVQh8QbpLvt!vG
z4(!=gmugF;p7O0Ykwp<fK+R7M)Ku--@t41y5)lM{QIy2B;7^4DnTlaIy{t>B<b;xd
z!loduC2=)T(~>JZW>6}1$(*P48`Lk8%T*=fY7$oxHT#a`Do#tmxKCU+?3A*$re7uE
zN_eeO{M;Nl=S^inVn_y{>OB{{;8Q>7sfDxYM(c~sWOmCLqxzhXB7mshvwHpJGd;o^
zpZ}PDu&@;7yWO>J-=U_qj*gDDrX#!F*DcI1ED;LK4ixL1v8D@V_34rd3c03xzSkq$
z3g;K<gaTY1DCXjomL5-d(pkYTHdP%eOXkD1yLAW!fLCVR$wzXz9H~?)t+~3m1P}@U
qyjm%yO_?--HLF&_gL@4C{s#u@{A0k<^uYiN0000<MNUMnLSTYi%18bH

delta 464
zcmV;>0WbdX1^)vfiBL{Q4GJ0x0000DNk~Le0000G0000G2m}BC0JZuz>X9KB3jw<T
z00FxJI_%@(kwhnd0e(qDK~xwS1;If}lK~h2;CH8fLP4hvey7gSB?$5sF&*1XhNX}t
zD#*8qHcRFZI|O;@R;TDUY=npU10jQw2=U@&8P)oXzQfvhdY%wMh`nUD-R`vdt$w?+
z+ulor5F&(V6}Ho6Ubn8LWnEn}-%eWvAwp~wn%y;<4)lC~b?mbP8`d<tTLlrKk*?VH
z$u|S%{>XfH;)NBBR79Gr<_$-F%KbAoHuB3$r`E0JX%frr1@Hav)^ot2Wiv883zm0c
zvGdTO%xjzY>y5i^xnbzclEqHU_ZxZ!R^0Z*zC|}pNQ?|TG2f55e%+DG9pR%jlO|kn
z(OBlGxqj4tI`eu4N-pEvo~tgoVr1ZfS|@7lvUkqha}Dspr0a%`mDP4)HmT%~oXCs-
z{PtX?p_0!gA*$(=XHI2?M#e^lGOtXjrXs{lq1r84(sO1YGjOb~sM?(=h!CP$D5s^o
zXwHVm?kg(g<+NH5B7_j4l9bz}&UAmeU+R?Gl|%>^A^rn9-)3OjrJ79u0000<MNUMn
GLSTZEAl!NY

diff --git a/openslides/projector/static/styles/projector-control.css b/openslides/projector/static/styles/projector-control.css
index 05320ad2a..78d5223eb 100644
--- a/openslides/projector/static/styles/projector-control.css
+++ b/openslides/projector/static/styles/projector-control.css
@@ -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);
diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html
index f997d9ce2..99978665a 100644
--- a/openslides/projector/templates/projector/control.html
+++ b/openslides/projector/templates/projector/control.html
@@ -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>