From cd4f3481272abf98aa2adc55ba25de63c0fd929e Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@BigDaddy.local>
Date: Mon, 1 Feb 2010 14:16:03 -0800
Subject: [PATCH] updated emailing of voters

---
 helios                         | 2 +-
 server_ui/templates/base.html  | 1 +
 server_ui/templates/index.html | 5 +----
 settings.py.sample             | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/helios b/helios
index 4784ae2..2bcebf8 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 0580264..05f7e57 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 70aaf5b..93376da 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 dc3cd33..42069fc 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"
-- 
GitLab