diff --git a/settings.py.sample b/settings.py.sample index 97104172af7914a34f90f8c2c196c3a37567d85a..02bac160093b42d28f31b9ee3fc6a8ee1ce2f7c6 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 94a12010e109afd946e2aca452783eafba4ac5db..66af6b394a91ca5f5294f9f9349b1efc076f9e60 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 Binary files /dev/null and b/single-election/media/footer-logo.gif.sample differ diff --git a/single-election/media/main.css b/single-election/media/main.css index e4ef232b2b01f42313727e0e600a2e315ce35d7e..3dd422d97c9762967406f5cd3d61b9339c60b47e 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 b088b65c09d8df511b49fa130deaa16c0bfd0393..5704cb1b87acb1bd0c9dcbc1aea605e48fd8745d 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 713d20c041f7f80c7eb912a5e96ec5514030db61..276dd15d51d1100495d7574e76d07fbf842dcb14 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;">