Revert "Update pull from benadida repository. (#3)" (#4)

This reverts commit b52a755d.

heliosverifier/verify.html

@@ -97,7 +97,6 @@ function load_election_and_ballots(election_url) {
     
     // the hash will be computed within the setup function call now
     $.get(election_url, function(raw_json) {
-        try {
         election = HELIOS.Election.fromJSONString(raw_json);
         result_append("loaded election: " + election.name);
         result_append("election fingerprint: " + election.get_hash());
@@ -243,12 +242,6 @@ function load_election_and_ballots(election_url) {
             });
             
         });
-    } catch (error) {
-        result_append("<p>It appears that you are trying to verify a private election.</p>");
-        result_append('<p>You can log in as a valid voter or log in as the election admin.</p>');
-        result_append('<a class="btn" href="' + election_url + '">Log in as a valid voter </a>');
-        result_append('<a class="btn" href="/auth/?return_url=/verifier/verify.html?election_url=' + election_url + '">Log in as the election admin</a>');
-    }
     });
         
 }

requirements.txt

-Django==1.8.19
+Django==1.8.18
 anyjson==0.3.3
 celery==3.1.18
 django-celery==3.1.16
@@ -10,8 +10,8 @@ pyparsing==1.5.7
 python-dateutil>=1.5
 python-openid==2.2.5
 wsgiref==0.1.2
-gunicorn==19.9
-requests==2.21.0
+gunicorn==19.3
+requests==2.7.0
 unicodecsv==0.9.0
 dj_database_url==0.3.0
 django-sslify==0.2.7

reset.sh

 #!/bin/bash
-set -e  # Exit immediately if a command exits with a non-zero status.
 dropdb helios
 createdb helios
 python manage.py syncdb

runtime.txt

-python-2.7.15
+python-2.7.10

server_ui/glue.py

@@ -5,7 +5,6 @@ Glue some events together
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.conf import settings
-from helios.view_utils import render_template_raw
 import helios.views, helios.signals
 
 import views
@@ -13,18 +12,30 @@ import views
 def vote_cast_send_message(user, voter, election, cast_vote, **kwargs):
   ## FIXME: this doesn't work for voters that are not also users
   # prepare the message
-  subject_template = 'email/cast_vote_subject.txt'
-  body_template = 'email/cast_vote_body.txt'
-  
-  extra_vars = {
-    'election' : election,
-    'voter': voter,
-    'cast_vote': cast_vote,
-    'cast_vote_url': helios.views.get_castvote_url(cast_vote),
-    'custom_subject' : "%s - vote cast" % election.name
-  }
-  subject = render_template_raw(None, subject_template, extra_vars)
-  body = render_template_raw(None, body_template, extra_vars)
+  subject = "%s - vote cast" % election.name
+  
+  body = """
+You have successfully cast a vote in
+
+  %s
+  
+Your ballot is archived at:
+
+  %s
+""" % (election.name, helios.views.get_castvote_url(cast_vote))
+  
+  if election.use_voter_aliases:
+    body += """
+
+This election uses voter aliases to protect your privacy.
+Your voter alias is : %s    
+""" % voter.alias
+
+  body += """
+
+--
+%s
+""" % settings.SITE_TITLE  
   
   # send it via the notification system associated with the auth system
   user.send_message(subject, body)

server_ui/media/boothcss/forms.css

@@ -7,7 +7,7 @@ form.prettyform label,input,textarea,select {
     line-height: 1.8;
 }
 
-form.prettyform label:not(.answer) {
+form.prettyform label {
     display: block;
     text-align: right;
     float: left;

server_ui/templates/email/cast_vote_body.txt

-Dear {{voter.name}},
-
-You have successfully cast a vote in {{election.name}}.
-
-Your ballot is archived at: {{cast_vote_url}}
-
-{% if election.use_voter_aliases %}
-This election uses voter aliases to protect your privacy.
-Your voter alias is: {{voter.alias}}.
-{% endif %}
-
---
-
-Helios

server_ui/templates/email/cast_vote_subject.txt

-{{custom_subject|safe}}

server_ui/templates/index.html

@@ -24,7 +24,7 @@ Helios elections are:
 </ul>
 
 <p>
-More than <b>2,000,000 votes</b> have been cast using Helios.
+More than <b>100,000 votes</b> have been cast using Helios.
 </p>
 
 {% if create_p %}

server_ui/urls.py

 # -*- coding: utf-8 -*-
-from django.conf.urls import patterns
+from django.conf.urls import *
 
-from views import home, about, docs, faq, privacy
+from views import *
 
 urlpatterns = patterns('',
   (r'^$', home),