diff --git a/helios b/helios index 4784ae26c129ef1d03f001df536fe4603fe8fbc5..2bcebf8949da22a5b66126abab6aec1965cbe2a7 160000 --- a/helios +++ b/helios @@ -1 +1 @@ -Subproject commit 4784ae26c129ef1d03f001df536fe4603fe8fbc5 +Subproject commit 2bcebf8949da22a5b66126abab6aec1965cbe2a7 diff --git a/server_ui/templates/base.html b/server_ui/templates/base.html index 058026489713fec69760473b6a6012b1aa65bef2..05f7e57ff6574004b5d9e536735d07fa9b7ddd5a 100644 --- a/server_ui/templates/base.html +++ b/server_ui/templates/base.html @@ -20,6 +20,7 @@ {% endblock %} <script language="javascript" src="/static/helios/helios/jquery-1.2.2.min.js"></script> + <script language="javascript" src="/static/helios/helios/jquery.json.min.js"></script> {% block js %} {% endblock %} diff --git a/server_ui/templates/index.html b/server_ui/templates/index.html index 70aaf5baf8c6a139d7c6222fa93b5fab892e5f58..93376dafe664c7b847d793757de139e1b37c26d4 100644 --- a/server_ui/templates/index.html +++ b/server_ui/templates/index.html @@ -11,12 +11,9 @@ Welcome to the {{settings.SITE_TITLE}} system! </p> -<!-- <p> - 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>. + {{settings.WELCOME_MESSAGE|safe}} </p> ---> {% if create_p %} <a href="{% url helios.views.election_new %}">create election</a> diff --git a/settings.py.sample b/settings.py.sample index dc3cd3360df9f6989e31daf39badb6bf42ff9cec..42069fc2fc56f7c8426c7c63a9a7929342576e48 100644 --- a/settings.py.sample +++ b/settings.py.sample @@ -149,3 +149,4 @@ SINGLE_ELECTION_PARAMS = { FOOTER_LINKS = [{'url':'http://usg.princeton.edu/elections', 'text':'USG Elections Center'}] FOOTER_LOGO = False +WELCOME_MESSAGE = "welcome"