diff --git a/eosweb/core/static/img/guide.png b/eosweb/core/static/img/guide.png new file mode 100644 index 0000000..a691985 Binary files /dev/null and b/eosweb/core/static/img/guide.png differ diff --git a/eosweb/core/static/img/guide.svg b/eosweb/core/static/img/guide.svg new file mode 100644 index 0000000..4a8f3c3 --- /dev/null +++ b/eosweb/core/static/img/guide.svg @@ -0,0 +1,956 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 1 + 2 + 3 + 4 + 5 + 6 + + + + + + + + Click ‘Help’ for guidance + Follow the instructionsto cast your ballot + When you receive a green‘smart ballot tracker’,you're done! + + + diff --git a/eosweb/core/static/img/logo.png b/eosweb/core/static/img/logo.png new file mode 100644 index 0000000..358aabe Binary files /dev/null and b/eosweb/core/static/img/logo.png differ diff --git a/eosweb/core/static/img/logo.svg b/eosweb/core/static/img/logo.svg new file mode 100644 index 0000000..51cea3c --- /dev/null +++ b/eosweb/core/static/img/logo.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Eos Voting + Vote with confidence + + + + + + + diff --git a/eosweb/core/static/nunjucks/booth/base.html b/eosweb/core/static/nunjucks/booth/base.html index 44801b5..d1d3173 100644 --- a/eosweb/core/static/nunjucks/booth/base.html +++ b/eosweb/core/static/nunjucks/booth/base.html @@ -56,12 +56,29 @@
+ {% block helpbtn %} + {# #} + {% endblock %} {% block content %}{% endblock %}
+
{% block buttons %}{% endblock %}
+ + {% block after %}{% endblock %} diff --git a/eosweb/core/static/nunjucks/booth/welcome.html b/eosweb/core/static/nunjucks/booth/welcome.html index 3eec202..18b58b9 100644 --- a/eosweb/core/static/nunjucks/booth/welcome.html +++ b/eosweb/core/static/nunjucks/booth/welcome.html @@ -2,7 +2,7 @@ {# Eos - Verifiable elections - Copyright © 2017 RunasSudo (Yingtong Li) + Copyright © 2017-18 RunasSudo (Yingtong Li) This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -18,12 +18,25 @@ along with this program. If not, see . #} +{% block helpbtn %} + {# Don't float – we want it to overlap with the image #} +
+ +
+{% endblock %} + {% block content %} + + + +{% endblock %} + +{% block help %}

Welcome to the {{ election.name }} voting booth.

-

Follow the on-screen directions to prepare and cast your ballot in this {{ election.kind }}. The bar above will show your progress. Please note that your ballot will not be cast until you complete the final ‘Cast ballot’ stage and receive a ‘smart ballot tracker’.

-

If at any point you wish to return to a previous screen, click the ‘Back’ button below.

-

If you wish, you may disconnect your internet connection now while preparing your ballot, however you must re-connect your internet connection before logging in to cast your ballot.

-

Please click the blue ‘Continue’ button below to continue.

+

Follow the on-screen directions to prepare and cast your ballot in this {{ election.kind }}. The bar at the top of the page will show your progress. Please note that your ballot will not be cast until you complete the final ‘Cast ballot’ stage and receive a ‘smart ballot tracker’.

+

If at any point you wish to return to a previous screen, click the ‘Back’ button.

+ {#

If you wish, you may disconnect your internet connection now while preparing your ballot, however you must re-connect your internet connection before logging in to cast your ballot.

#} +

Click the ‘OK’ button below, then click the blue ‘Continue’ button to continue.

{% endblock %} {% block buttons %}