From 6331a3bf656569fcaa1091f7eba7eee44c52e68c Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Sun, 22 Sep 2013 10:50:44 -0700
Subject: [PATCH] made footer logo url configurable and added princeton one to
the repo just for now
---
server_ui/media/princeton-footer-logo.gif | Bin 0 -> 1449 bytes
server_ui/templates/base.html | 4 ++--
settings.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 server_ui/media/princeton-footer-logo.gif
diff --git a/server_ui/media/princeton-footer-logo.gif b/server_ui/media/princeton-footer-logo.gif
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/server_ui/templates/base.html b/server_ui/templates/base.html
index d3b240e..85f4ab8 100644
--- a/server_ui/templates/base.html
+++ b/server_ui/templates/base.html
@@ -41,8 +41,8 @@
</div>
<div id="footer">
<span style="float:right;">
-{% if settings.FOOTER_LOGO %}
-<img src="/static/footer-logo.gif" />
+{% if settings.FOOTER_LOGO_URL %}
+<img src="{{settings.FOOTER_LOGO_URL}}" />
{% endif %}
</span>
{% if user %}
diff --git a/settings.py b/settings.py
index 816d139..c0d35fd 100644
--- a/settings.py
+++ b/settings.py
@@ -142,7 +142,7 @@ SITE_TITLE = get_from_env('SITE_TITLE', 'Helios Election Server')
# FOOTER links
FOOTER_LINKS = json.loads(get_from_env('FOOTER_LINKS', '[]'))
-FOOTER_LOGO = False
+FOOTER_LOGO_URL = get_from_env('FOOTER_LOGO_URL', None)
WELCOME_MESSAGE = get_from_env('WELCOME_MESSAGE', "This is the default message")
--
GitLab