simplified voting flow instructions, highlighting step 2 for review and...

simplified voting flow instructions, highlighting step 2 for review and keeping the word encryption out of the main vocabulary. Started down the path of removing client-side audit features if the administrator wants a simplified flow.

helios/fixtures/legacy-election-metadata-expected.json

-{"help_email": "help@heliosvoting.org", "use_advanced_audit_features": true}
\ No newline at end of file
+{"help_email": "help@heliosvoting.org", "private_p": false, "use_advanced_audit_features": true}
\ No newline at end of file

helios/models.py

@@ -138,6 +138,7 @@ class Election(HeliosModel):
   def metadata(self):
     return {
       'help_email': self.help_email or 'help@heliosvoting.org',
+      'private_p': self.private_p,
       'use_advanced_audit_features': self.use_advanced_audit_features
       }
 

heliosbooth/templates/election.html

@@ -6,14 +6,13 @@
 <p>
     
 <ol>
-    <li> <b>Select</b> your options.<br />
-<span style="font-size: 14pt;">Answer the questions, and review your choices.</span></li>
+    <li> <b>Select</b> the answers you prefer.<br />
+<span style="font-size: 14pt;">You can easily navigate forwards and backwards through the questions.</span></li>
 <br />
 
-    <li> <b>Encrypt</b> your selection.<br />
+    <li> <b>Confirm</b> your selection.<br />
 <span style="font-size: 14pt;">
-  Your selection is encrypted safely inside in your browser.<br />
-  A smart ballot tracker is given to let you track your ballot.<br />
+  Your choices are encrypted safely inside your browser, and you get a smart ballot tracker.<br />
 </span>
 </li>
 <br />

heliosbooth/templates/seal.html

 
+{#if $T.election_metadata.use_advanced_audit_features}
 <div style="float: right; background: lightyellow; margin-left: 20px; padding: 0px 10px 10px 10px; border: 1px solid #ddd; width:200px;">
 <h4><a onclick="$('#auditbody').slideToggle(250);" href="#">Audit</a> <span style="font-size: 0.8em; color: #444">[optional]</span></h4>
 <div id="auditbody" style="display:none;">
@@ -12,6 +13,7 @@ You will then be guided to re-encrypt your choices for final casting.
 </p>
 </div>
 </div>
+{#/if}
 
 <h3>Your ballot is ready to be submitted</h3>
 
@@ -26,15 +28,9 @@ You will then be guided to re-encrypt your choices for final casting.
 </p>
 
 <p>
-To protect your privacy:
-<ul>
-  <li> Helios has not yet asked for your identity.</li>
-  <li> Once you click "Proceed", Helios will remember only your encrypted vote.</li>
-  <li> Thus, only you know your vote.</li>
-</ul>
-</p>
+To protect your privacy, once you click "Proceed", Helios will remember only your encrypted vote. Thus, only you know your vote.</p>
 
-<button id="proceed_button" onclick="BOOTH.cast_ballot();">Proceed to Cast</button><br />
+<button id="proceed_button" onclick="BOOTH.cast_ballot();">Proceed to Submission</button><br />
 <div id="loading_div"></div>
 
 

heliosbooth/vote.html

@@ -318,6 +318,7 @@ BOOTH.show_processing_before = function(str_to_execute) {
 };
 
 BOOTH.show_encryption_message_before = function(func_to_execute) {
+    BOOTH.show_progress('3');
     BOOTH.show($('#encrypting_div'));
 
     func_to_execute();
@@ -404,6 +405,7 @@ BOOTH.show_confirm = function() {
     var choices = BALLOT.pretty_choices(BOOTH.election, BOOTH.ballot);
 
     BOOTH.show($('#confirm_div')).processTemplate({'questions' : BOOTH.election.questions, 'choices' : choices});
+    BOOTH.show_progress('2');
 };
 
 BOOTH.check_encryption_status = function() {
@@ -429,9 +431,9 @@ BOOTH._after_ballot_encryption = function() {
         'encrypted_vote_hash' : BOOTH.encrypted_ballot_hash,
         'election_uuid' : BOOTH.election.uuid,
         'election_hash' : BOOTH.election_hash,
-        'election': BOOTH.election});
+        'election': BOOTH.election,
+        'election_metadata': BOOTH.election_metadata});
       BOOTH.show($('#seal_div'));
-      BOOTH.show_progress('3');
       BOOTH.encrypted_vote_json = null;
     };
 
@@ -558,7 +560,7 @@ BOOTH.do_done = function() {
 <div id="page">
   <div id="progress_div" style="display:none; width: 500px; margin:auto;">
       <table width="100%">
-          <tr><td id="progress_1">(1) Select</td><td id="progress_2">(2) Encrypt</td><td id="progress_3">(3) Submit</td></tr>
+          <tr><td id="progress_1">(1) Select</td><td id="progress_2">(2) Confirm</td><td id="progress_3">(3) Submit</td></tr>
       </table>
   </div>
   <div id="election_div" class="panel">