From c2ec9e958f542ae41386d1048f364bb8d0f0dce2 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 08:30:28 +0200
Subject: [PATCH] #79:  Merged fix of r361 from default branch into 1.2-dev
 branch.

---
 .../assignment/templates/assignment/view.html |   2 +-
 .../templates/projector/Assignment.html       |   2 +-
 .../static/images/icons/games-highscores.png  | Bin 876 -> 0 bytes
 ...ighscores-grey.png => voting-yes-grey.png} | Bin 3136 -> 3134 bytes
 openslides/static/styles/assignment.css       |   4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 openslides/static/images/icons/games-highscores.png
 rename openslides/static/images/icons/{games-highscores-grey.png => voting-yes-grey.png} (86%)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 3029ccc78..e428f0c39 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -169,7 +169,7 @@
                 {% if perms.assignment.can_manage_assignment %}
                     <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.0.id %}'></a>
                 {% else %}
-                    <a class="elected"><img src="/static/images/icons/games-highscores.png" title="{% trans 'Candidate is elected' %}"></a>
+                    <a class="elected"><img src="/static/images/icons/voting-yes.png" title="{% trans 'Candidate is elected' %}"></a>
                 {% endif %}
             {% else %}
                 {% if perms.assignment.can_manage_assignment %}
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index f85597c1c..5ece64d51 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -61,7 +61,7 @@
         {% with vote|first as candidate %}
         <td class="candidate {% if candidate.1 %}elected{% endif %}">
             {% if candidate.1 %}
-                <a class="elected"><img src="/static/images/icons/games-highscores.png" title="{% trans 'Candidate is elected' %}"></a>
+                <a class="elected"><img src="/static/images/icons/voting-yes.png" title="{% trans 'Candidate is elected' %}"></a>
             {% endif %}
             {{ candidate.0 }}
         </td>
