diff --git a/eosweb/core/static/css/main.css b/eosweb/core/static/css/main.css index e2aa7e4..ec9d763 100644 --- a/eosweb/core/static/css/main.css +++ b/eosweb/core/static/css/main.css @@ -170,3 +170,7 @@ time[title] { .ticket > .content > .party-name { font-size: inherit; } + +#selections-make-help { + display: none; +} diff --git a/eosweb/core/static/nunjucks/booth/audit.html b/eosweb/core/static/nunjucks/booth/audit.html index 228cbb4..4b0e68e 100644 --- a/eosweb/core/static/nunjucks/booth/audit.html +++ b/eosweb/core/static/nunjucks/booth/audit.html @@ -25,7 +25,7 @@

Your vote has not yet been cast. Please follow the instructions to continue.

-

The following is your ballot with fingerprint {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64(true) }}, decrypted and ready for auditing.

+

The following is your ballot with fingerprint {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64() }}, decrypted and ready for auditing.

{# For some reason nunjucks doesn't like calling this the normal way #} @@ -41,3 +41,11 @@ {# Dirty trick to go back to the encryption step #} {% endblock %} + +{% block help %} +

Eos is now ready to audit your ballot. This is an optional step that you can take to ensure that your ballot was prepared correctly by the voting booth.

+

To complete the audit, provide the data shown to a trusted third-party, or click here to open the Eos auditor and copy-paste in the data shown.

+

If you are satisfied with the result of the audit, click the blue ‘Continue’ button to proceed to cast your ballot.

+

Click the ‘OK’ button below to close this help screen.

+

If you require further assistance, contact your election administrator.

+{% endblock %} diff --git a/eosweb/core/static/nunjucks/booth/base.html b/eosweb/core/static/nunjucks/booth/base.html index d1d3173..fadd25a 100644 --- a/eosweb/core/static/nunjucks/booth/base.html +++ b/eosweb/core/static/nunjucks/booth/base.html @@ -57,7 +57,7 @@
{% block helpbtn %} - {# #} + {% endblock %} {% block content %}{% endblock %}
diff --git a/eosweb/core/static/nunjucks/booth/cast.html b/eosweb/core/static/nunjucks/booth/cast.html index ae9bf8b..9482f15 100644 --- a/eosweb/core/static/nunjucks/booth/cast.html +++ b/eosweb/core/static/nunjucks/booth/cast.html @@ -20,7 +20,7 @@ {% block content %}
-

Your vote has not yet been cast. If you have not already done so, please make a note of your ballot fingerprint, {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64(true) }}.

+

Your vote has not yet been cast. Please make a note of your ballot fingerprint, {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64(true) }}.

Your vote has not yet been cast. Please follow the instructions to continue.

@@ -64,6 +64,11 @@ {% endblock %} {% block after %} +
+
Information for advanced users
+

Your full ballot fingerprint is {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64() }}.

+
+ {% endblock %} + +{% block help %} +

You are now ready to cast your ballot. If you disconnected your internet connection earlier, you must now reconnect it before proceeding.

+

Click the ‘OK’ button below to close this help screen, then click the blue ‘Cast ballot’ button. If there is no ‘Cast ballot’ button, select your login method from the list shown, and enter your voter details. These details may be found in the email or message instructing you to vote.

+

Once you have logged in, your vote will be automatically cast.

+

If you require further assistance, contact your election administrator.

+{% endblock %} diff --git a/eosweb/core/static/nunjucks/booth/cast_prepoll.html b/eosweb/core/static/nunjucks/booth/cast_prepoll.html index 73f629c..a1424aa 100644 --- a/eosweb/core/static/nunjucks/booth/cast_prepoll.html +++ b/eosweb/core/static/nunjucks/booth/cast_prepoll.html @@ -19,13 +19,11 @@ #} {% block content %} -

Your vote has not yet been cast.

- -
+

Your vote has not yet been cast. Please follow the instructions to continue.

-

If you have not already done so, please make a note of your ballot fingerprint, {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64(true) }}. Please retain a copy of your ballot fingerprint – you can use it to verify that your vote has been counted correctly. You may print this page as a receipt if you wish.

+

Please make a note of your ballot fingerprint, {{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(ballot).hash_as_b64(true) }}. Please retain a copy of your ballot fingerprint – you can use it to verify that your vote has been counted correctly. You may print this page as a receipt if you wish.

To continue, copy and paste the ballot below and provide it to the election administrator.

@@ -39,3 +37,17 @@ {% block buttons %}