From e1effea04645a44edc6c877f3a133623419de89f Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@BigDaddy.local>
Date: Wed, 5 Aug 2009 18:05:59 -0700
Subject: [PATCH] loading gif, spacing, updated emails
---
helios | 2 +-
iacr/templates/base.html | 1 +
iacr/templates/confirm.html | 20 +++++++++++++++++++-
iacr/views.py | 3 ++-
settings.py | 1 -
5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/helios b/helios
index b70bdb6..b83b4f9 160000
--- a/helios
+++ b/helios
@@ -1 +1 @@
-Subproject commit b70bdb6c07059fe22b073a6f6b2854e00ea12e95
+Subproject commit b83b4f96b3c4f717eece96f054b5e287a19a4c7d
diff --git a/iacr/templates/base.html b/iacr/templates/base.html
index e34bbc6..6723673 100644
--- a/iacr/templates/base.html
+++ b/iacr/templates/base.html
@@ -36,6 +36,7 @@
</div>
{% block content %}{% endblock %}
<div id="footer">
+ <br /><br />
<em>This web site is not endorsed by the IACR. It is only meant for demonstration purposes.</em>
</div>
</div>
diff --git a/iacr/templates/confirm.html b/iacr/templates/confirm.html
index eee4cdb..17a854f 100644
--- a/iacr/templates/confirm.html
+++ b/iacr/templates/confirm.html
@@ -2,6 +2,16 @@
{% block title %}Confirm Vote{% endblock %}
{% block content %}
+<script language="javascript">
+$(document).ready(function() {
+ $('#waiting_div').hide();
+});
+
+function show_waiting() {
+ $('#cast_div').hide();
+ $('#waiting_div').show();
+}
+</script>
<h1>Confirm your Vote</h1>
{% if error %}
@@ -14,9 +24,10 @@
<tt>{{vote_fingerprint}}</tt>
</p>
+<div id="cast_div">
<h3>Cast Your Ballot with your Credentials</h3>
-<form method="post" action="">
+<form method="post" onsubmit="show_waiting();" action="">
<input type="hidden" name="csrf_token" value="{{csrf_token}}" />
<table>
@@ -29,4 +40,11 @@
<p>
Forgot your password? <a href="{% url auth.auth_systems.password.password_forgotten_view %}?return_url={% url iacr.views.cast_confirm %}">Have it emailed to you</a>.<br />(don't worry, we won't forget your vote).
</p>
+</div>
+
+<div id="waiting_div" align="center">
+ Verifying and Casting your ballot<br />
+ <img src="/static/helios/loading.gif" />
+</div>
+
{% endblock %}
diff --git a/iacr/views.py b/iacr/views.py
index 2167e8c..8071f22 100644
--- a/iacr/views.py
+++ b/iacr/views.py
@@ -34,7 +34,8 @@ def home(request):
'openreg': False,
'admin' : helios.ADMIN,
'tally_type': 'homomorphic',
- 'ballot_type': 'homomorphic'
+ 'ballot_type': 'homomorphic',
+ 'use_voter_aliases': True
}
election = get_election()
diff --git a/settings.py b/settings.py
index 732d265..795e794 100644
--- a/settings.py
+++ b/settings.py
@@ -126,6 +126,5 @@ DEBUG = True
TEMPLATE_DEBUG = True
URL_HOST = "https://iacr-helios.appspot.com"
-URL_HOST = ""
IACR_ELECTION_UUID = 'iacr'
\ No newline at end of file
--
GitLab