codeforlife-portal 5.32.2__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/templates/portal/terms.html

@@ -1,5 +1,5 @@
 {% extends 'portal/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block subNav %}
@@ -8,16 +8,31 @@
 </section>
 <div class="sticky-subnav sub-nav sub-nav--teacher">
     <ul class="nav is-flex" role="tablist">
-        <li class="active"><a class="button button--secondary button--secondary--light" data-toggle="tab" href="#introduction">Introduction</a></li>
-        <li><a class="button button--secondary button--secondary--light" data-toggle="tab" href="#terms">Terms of use</a></li>
+        <li class="active"><a class="button button--secondary button--secondary--light" data-toggle="tab" href="#terms">Terms of use</a></li>
+        <li><a class="button button--secondary button--secondary--light" data-toggle="tab" href="#terms-children">Child-friendly</a></li>
     </ul>
 </div>
 {% endblock subNav %}
 
 {% block content %}
 <div class="tab-content background container">
-    <div id="introduction" class="tab-pane active">
-        <section><h4 id="introduction">Introduction</h4></section>
+    <div id="terms" class="tab-pane active">
+        <section><h4 id="terms-of-use">Terms of Use</h4></section>
+
+        <ol class="list--two-columns">
+            <li><p><a href="#introduction">Introduction</a></p></li>
+            <li><p><a href="#registration-and-types-of-membership">Registration and Types of Membership</a></p></li>
+            <li><p><a href="#misuse-of-code-for-life-site">Misuse of Code for Life site</a></p></li>
+            <li><p><a href="#prohibitions">Prohibitions</a></p></li>
+            <li><p><a href="#alerting-code-for-life">Alerting Code for Life</a></p></li>
+            <li><p><a href="#intellectual-property">Intellectual Property</a></p></li>
+            <li><p><a href="#our-liability">Our Liability</a></p></li>
+            <li><p><a href="#miscellaneous">Miscellaneous</a></p></li>
+        </ol>
+
+        <hr>
+
+        <h5 id="introduction">1. Introduction</h5>
         <div class="row d-flex">
             <div class="col-sm-6">
                 <p>Ocado Innovation Limited (as &ldquo;Ocado Technology&rdquo;), the division that powers Ocado.com, the world&rsquo;s
@@ -28,7 +43,7 @@
                     digital world.</p>
                 <p>Ocado Innovation Limited is committed to protecting any data that we collect concerning you. By using
                     our services on this website you are agreeing to the use of the data that we collect in accordance
-                    with the Privacy Policy and the Terms of Use (together, the &ldquo;Terms & Conditions&rdquo;), so please read
+                    with the Privacy Notice and the Terms of Use (together, the &ldquo;Terms & Conditions&rdquo;), so please read
                     these carefully.</p>
             </div>
             <div class="col-sm-6">
@@ -43,20 +58,6 @@
                     Technology from time to time (collectively, &ldquo;Code for Life&rdquo;).</p>
             </div>
         </div>
-    </div>
-
-    <div id="terms" class="tab-pane">
-        <section><h4 id="terms-of-use">Terms of Use</h4></section>
-
-        <ol class="list--two-columns">
-            <li><p><a href="#registration-and-types-of-membership">Registration and Types of Membership</a></p></li>
-            <li><p><a href="#misuse-of-code-for-life-site">Misuse of Code for Life site</a></p></li>
-            <li><p><a href="#prohibitions">Prohibitions</a></p></li>
-            <li><p><a href="#alerting-code-for-life">Alerting Code for Life</a></p></li>
-            <li><p><a href="#intellectual-property">Intellectual Property</a></p></li>
-            <li><p><a href="#our-liability">Our Liability</a></p></li>
-            <li><p><a href="#miscellaneous">Miscellaneous</a></p></li>
-        </ol>
 
         <hr>
 
@@ -65,24 +66,25 @@
                 <p><strong>Important: If you are under 13 years of age you must have your parent, guardian or carer&rsquo;s
                     consent to register for a Code for Life account, and to use their email address. If you are using
                     this at school, you must first have your teacher&rsquo;s permission to use this site. These Terms of Use
-                    were most recently updated on 27 December 2018.</strong></p>
-                <p>Code for Life includes all versions of &ldquo;Rapid Router&rdquo;, &ldquo;Kurono&rdquo; and any other games, platforms and
-                    other products or services released by us (whether online or otherwise), from time to time,
-                    including all Code for Life websites used to play the games, platforms and any other products or
-                    services that we make available. &ldquo;Code for Life&rdquo; and &ldquo;Rapid Router&rdquo; are registered UK trade marks of
+                    were most recently updated on {{ last_updated }}.</strong></p>
+                <p>Code for Life includes all versions of &ldquo;Rapid Router&rdquo;, &ldquo;Python Den&rdquo;,
+                    &ldquo;Kurono&rdquo; and any other games, platforms and other products or services released by us
+                    (whether online or otherwise), from time to time, including all Code for Life websites used to play
+                    the games, platforms and any other products or services that we make available.
+                    &ldquo;Code for Life&rdquo;, &ldquo;Rapid Router&rdquo; and "&ldquo;Kurono&rdquo;" are registered UK trademarks of
                     Ocado Innovation Limited.</p>
-                <p>You must take the time to read and understand the Terms of Use and the Privacy Policy before
+                <p>You must take the time to read and understand the Terms of Use and the Privacy Notice before
                     registering for Code for Life.</p>
             </div>
             <div class="col-sm-6">
                 <p><strong>By registering, you accept that you are entering into a contract with us in accordance with
-                    the Terms & Conditions and the Privacy Policy. Visitors to the Code for Life portal who do not
+                    the Terms & Conditions and the Privacy Notice. Visitors to the Code for Life portal who do not
                     register to become a User, similarly affirm that they are bound by the Terms & Conditions and the
-                    Privacy Policy each time they access the Code for Life site. We reserve the right to update the
+                    Privacy Notice each time they access the Code for Life site. We reserve the right to update the
                     Terms of Use at any time, so please check them periodically, as all changes will be binding on you
                     provided that you use the website after they have been made. To assist you in determining whether
                     the Terms & Conditions have changed since your most recent visit to the website, we will display the
-                    date when the Terms of Use and Privacy Policy were most recently updated.</strong></p>
+                    date when the Terms of Use and Privacy Notice were most recently updated.</strong></p>
                 <p><strong>Important: You must ensure that any email address we hold for you is kept up-to-date and that
                     you have full access to it. Important notifications are sent to the email address you provide.
                     Failure to keep this information updated can result in your Code for Life account being deleted
@@ -92,12 +94,12 @@
 
         <hr>
 
-        <h5 id="registration-and-types-of-membership">1. Registration and Types of Membership</h5>
-        <p><strong>Membership falls into the following categories under the Agreement outlined in this policy:</strong></p>
+        <h5 id="registration-and-types-of-membership">2. Registration and Types of Membership</h5>
+        <p><strong>Membership falls into the following categories under the Agreement outlined in this notice:</strong></p>
         <ul>
             <li><p>Administrators: person or persons assigned responsibility for the management and security of
                 membership by other Users;</p></li>
-            <li><p>Users: any person using the Code for Life website, Rapid Router, Kurono or any other game,
+            <li><p>Users: any person using the Code for Life website, Rapid Router, Python Den, Kurono or any other game,
                 application or platform of ours regardless of membership;</p></li>
             <li><p>Students: Users who are provided with login information for Code for Life by a teacher, parent,
                 guardian or carer;</p></li>
@@ -122,6 +124,18 @@
             <li><p>if you are accepting the Terms & Conditions on behalf of a school or club, you have the authority to
                 bind that institution, company or legal entity to the Terms & Conditions.</p></li>
         </ul>
+        <p>The organisation Administrator is able to make other teachers in the organisation Administrators.</p>
+        <p><strong>All Administrators should be aware that:</strong></p>
+        <ul>
+            <li><p>they are able to access all the classes, and the students of those classes, within the organisation.
+                This also includes the students’ progress data, as well as any custom level created by colleagues or
+                students within the organisation.</p></li>
+            <li><p>they are able to manage (create, edit, transfer and remove) all the classes, students and levels
+                within the organisation; and</p></li>
+            <li><p>if there is only one Administrator in the organisation and that Administrator deletes their account,
+                the Administrator role will automatically be transferred to the next Teacher in the organisation.
+            </p></li>
+        </ul>
         <p>As a User, you further warrant that you will only grant access codes to teachers, staff members and students
             who are current employees or students known to your school or club. Upon termination of a teacher or other
             staff member&rsquo;s employment with you, you will ensure they assign over all existing classes and/or students to
@@ -136,12 +150,12 @@
             address.</p>
         <p>Please note that we are not an internet service provider. All Users of Code for Life must have internet
             access and the necessary software for email and web usage.</p>
-        <p>Code for Life&rsquo;s Privacy Policy forms part of the Terms & Conditions, and your acceptance of the Terms &
-            Conditions constitutes consent to the way we may handle your personal data as detailed in that policy.</p>
+        <p>Code for Life&rsquo;s Privacy Notice forms part of the Terms & Conditions, and your acceptance of the Terms &
+            Conditions constitutes consent to the way we may handle your personal data as detailed in that notice.</p>
 
         <hr>
 
-        <h5 id="misuse-of-code-for-life-site">2. Misuse of Code for Life site</h5>
+        <h5 id="misuse-of-code-for-life-site">3. Misuse of Code for Life site</h5>
         <p>We reserve the right (a) to suspend or terminate any User&rsquo;s access to Code for Life, or parts of it, and/or
             (b) to remove, or require the User to remove, material posted on Code for Life, if the User or material
             appears to us, or to someone who has complained to us, to be in breach of any provision of the Terms &
@@ -177,7 +191,7 @@
 
         <hr>
 
-        <h5 id="prohibitions">3. Prohibitions</h5>
+        <h5 id="prohibitions">4. Prohibitions</h5>
         <p>You must ensure that any activity and or communication through the Code for Life site, is not capable of (a)
             infringing the intellectual property or other rights of any person or entity, (b) breaching any applicable
             laws, regulations or codes of practice, whether criminal, tortuous or otherwise, (c) appearing to be
@@ -190,7 +204,7 @@
 
         <hr>
 
-        <h5 id="alerting-code-for-life">4. Alerting Code for Life</h5>
+        <h5 id="alerting-code-for-life">5. Alerting Code for Life</h5>
         <p>If you see anything on the Code for Life portal which appears to infringe any part of the Terms & Conditions,
             then please inform us via the <a class="freshdesk__contact-us">Contact Us</a> section of this site.</p>
         <p>We do not endorse or take responsibility for the content of any third party sites that link to or from Code
@@ -198,10 +212,10 @@
 
         <hr>
 
-        <h5 id="intellectual-property">5. Intellectual Property</h5>
+        <h5 id="intellectual-property">6. Intellectual Property</h5>
         <p>You acknowledge that all copyright, trademarks, and other intellectual property rights in and relating to
-            Code for Life (including all content of the Code for Life website, the Rapid Router application, the Kurono
-            application, related software (including any drawn and/or animated avatars, whether or not such avatars have
+            Code for Life (including all content of the Code for Life website, the Rapid Router application, the Python Den
+            application, the Kurono application, related software (including any drawn and/or animated avatars, whether or not such avatars have
             any modifications) and any other games, applications or any other content that we make available from time
             to time) are owned by Ocado Innovation Limited. These rights protect all of the applications, games,
             products and services you see on the Code for Life website from time to time, including the graphics of
@@ -212,7 +226,7 @@
 
         <hr>
 
-        <h5 id="our-liability">6. Our Liability</h5>
+        <h5 id="our-liability">7. Our Liability</h5>
         <p>The website, use of the application and games, and access to any accounts is provided by us on an &ldquo;as is&rdquo;
             basis without any warranties or guarantees. We do not accept responsibility for any errors, omissions, or
             for the results obtained from the use of such information or for any technical problems you may experience
@@ -241,7 +255,7 @@
 
         <hr>
 
-        <h5 id="miscellaneous">7. Miscellaneous</h5>
+        <h5 id="miscellaneous">8. Miscellaneous</h5>
         <p>The delay or failure of any party to exercise its rights provided for in these Terms & Conditions shall not
             be deemed a waiver of any further rights hereunder. If any provision of the Terms & Conditions is found to
             be unenforceable or invalid, that provision shall be limited or eliminated to the minimum extent necessary
@@ -249,6 +263,141 @@
             governed by and construed in accordance with the laws of England and Wales and the parties shall submit to
             the exclusive jurisdiction of the English courts.</p>
     </div>
+
+    <div id="terms-children" class="tab-pane">
+
+        <section><h4>Terms of Use</h4></section>
+
+        <div class="row d-flex">
+            <div class="col-sm-6">
+                <p><strong>We ask that you take the time to read and understand our Terms of Use and the Privacy Notice
+                    before registering for Code for Life. These Terms were last updated on {{ last_updated }}.
+                </strong></p>
+                <p>Our Terms of Use set out the rules that we ask you to follow when using Code for Life. The rules
+                    cover:</p>
+                <ul>
+                    <li><p>all Code for Life websites used to play the games, platforms and any other products or
+                        services that we make available to you</p></li>
+                    <li><p>all versions of “Rapid Router”, “Python Den”, “Kurono” and any
+                        other games, platforms and other products or
+                        services we released (whether online or otherwise)</p></li>
+                </ul>
+                <p><strong>When you visit the Code for Life site or register with us you agree to follow these rules.</strong></p>
+            </div>
+            <div class="col-sm-6">
+                <p><strong>We may need to update our Terms of Use every now and then. If you have registered with us
+                    then we will email you to tell you about any changes we’ve made. We’ll also post a message up on the
+                    site so that any visitors will know that our Terms have changed.  This page shows the date we last
+                    made a change so you’ll always be able to check when the Terms were most recently updated.</strong></p>
+                <p><strong>Important: Please make sure to keep your email address up to date as we will use this to send
+                    you important messages about Code for Life. If you don’t keep it updated then it could lead to your
+                    access being restricted or your account deleted.</strong></p>
+                <p><strong>You should use the <a class="freshdesk__contact-us">Contact Us form</a> if you need help or
+                    advice on how to use the site. Please be aware that we will never ask for personal information other
+                    than what is required to identify your account and answer your questions, and we will never ask for
+                    your password.</strong></p>
+            </div>
+        </div>
+
+        <hr>
+
+        <h5>1. Misuse of the Code for Life site</h5>
+
+        <p>Please remember that you are responsible for everything you do when logged onto the Code for Life site. If
+            you create content on Code for Life which we think breaks the rules of the Terms of Use then we may:</p>
+        <ol type="a">
+            <li><p>suspend or close your access Code for Life account, OR</p></li>
+            <li><p>block your access to parts of the site OR</p></li>
+            <li><p>remove (or ask you to remove) the post which we think broke the rules.</p></li>
+        </ol>
+        <p>If we have to suspend or close your account then you won’t be allowed to re-register or access the portal
+            again unless we have given you our permission in writing to do so.</p>
+
+        <p>We’ll do our best to make sure the Code for Life website and access to your account and our games, platforms
+            and other products or services is available to you 24 hours a day. However, we sometimes have to limit
+            users’ access to their account or the site so that we can make repairs or add new content.</p>
+
+        <p>We also aim to provide you with the best service we can, but we can’t promise that the Code for Life site, or
+            our games, platforms and services will always be fault, virus or mistake-free. If you notice a problem or
+            fault, please let us know using the <a class="freshdesk__contact-us">contact us form</a> and we will do all
+            we can to correct it as quickly as we can.</p>
+
+        <p>Whether or not a user follows the Terms of Use we still have the right to:</p>
+        <ol type="a">
+            <li><p>choose whether to accept or reject their registration</p></li>
+            <li><p>suspend and cancel their account at any time (without telling them first)</p></li>
+            <li><p>stop them from accessing all or part of the games, platforms and any other of our services (including
+                any old or live games or avatar(s) they’ve created).</p></li>
+        </ol>
+
+        <p><strong>The Code for Life portal was created to help you learn how to code, and this is the only purpose you
+            should use it for. This means that you may not:</strong></p>
+        <ul>
+            <li><p>post content on Code for life for business purposes or use the Code for Life site for a business
+                purpose OR</p></li>
+            <li><p>use the Code for Life site or information you’ve taken from it, to send out spam emails.</p></li>
+        </ul>
+
+        <hr>
+
+        <h5>2. Other limits of use</h5>
+
+        <p>You must not:</p>
+        <ol type="a">
+            <li><p>copy content taken from our site or copy content created by another Code for Life user without
+                permission,</p></li>
+            <li><p>break any laws when using the site,</p></li>
+            <li><p>create levels that contain offensive, threatening, harmful or false content,</p></li>
+            <li><p>use the site in a way that causes disruption to other users,</p></li>
+            <li><p>use the site in a way that helps someone to gain access to other computer systems that they do not
+                have permission to access,</p></li>
+            <li><p>use the site in a way that affects other peoples’ use or enjoyment of the Code for Life website,</p></li>
+            <li><p>do anything that could cause damage the site, for example taking action that allows in, computer
+                viruses, logic bombs, Trojan horses or some other kind of harmful software or data.</p></li>
+        </ol>
+
+        <hr>
+
+        <h5>3. Alerting Code for Life</h5>
+
+        <p>If you see anything on the Code for Life portal which you think breaks the rules in our Terms of Use, then
+            please let us know by using the Contact Us section of the site.</p>
+
+        <p>The Code for Life site has links to websites that are run by other organisations, and other organisation
+            websites will sometimes have links to our site. We have no control over these other websites and so are not
+            responsible for their contents.</p>
+
+        <hr>
+
+        <h5>4. Intellectual Property</h5>
+
+        <p>The contents of the Code for Life website are our ‘Intellectual Property’. This means that you cannot copy or
+            reuse them without our permission. Just because it is easy to copy some of the content on the website, this
+            does not mean it is allowed. The content covered by Intellectual Property includes:</p>
+        <ol type="a">
+            <li><p>Rapid Router, Python Den and Kurono applications</p></li>
+            <li><p>Games – this will include the design of the games (for example their graphics, style and gameplay)</p></li>
+            <li><p>Avatars, whether they are drawn or animated</p></li>
+            <li><p>Any other software or services you see on our website</p></li>
+            <li><p>Source Code (this is the code that our website and games are made up of)</p></li>
+        </ol>
+
+        <hr>
+
+        <h5>5. Our responsibilities</h5>
+
+        <p>We will not be responsible for:</p>
+        <ul>
+            <li><p>viruses, trojans and similar threats that could affect your access to, or use of, the website
+                (including your account),</p></li>
+            <li><p>any problems you have logging on because your computer, mobile device, broadband or software won’
+                work with our site,</p></li>
+            <li><p>any delays or failures that happen when you are using the site,</p></li>
+            <li><p>any errors loss of access to the site caused by a technical problem at Ocado,</p></li>
+            <li><p>the site not being suitable for your learning needs,</p></li>
+            <li><p>any inaccuracies in the description of our games or levels.</p></li>
+        </ul>
+    </div>
 </div>
 
 {% endblock content %}

portal/templates/two_factor/core/login.html

@@ -1,63 +1,75 @@
 {# Overriden the original "two_factor" template to remove extending base template and slightly adjust style #}
 
-{% load i18n two_factor %}
-
-  <section class="row mx-0">
-      <span class="oval-blue login-shape-left"></span>
-      <span class="polygon-yellow login-shape-right"></span>
-      <div class="form--login is-flex form--register--teacher">
-          <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">
-  <h4>{% block title %}{% trans "Login as a teacher " %}{% endblock %}</h4>
-
-  {% if wizard.steps.current == 'auth' %}
-    <p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
-  {% elif wizard.steps.current == 'token' %}
-    {% if device.method == 'call' %}
-      <p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
-        digits you hear.{% endblocktrans %}</p>
-    {% elif device.method == 'sms' %}
-      <p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
-        sent.{% endblocktrans %}</p>
-    {% else %}
-      <p class="text-left">{% blocktrans trimmed %}Please enter the token generated by your token
-        generator.{% endblocktrans %}</p>
-    {% endif %}
-  {% elif wizard.steps.current == 'backup' %}
-    <p class="text-left">{% blocktrans trimmed %}Use this form for entering backup tokens for logging in.
-      These tokens have been generated for you to print and keep safe. Please
-      enter one of these backup tokens to login to your account.{% endblocktrans %}</p>
-  {% endif %}
-
-  <form action="" method="post" class="d-flex flex-column">{% csrf_token %}
-    {% if wizard.steps.current == 'backup' %}
-      {% include "two_factor/_wizard_forms_token.html" %}
-    {% else %}
-      {% include "two_factor/_wizard_forms.html" %}
-    {% endif %}
-
-    {# hidden submit button to enable [enter] key #}
-    <input placeholder="" type="submit" value="" class="hidden" />
-    {% if other_devices %}
-      <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
-      <p>
-        {% for other in other_devices %}
-        <button name="challenge_device" value="{{ other.persistent_id }}"
-                class="btn btn-secondary" type="submit">
-          {{ other|device_action }}
-        </button>
-      {% endfor %}</p>
-    {% endif %}
-    {% if backup_tokens %}
-      <p>
-        <div class="d-flex flex-column justify-content-start align-items-start">
-
-          <button name="wizard_goto_step" type="submit" value="backup"
-          class="button button--primary">{% trans "Use a backup token" %}</button>
-        </div>
-        </p>
-        {% endif %}
-              {% include "two_factor/_wizard_actions_submit.html" %}
+{% load i18n %}
+{% load static %}
+{% load two_factor_tags %}
+
+{% block extra_media %}
+{{ form.media }}
+{% endblock %}
+
+{% block content %}
+
+<section class="row mx-0">
+    <span class="login-shape-left">
+        <img src="{% static 'portal/img/oval_blue.svg' %}" alt="Blue oval">
+    </span>
+    <span class="login-shape-right">
+        <img src="{% static 'portal/img/polygon_yellow.svg' %}" alt="Yellow polygon">
+    </span>
+    <div class="form--login is-flex form--register--teacher">
+        <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">
+            <h4>{% block title %}{% trans "Welcome" %}{% endblock %}</h4>
+
+            {% if wizard.steps.current == 'auth' %}
+            <p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
+            {% elif wizard.steps.current == 'token' %}
+            <p>{{ device|as_verbose_action }}</p>
+            {% elif wizard.steps.current == 'backup' %}
+            <p>{% blocktrans trimmed %}Use this form for entering backup tokens for logging in.
+                These tokens have been generated for you to print and keep safe. Please
+                enter one of these backup tokens to log into your account.{% endblocktrans %}</p>
+            {% endif %}
+
+            <form action="" method="post">
+                {% block main_form_content %}
+                {% csrf_token %}
+                {% include "two_factor/_wizard_forms.html" %}
+
+                {# hidden submit button to enable [enter] key #}
+                <input type="submit" value="" hidden />
+
+                {% if other_devices %}
+                <p>{% trans "Or, alternatively, use one of your other authentication methods:" %}</p>
+                <p>
+                    {% for other in other_devices %}
+                    <button name="challenge_device" value="{{ other.persistent_id }}"
+                            class="btn btn-secondary btn-block" type="submit">
+                        {{ other|as_action }}
+                    </button>
+                    {% endfor %}</p>
+                {% endif %}
+
+                {% include "two_factor/_wizard_actions.html" %}
+                {% endblock %}
             </form>
-          </div>
+
+            {% block 'backup_tokens' %}
+            {% if backup_tokens %}
+            <hr>
+            <div class="backup_tokens_form">
+                <form action="" method="post">
+                    {% csrf_token %}
+                    <p>{% trans "As a last resort, you can use a backup token:" %}</p>
+                    <p>
+                        <button name="wizard_goto_step" type="submit" value="backup"
+                                class="button button--primary">{% trans "Use Backup Token" %}</button>
+                    </p>
+                </form>
+            </div>
+            {% endif %}
+            {% endblock %}
         </div>
-      </section>
+    </div>
+</section>
+{% endblock %}

portal/templates/two_factor/core/setup.html

@@ -3,55 +3,64 @@
 {% extends "two_factor/_base_focus.html" %}
 {% load i18n %}
 
+{% block extra_media %}
+{{ form.media }}
+{% endblock %}
+
 {% block content %}
-    <h4 class="text-center">{% block title %}{% trans "Two-factor authentication" %}{% endblock %}</h4>
-    {% if wizard.steps.current == 'welcome' %}
-        <p>{% blocktrans trimmed %}You are about to take your account security to the
-            next level. Follow the steps in this wizard to enable two-factor
-            authentication.{% endblocktrans %}</p>
-    {% elif wizard.steps.current == 'method' %}
-        <p>{% blocktrans trimmed %}Please select which authentication method you would
-            like to use.{% endblocktrans %}</p>
-    {% elif wizard.steps.current == 'generator' %}
-        <p>{% blocktrans trimmed %}Two-factor authentication is not currently set up on your account.
-            Enable two-factor authentication (2FA) for enhanced account security
-        {% endblocktrans %}</p>
-        <p>{% blocktrans trimmed %}To start using a token generator, please use your
-            smartphone to scan the QR code below. For example, use Google
-            Authenticator.
-        {% endblocktrans %}</p>
-        <p><img src="{% url 'two_factor:qr' %}" alt="QR Code" /></p>
-    {% elif wizard.steps.current == 'sms' %}
-        <p>{% blocktrans trimmed %}Please enter the phone number you wish to receive the
-            text messages on. This number will be validated in the next step.
-        {% endblocktrans %}</p>
-    {% elif wizard.steps.current == 'call' %}
-        <p>{% blocktrans trimmed %}Please enter the phone number you wish to be called on.
-            This number will be validated in the next step. {% endblocktrans %}</p>
-    {% elif wizard.steps.current == 'validation' %}
-        {% if challenge_succeeded %}
-            {% if device.method == 'call' %}
-                <p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
-                    digits you hear.{% endblocktrans %}</p>
-            {% elif device.method == 'sms' %}
-                <p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
-                    sent.{% endblocktrans %}</p>
-            {% endif %}
-        {% else %}
-            <p class="alert alert-warning" role="alert">{% blocktrans trimmed %}We've
-                encountered an issue with the selected authentication method. Please
-                go back and verify that you entered your information correctly, try
-                again, or use a different authentication method instead. If the issue
-                persists, contact the site administrator.{% endblocktrans %}</p>
-        {% endif %}
-    {% elif wizard.steps.current == 'yubikey' %}
-        <p>{% blocktrans trimmed %}To identify and verify your YubiKey, please insert a
-            token in the field below. Your YubiKey will be linked to your
-            account.{% endblocktrans %}</p>
-    {% endif %}
+<h4>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %}</h4>
+{% if wizard.steps.current == 'welcome' %}
+<p>{% blocktrans trimmed %}You are about to take your account security to the
+    next level. Follow the steps in this wizard to enable two-factor
+    authentication.{% endblocktrans %}</p>
+{% elif wizard.steps.current == 'method' %}
+<p>{% blocktrans trimmed %}Please select which authentication method you would
+    like to use.{% endblocktrans %}</p>
+{% elif wizard.steps.current == 'generator' %}
+<p>{% blocktrans trimmed %}To start using a token generator, please use your
+    smartphone to scan the QR code below. For example, use Google
+    Authenticator.{% endblocktrans %}</p>
+<p><img src="{{ QR_URL }}" alt="QR Code" class="bg-white"/></p>
+<p>{% blocktrans trimmed %}Alternatively you can use the following secret to
+    set up TOTP in your authenticator or password manager manually.{% endblocktrans %}</p>
+<p>{% translate "TOTP Secret:" %} <a href="{{ otpauth_url }}">{{ secret_key }}</a></p>
+<p>{% blocktrans %}Then, enter the token generated by the app.{% endblocktrans %}</p>
+
+{% elif wizard.steps.current == 'sms' %}
+<p>{% blocktrans trimmed %}Please enter the phone number you wish to receive the
+    text messages on. This number will be validated in the next step.
+    {% endblocktrans %}</p>
+{% elif wizard.steps.current == 'call' %}
+<p>{% blocktrans trimmed %}Please enter the phone number you wish to be called on.
+    This number will be validated in the next step. {% endblocktrans %}</p>
+{% elif wizard.steps.current == 'validation' %}
+{% if challenge_succeeded %}
+{% if device.method == 'call' %}
+<p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
+    digits you hear.{% endblocktrans %}</p>
+{% elif device.method == 'sms' %}
+<p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
+    sent.{% endblocktrans %}</p>
+{% endif %}
+{% else %}
+<p class="alert alert-warning" role="alert">{% blocktrans trimmed %}We've
+    encountered an issue with the selected authentication method. Please
+    go back and verify that you entered your information correctly, try
+    again, or use a different authentication method instead. If the issue
+    persists, contact the site administrator.{% endblocktrans %}</p>
+{% endif %}
+{% elif wizard.steps.current == 'yubikey' %}
+<p>{% blocktrans trimmed %}To identify and verify your YubiKey, please insert a
+    token in the field below. Your YubiKey will be linked to your
+    account.{% endblocktrans %}</p>
+{% endif %}
+
+<form action="" method="post">{% csrf_token %}
+    {% include "two_factor/_wizard_forms.html" %}
+
+    {# hidden submit button to enable [enter] key #}
+    <input type="submit" value="" hidden />
 
-    <form action="" method="post">{% csrf_token %}
-        {% include "two_factor/setup_wizard_token.html" %}
-        {% include "two_factor/_wizard_actions_enable_2fa.html" %}
-    </form>
+    {% include "two_factor/_wizard_actions.html" %}
+</form>
 {% endblock %}

portal/templates/two_factor/profile/disable.html

@@ -1,7 +1,7 @@
 {# Overriding the original "two_factor" template #}
 {% extends "two_factor/_base_focus.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block scripts %}