diff --git a/openslides/static/images/icons/games-highscores.png b/openslides/static/images/icons/games-highscores.png
deleted file mode 100644
index 34fa6d4a77972137fe5d4b7f237bc1b13daed5cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipS=
z2`x0Gp}8Lb00QhuL_t(I%XQC7Y*bYo$MNqu_d1>F(3w&c4N{7=KAO5HA&^F6Ag0Es
z8)LMKQsRpU#7ANj9}7uvW7N0-743#ZYF!9Q3?XU^BxryHIs{>ATPjVZopwq)?c6($
zJ2Us5zYA@XI{I6k<otf0<gWmZeX!}pyyF!ge7JRZO>1*g$;scU!_j)Bb;O8L6Bm9j
z6-svImUXvJdam`yz{$jha&98j^T|lBeeA<cPe1YI`QHAw+dfTRnE0}B<CE0ZSx`)Z
zKPnQ;lb`xU{dO_L=FYoV5pyX!mENAuMt1hSe0R4ldp>~94kzD;*A+lT5xWH;4pvA7
z##g0WiM(s5R4N4G(a^lG4<PUjx@+&nZ;rgz{`~ImC^~a#j6@M@Jt&P>wTOyPDr&r(
zptZ(zD?Ix8bn5V~=4YSze6(NZ7hb`=ksmzzen(3&o4Z!_N+<-B4YmzfIGLL;Mq!5)
zg`9B??PzP%BI5u$T7Q7&4qQDm`{(TDx$BZFEDQ-!04oFv#2DtMgiypL67?lBEdwi}
zrgPgDW2XQ#|77RE(f)ZSlARtrtxUxMD+c1DOogli(UmobpHtbXu-mnN=+NSB37DBV
z!k*(dwx9p$9A0)<lpTklOi(OPC@XGTYe{;nLNHb65)rC^)vKRk|Mq)#ja+j2uAc5y
zfv-_mETps4#6qlVEUB4me7k<*ov$jTsLGy>+NJm5msai_{GmsJ%sVFeb&L7+qqzLI
zui@jx|D!M5vDEz!>hJWu*03RVb5laij}wgt_doP*_UyTXO?2!YU)IzA2L$Cz=$<Xz
z44ld`nJU)<RpTlkkw^g0*~op(59~Ozc8x1rA2T9`6W_l@2f*damzDulCtSIblvq5D
z=WD5}sZpL$R01VoomXzorLDDf*~b1iFq2L*HZjYplUvlP#~&fAEryPtP_tWqCTvU9
z301&kDn%${lWYHq>nR^&477I>%%#a$8o&aA#r|LAJy_X54i4@B0000<MNUMnLSTXd
CZkXc$

diff --git a/openslides/static/images/icons/games-highscores-grey.png b/openslides/static/images/icons/voting-yes-grey.png
similarity index 86%
rename from openslides/static/images/icons/games-highscores-grey.png
rename to openslides/static/images/icons/voting-yes-grey.png
index 72e363a12b352873e12adff8a95fbf51c5a9c21e..faac1de32e5e8e5c83dd26c7770b84a047928f5d 100644
GIT binary patch
delta 429
zcmV;e0aE_J7`_;=oC<&310Dwg7<ya4*#H0mfJsC_R4C6)(alR#VHC&l?{ntPoe|<L
zLd3UTh5`#A721g|#Bv=7Ek$V2%dQ}THbMV@ih(N^5`imMVT2<iZdw>af+#lQkWe(M
zXdGt7?(;mSg_qH@JLdyGIQ$IBe7qAsmvQN|#MRS$Ywpp(+1-Bt6vC60?6gZ|H8h^O
z*08R*EYD^w7$}6zFTqGeA89~QT72ghr`zGgtQBay4@SDkwOQFEAcq;NFM`Pr>rRxq
zj<)%L&pbgWa%}BwX}++j-V6MX4elZ+1NfACDl(eY^KfN{216)HhDi0E(3Ljl?D$HK
zOtN)|y&?{eQlWo}qEtBHX2Rg{Nc_8@$|Y7=!*YmlBVncH?GK5!{?g(y4=J-onI5tU
zH>eu_Nx}v1N+_M&r%auz?T?CB=a%HbH~ZlyWt2gN=;m6&dzA1CZz~20;nAiY?Ph>X
zJG@8<mk*}ixTLK8cYekN5go=;(<;up`RLWlIB64L<<=#i$MK}^ci3aMo?d!gIlKP{
XJ^#VxNz;Gt00000NkvXXu0mjfsHxL3

delta 431
zcmV;g0Z{(F7{C~?oC<&22?Z1_2P=XQ?*IS+f=NU{R4C6)jXg*kaTtf6_kUN@>Zu4K
zN?b%j)1@dbf*@)YibxlCr*0Nns19NWmlkUMKo`-;$;CAwMQjV9E(HY}g$!1y)gVXw
zNbYJcANTKYYVt0>AJ6ZBSK!l7HrMw%(&*HMED34$@?N&tcF%v}5yza3nKM0Ov3GBF
zC)%jyhMX>vk_6pYWMcEPZ=Wd-<kymgq5{DXUtApW_=H!XfSUaFesImZKw}~p2p%p9
zhq3hQ=L=g3(#IdenUn_z25^NYg!^~2fpbtWw|^Q<9bIaTLh!M9NTs%uRUHevpa2%P
zvTjoH7-%#ZYAJt+eKWlQw*stx_`;QbK#_msXwoO7r-J2Hc=_UB^ScxP8;h`<#Geia
zixI?5@-QCOq4p;IlNz~LpPK%h2o|C2#v}DB*Hpin*e@|vF67KEwn<s#%qZ2?mXYPh
zIJg4?KjQWsy?>GTT1#F(k|IT|#NkPAz|A}1oIh+!KZ++!=`7(=JEMXqr}#ukV}Qa3
Z_zx$-k)Cjrk6i!&002ovPDHLkV1kcQ$W8zN

diff --git a/openslides/static/styles/assignment.css b/openslides/static/styles/assignment.css
index 270d7640d..84edb81f6 100644
--- a/openslides/static/styles/assignment.css
+++ b/openslides/static/styles/assignment.css
@@ -3,7 +3,7 @@ td.elected {
 }
 
 td.elected a.election_link {
-    background-image: url(/static/images/icons/games-highscores.png);
+    background-image: url(/static/images/icons/voting-yes.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -14,7 +14,7 @@ td.elected a.election_link {
 }
 
 td a.election_link {
-    background-image: url(/static/images/icons/games-highscores-grey.png);
+    background-image: url(/static/images/icons/voting-yes-grey.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;