From 79daeae7388ed89cf0db2018929495c630f4e0ec Mon Sep 17 00:00:00 2001 From: Ben Adida <ben@adida.net> Date: Thu, 24 Sep 2009 21:34:34 -0700 Subject: [PATCH] single election updates --- settings.py.sample | 3 +++ single-election/media/.gitignore | 3 ++- single-election/media/footer-logo.gif.sample | Bin 0 -> 1449 bytes single-election/media/main.css | 2 +- single-election/templates/base.html | 10 +++++++--- single-election/templates/index.html | 7 +++---- 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 single-election/media/footer-logo.gif.sample diff --git a/settings.py.sample b/settings.py.sample index 9710417..02bac16 100644 --- a/settings.py.sample +++ b/settings.py.sample @@ -144,3 +144,6 @@ SINGLE_ELECTION_PARAMS = { 'use_voter_aliases': True } +# FOOTER links +FOOTER_LINKS = [{'url':'http://usg.princeton.edu/elections', 'text':'USG Elections Center'}] + diff --git a/single-election/media/.gitignore b/single-election/media/.gitignore index 94a1201..66af6b3 100644 --- a/single-election/media/.gitignore +++ b/single-election/media/.gitignore @@ -1 +1,2 @@ -logo.gif \ No newline at end of file +logo.gif +footer-logo.gif \ No newline at end of file diff --git a/single-election/media/footer-logo.gif.sample b/single-election/media/footer-logo.gif.sample new file mode 100644 index 0000000000000000000000000000000000000000..6fc400b830bc2b4d973bd08ee26697eb7f9757a8 GIT binary patch literal 1449 zcmZ?wbhEHb)L~R$*v!DNX4UHV^_r6=Ow7y9X{f6+F)%!H=8U_u%gYVT_m6LljgD^e zRu1y_-?ek6vb@6GyLT0TvM_*v4wzt6U|?YR|KX(P>b(}P&+h)8pwX9-IWJ??x}4Yh z3Utnw<le7X_rB)+{{ssOJanY`Pb?{#$t*MD!io}(0t<<@m1U=6B{%Um9LmxaIMAEN z%&<?Ap&_qzZuXYc5@#uA1#2!YCN5^4IzF-F6xP;y=7gTMFs^deiJ820%py}$ctqHk z>sXms3i&6tF$poPXqzX(GL>g4SGCZ>)NP?%t3;UDQzL{nhw-f1$j4rOqWAEew8S}l zT+95z*m-$-x_NjG@GZM_@Lu>f;f;6GShgLh=Ms86mHqAe9q+bJWt~+smz9<M)4s@^ z4JWx8+1VuaRs~!*=*Zm3bw=@XUK3*@yKb0~Dx-s4@S6WJejJ>Bhg>J}{}SoA{G98M z6Su$C?$o8%wOpV5;@F&Upv$tQLBnK0YNA7<_3n2)krs+CET{WhE^GPKa5XT3?;B5P z!xgXDDg9nytyv2uot?s37nbp}y^)EDU4-FFb7Sza*hqDQQ#USmT?uB>o}yY@=HNOx zWyz*f9Ou^`>#6nG8nffXlkL_$B9muYI=*T35@$1*cA@D0iNhWIoL{3FwOh4T$Qw+E zYSlDYIaNJmC-aP^=T0)5wy9Y;%(t1@U0y4@vmL&7Wk0jI+s#NTRu8@$A&K7Co~#*H zy`?NT+PAzssT}{%sP^;uZ2LL>ANQ@Rdi!EZ=Q*Yw_jfxj+}z|d<>G%Sj#5{d(&Zi{ zcm0`t56Be=XDpr=ky_X=U8#P@qd6rN8xJQYt&Lnho#FhOjdSyr)+vd0uo$E=Rtb6? zI2p+^aUnPJH=U6CtgSHxN;(WJM=sWhnRqmYUjG~F>XsiHFx$27WoRFpTNHz${cj$J z$E<8R51vlv7GYR6{SU8j1oM3v4WZ8K5ed_$IzE~rl+63Llu?qo<<X<4qY(|$=PHyv z;Z*tkCS&QsC3nM5g=Cf<iJ$5lxZ*)I&z2WAt8W}&<f%@~F>8qW`>|qW!qghWmu!qn zR;?1{UNK9HNm^<Vf7(Qma*d|LM;tE&+LuYGP7RZAo7!LN_a(cchw;Hl&x7+8IsWh0 z*UIwJ2p5!8+8CJ^d6Xfk=T>0!0ht7K=NoTBV%fq!J-#+gLgB$G`L(OM^1A*>PPt(E z+4lMUE%Vf*H8!YnPG{_SFB|=M{i#_hyxQlhZfj@CwEjM}xI^j4tx%?Whu%$2KB_*0 zfh%_R!yUr&b~!SwmJ-rmvvHc{QjccK11odBoO`xFY4OB|MqR3^HU%5!|M{((-Q=d> zdo<{l<cTP=xh}j%C3+Ma7>vtjUA*EKbd`O%eQqk>k}nf$imys8x#hK*^GtX4UX6)I zZkzwP`NycKvx5CYe8gwVH!SxHy10Ywyf=v6NZkGN`r&9<hSF>Q8+I+3Z&sMIF?;Su zu~S_hmvz4V-(H<Hfng70%A$j_vp%~<bY!pp!g+@^efzG=+Sn+udKU4TR|&nZ(u_Q% zS{@m8UJMJk@Mykj^TBO-zp5WZ8ifm-l5Ls2vvT>|><J!w7XF^%==^LF*B9f}jDOc2 zZ@%k(Nivb)%CVnfjECcuri2R!C107xI`Or;(AiYGJ4^yxz2YBlM7-O~9pKv<%m3l7 ztkXe>)mt3>HM(Lxmn0kPd#KOs!Q>dZA${9i*|ln73Y;Ae!YA=R@>dW~;i!mfo}2kb zv25*vXceDp6Ke#Lg&t}jW_s){Q2mE7f6?co837SnxqhzXIqJdAkr~z&_hwPx0s&@) zw1*trWrr#+9bj{0*>s36%;Z4mr=%uXgAZ&LXVlqJmpF4Q6IV37bfCeIfkCGBfnNB@ zhkX@ilG$HLFxdY3*kA9%aGJsMgp<^#2^~I5l*CV-aI^X}aYD}$6?M;(UQwSW%{cQ! JNtuDc8UTMJfF}R| literal 0 HcmV?d00001 diff --git a/single-election/media/main.css b/single-election/media/main.css index e4ef232..3dd422d 100644 --- a/single-election/media/main.css +++ b/single-election/media/main.css @@ -22,7 +22,7 @@ body { } #header { - padding-top: 0px; + padding-top: 20px; text-align: center; padding-bottom: 20px; } diff --git a/single-election/templates/base.html b/single-election/templates/base.html index b088b65..5704cb1 100644 --- a/single-election/templates/base.html +++ b/single-election/templates/base.html @@ -45,12 +45,16 @@ </div> <div id="footer"> <span style="float:right;"> +<img src="/static/footer-logo.gif" /> +</span> {% if user %} -logged in as {{user.user_id}}@{{user.user_type}} [<a href="{% url auth.views.logout %}">logout</a>] +logged in as {{user.user_id}} [<a href="{% url auth.views.logout %}">logout</a>]<br /> {% else %} {% endif %} -</span> -<a href="http://heliosvoting.org">About Helios</a> | +<a href="http://heliosvoting.org">About Helios</a> +{% for footer_link in settings.FOOTER_LINKS %} +| <a href="{{ footer_link.url }}">{{footer_link.text}}</a> +{% endfor %} <br clear="right" /> </div> diff --git a/single-election/templates/index.html b/single-election/templates/index.html index 713d20c..276dd15 100644 --- a/single-election/templates/index.html +++ b/single-election/templates/index.html @@ -8,13 +8,12 @@ {% block content %} <p> - Welcome to the {{settings.SITE_TITLE}} Server. + Welcome to the {{settings.SITE_TITLE}} system! </p> <p> - This site uses the <a href="http://heliosvoting.org">Helios Voting System</a> to enable individual voters - to verify that their vote was correctly captured and tallied. Helios is a type of open-audit voting system, - also called an end-to-end voting system. + Helios is a revolutionary voting system that empowers voters to verify that their votes were correctly tallied.<br /> + Learn more about Helios, and why secure voting matters, <a href="http://heliosvoting.org">here</a>. </p> <p style="font-size: 1.4em;"> -- GitLab