From 46a7ea8b73f891664cec9910e8b36d61cea705d3 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Sat, 24 Sep 2011 14:15:01 -0700
Subject: [PATCH] small tweaks
---
helios/templates/election_keygenerator.html | 2 +-
helios/templates/election_view.html | 3 ++-
helios/views.py | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/helios/templates/election_keygenerator.html b/helios/templates/election_keygenerator.html
index da5ddbe..946533d 100644
--- a/helios/templates/election_keygenerator.html
+++ b/helios/templates/election_keygenerator.html
@@ -118,7 +118,7 @@ Your key has been generated, but you may choose to<br /><a href="javascript:clea
</span>
<p>
- <button style="font-size:16pt;" onclick="download_sk(); $('#pk_link').show();">Download your secret key</button>
+ <button style="font-size:16pt;" onclick="download_sk(); $('#pk_link').show();">Save your secret key</button>
</p>
<p style="display: none;" id="pk_link">
diff --git a/helios/templates/election_view.html b/helios/templates/election_view.html
index 78beb63..6580d50 100644
--- a/helios/templates/election_view.html
+++ b/helios/templates/election_view.html
@@ -243,7 +243,8 @@ You are <em>not eligible</em> to vote in this {{election.election_type}}.
{% if election.openreg %}
{% if election.eligibility %}
-This election is open to: {{election.pretty_eligibility|safe}}. <a href="{{settings.SECURE_URL_HOST}}{% url auth.views.index %}?return_url={{CURRENT_URL}}">Log in</a> to check your eligibility.
+This election is open to: {{election.pretty_eligibility|safe}}
+<a href="{{settings.SECURE_URL_HOST}}{% url auth.views.index %}?return_url={{CURRENT_URL}}">Log in</a> to check your eligibility.
{% else %}
Anyone can vote in this election.
{% endif %}
diff --git a/helios/views.py b/helios/views.py
index ef097a5..2409e41 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -1009,7 +1009,7 @@ def trustee_decrypt_and_prove(request, election, trustee):
@election_view(frozen=True)
def trustee_upload_decryption(request, election, trustee_uuid):
if not _check_election_tally_type(election) or election.encrypted_tally == None:
- return HttpResponseRedirect(reverse(one_election_view,args=[election.election_id]))
+ return FAILURE
trustee = Trustee.get_by_election_and_uuid(election, trustee_uuid)
--
GitLab