Update text content and account page headers

hypha/apply/users/templates/two_factor/core/backup_tokens.html

@@ -7,7 +7,7 @@
   <h1>{% block title %}{% trans "Backup Codes" %}{% endblock %}</h1>
   <p>{% blocktrans trimmed %}These codes should be kept in a safe,
       private place for when you need them. When they are used up,
-      you can generate a new set of backup codes{% endblocktrans %}</p>
+      you can generate a new set of backup codes.{% endblocktrans %}</p>
 
   {% if device.token_set.count %}
     <ul>

hypha/apply/users/templates/two_factor/core/backup_tokens_password.html

@@ -5,13 +5,13 @@
 <p><a href="{% url 'users:account'%}"
        class="btn btn-link">{% trans "Back to account" %}</a></p>
   <h1>{% block title %}{% trans "Backup Codes" %}{% endblock %}</h1>
-  <p>{% blocktrans trimmed %}Backup codes can be used when your primary and backup
-      phone numbers aren't available. The backup codes below can be used
-      for login verification.
+  <p>{% blocktrans trimmed %}If you loose your smartphone, or your Authenticator app is not available,
+      you can use a backup code along with your username and password to login until you recover your smartphone.
+      Each backup code can be used only once.
       </br>
-      If you've used up all your backup codes, you
-      can generate a new set of backup codes. Only the backup codes shown
-      below will be valid.{% endblocktrans %}</p>
+      </br>
+      These codes should be kept in a secure, private place for when you need them.
+      When they are used up, you can generate a new set of backup codes.{% endblocktrans %}</p>
 <div class="wrapper wrapper--small wrapper--inner-space-medium">
     <form class="form" action="" method="POST" novalidate>
         {% if form.non_field_errors %}

hypha/apply/users/templates/users/account.html

@@ -24,16 +24,16 @@
             {% endfor %}
             <button class="button button--primary" type="submit">{% trans "Update Profile" %}</button>
         </form>
-<!--    </div>-->
 
         {% if show_change_password and user.has_usable_password and not backends.associated %}
             <br>
             <hr>
-<!--        <div class="profile__column">-->
-            <h3>{% trans "Change password" %}</h3>
+        <div>
+            <h3>{% trans "Account Security" %}</h3>
+            <h4>{% trans "Password" %}</h4>
             <p><a class="button button--primary" href="{% url 'users:password_change' %}">{% trans "Update password" %}</a></p>
 
-            <h3>{% trans "Account security" %}</h3>
+            <h4>{% trans "Two-Factor Authentication (2FA)" %}</h4>
             {% if default_device %}
                 <div>
                     <p><a class="link link--button link--button--narrow" href="{% url 'users:backup_tokens_password' %}">{% trans "Show Codes" %}</a></p>
@@ -42,6 +42,7 @@
             {% else %}
                 <p><a class="link link--button link--button--narrow" href="{% url 'two_factor:setup' %}">{% trans "Enable 2FA" %}</a></p>
             {% endif %}
+        </div>
         {% endif %}
     </div>