From b44d6ad9c6ca68a868b6fd562fa7458775f06269 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Tue, 11 Mar 2014 22:31:39 -0700
Subject: [PATCH] more tweaks to ballot wording

---
 heliosbooth/templates/election.html | 10 +++++-----
 heliosbooth/templates/question.html |  2 +-
 heliosbooth/vote.html               |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/heliosbooth/templates/election.html b/heliosbooth/templates/election.html
index 19069e2..03656b6 100644
--- a/heliosbooth/templates/election.html
+++ b/heliosbooth/templates/election.html
@@ -6,20 +6,20 @@
 <p>
     
 <ol>
-    <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>
+    <li> <b>Fill in</b> your ballot.<br />
+<span style="font-size: 14pt;">You can easily navigate forwards and backwards.</span></li>
 <br />
 
-    <li> <b>Confirm</b> your selection.<br />
+    <li> <b>Review &amp; Confirm</b> your choices.<br />
 <span style="font-size: 14pt;">
   Your choices are encrypted safely inside your browser, and you get a smart ballot tracker.<br />
 </span>
 </li>
 <br />
 
-    <li> <b>Submit</b> your encrypted ballot.<br />
+    <li> <b>Cast</b> your encrypted ballot.<br />
 <span style="font-size: 14pt;">
-Proceed to log in and cast your encrypted ballot for tallying.
+Proceed to log in and submit your encrypted ballot for tallying.
 </span>
 </li>
 </ol>
diff --git a/heliosbooth/templates/question.html b/heliosbooth/templates/question.html
index c852f58..88d2148 100644
--- a/heliosbooth/templates/question.html
+++ b/heliosbooth/templates/question.html
@@ -16,7 +16,7 @@ at least {$T.question.min}
 {#/if}
 {#else}
 {#if $T.question.max}
-up to {$T.question.max}
+{#if $T.question.max > 1}up to {#/if}{$T.question.max}
 {#else}
 as many as you approve of
 {#/if} 
diff --git a/heliosbooth/vote.html b/heliosbooth/vote.html
index e323cd7..66bee9f 100644
--- a/heliosbooth/vote.html
+++ b/heliosbooth/vote.html
@@ -602,7 +602,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) Confirm</td><td id="progress_3">(3) Submit</td></tr>
+          <tr><td id="progress_1">(1) Fill In</td><td id="progress_2">(2) Review &amp; Confirm</td><td id="progress_3">(3) Cast</td></tr>
       </table>
   </div>
   <div id="election_div" class="panel">
-- 
GitLab