Skip to content

Commit

Permalink
small tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
benadida committed Jan 17, 2022
1 parent 02049ba commit d2d2ab0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion helios/templates/_castconfirm_docast.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</form>

<p>
<button class="tiny" onclick="document.location='{% url "election@view" election.uuid %}';">cancel</button><br />
<button class="tiny" onclick="if (confirm('Are you sure you want to clear this ballot and NOT cast it?')) {document.location='{% url "election@view" election.uuid %}';}">cancel</button><br />
<span style="font-size:0.8em;">If you cancel now, your ballot will <em>NOT</em> be recorded.<br />
You can start the voting process over again, of course.</span>
</p>
Expand Down
8 changes: 5 additions & 3 deletions helios/templates/_castconfirm_password.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<input type="hidden" name="csrf_token" value="{{csrf_token}}" />
<input type="hidden" name="return_url" value="{{return_url}}" />
<input type="hidden" name="cast_ballot" value="{{cast_ballot}}" />
<table>
{{password_login_form.as_table}}
</table>

<div style="border: 1px solid #888; padding: 10px; max-width: 500px;">
{{password_login_form.as_p}}
{% if bad_voter_login %}
<p style="color: red;">
bad voter ID or password, please try again.
Expand All @@ -19,4 +19,6 @@
<input type="submit" class="button" value="log in" />
{% endif %}
</form>
</div>


11 changes: 6 additions & 5 deletions helios/templates/election_cast_confirm.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ <h1>Don't go yet!<br />Your ballot has not yet been cast.</h1>
<img src="/static/helios/loading.gif" />
</div>

<div style="word-wrap: break-word; width: 90vw;">
Your ballot tracker is:<br>
<b>{{vote_fingerprint}}</b>
<br><br>
</div>

<div id="all_forms">

{% if voter %}
Expand Down Expand Up @@ -90,11 +96,6 @@ <h1>Sorry!<h1>
{% endif %}

{% endif %}
<br />
<div style="font-size:0.8em;">
Your ballot tracker is:<br>
<b>{{vote_fingerprint}}</b>
</div>
</p>
{# this closes the IF ELSE of this being password_only #}
{% endif %}
Expand Down
7 changes: 4 additions & 3 deletions helios/templates/election_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ <h3 class="highlight-box">Tally</h3>
<br /><a href="{% url "election@extend" election.uuid %}">extend voting</a><br />
{% endif %}

<div style="background: lightyellow; padding:5px; padding-left: 10px; margin-top: 15px; border: 1px solid #aaa; width: 720px;" class="round">
<div style="background: lightyellow; padding:5px; padding-left: 10px; margin-top: 15px; border: 1px solid #aaa;" class="round">
<a href="#" onclick="$('#auditbody').slideToggle(250);">Audit Info</a>
<div id="auditbody" style="display:none;">
<div id="auditbody" style="display:none; word-wrap: break-word;">
<br />Election URL:<br />
<tt style="font-size: 1.2em;"><a href="{{election.url}}">{{election.url}}</a></tt>
<a href="{{election.url}}">{{election.url}}</a>

{% if election.frozen_at %}
<br />
Expand All @@ -285,6 +285,7 @@ <h3 class="highlight-box">Tally</h3>

{% if not election.voting_has_started %}
<p style="font-size: 1.2em;">
<br>
<a href="{{SECURE_URL_HOST}}/booth/vote.html?election_url={% url "election@home" election.uuid %}">preview booth</a>
</p>
{% endif %}
Expand Down
4 changes: 1 addition & 3 deletions heliosbooth/single-ballot-verify.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,7 @@
</head>
<body>
<div id="wrapper">
<div id="banner">
Helios Single-Ballot Verifier
</div>
<h2 style="padding-left: 10px;">Helios Single-Ballot Verifier</h2>
<div id="content">

<div id="verifier_loading">
Expand Down
3 changes: 1 addition & 2 deletions heliosbooth/templates/seal.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ <h3>Review your Ballot</h3>
<h4 style="padding: 0px; margin:0px;"><a onclick="$('#auditbody').slideToggle(250);" href="#">Spoil & Audit</a> <span style="font-size: 0.8em; color: #444">[optional]</span></h4>
<div id="auditbody" style="display:none;">
<p>
If you choose, you can spoil this ballot and reveal how your choices
were encrypted. This is an optional auditing process.
If you choose, you can spoil this ballot and reveal how your choices were encrypted. This is an optional auditing process.
</p>
<p>
You will then be guided to re-encrypt your choices for final casting.
Expand Down

0 comments on commit d2d2ab0

Please sign in to comment.