Merge lp:~deadlight/canonical-identity-provider/misc-account into lp:~deadlight/canonical-identity-provider/vanilla
- misc-account
- Merge into vanilla
Proposed by
Karl Williams
| Status: | Merged |
|---|---|
| Merged at revision: | 1721 |
| Proposed branch: | lp:~deadlight/canonical-identity-provider/misc-account |
| Merge into: | lp:~deadlight/canonical-identity-provider/vanilla |
| Diff against target: |
530 lines (+170/-153) 11 files modified
src/webui/templates/account/account_deleted.html (+21/-19) src/webui/templates/account/confirm_email_invalidation.html (+18/-19) src/webui/templates/account/confirm_new_email.html (+14/-23) src/webui/templates/account/deactivated.html (+10/-6) src/webui/templates/account/delete_email.html (+14/-19) src/webui/templates/account/edit.html (+4/-2) src/webui/templates/account/invalidate_email.html (+16/-9) src/webui/templates/account/new_email.html (+23/-21) src/webui/templates/account/suspended.html (+10/-6) src/webui/templates/account/user_logged_out_no_valid_emails.html (+12/-8) src/webui/templates/device/generate-codes.html (+28/-21) |
| To merge this branch: | bzr merge lp:~deadlight/canonical-identity-provider/misc-account |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Anthony Dillon (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Updated the following small templates:
src/webui/
src/webui/
src/webui/
src/webui/
src/webui/
src/webui/
src/webui/
src/webui/
src/webui/
src/webui/
Also fixed the radio buttons on the main user details page.
To post a comment you must log in.
- 1720. By Karl Williams
-
Update notifcation and validation markup
Revision history for this message
| Anthony Dillon (ya-bo-ng) wrote : | # |
Looks good, thanks +1
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'src/webui/templates/account/account_deleted.html' | |||
| 2 | --- src/webui/templates/account/account_deleted.html 2013-11-05 14:09:37 +0000 | |||
| 3 | +++ src/webui/templates/account/account_deleted.html 2019-09-05 13:35:58 +0000 | |||
| 4 | @@ -1,33 +1,35 @@ | |||
| 6 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 7 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 8 | 3 | 3 | ||
| 9 | 4 | {% comment %} | 4 | {% comment %} |
| 11 | 5 | Copyright 2013 Canonical Ltd. This software is licensed under the | 5 | Copyright 2013-2019 Canonical Ltd. This software is licensed under the |
| 12 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 13 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 14 | 8 | 8 | ||
| 15 | 9 | {% block title %} | 9 | {% block title %} |
| 17 | 10 | {% blocktrans %}Account Deleted{% endblocktrans %} | 10 | {% blocktrans %}Account Deleted{% endblocktrans %} |
| 18 | 11 | {% endblock %} | 11 | {% endblock %} |
| 19 | 12 | 12 | ||
| 20 | 13 | {% block text_title %} | 13 | {% block text_title %} |
| 22 | 14 | <h1 class="main">{% trans "Account Deleted" %}</h1> | 14 | <h1>{% trans "Account Deleted" %}</h1> |
| 23 | 15 | {% endblock %} | 15 | {% endblock %} |
| 24 | 16 | 16 | ||
| 25 | 17 | {% block content %} | 17 | {% block content %} |
| 41 | 18 | <p>{% blocktrans %}Your Ubuntu One account has now been deleted. | 18 | <div class="row"> |
| 42 | 19 | All emails associated with the account have been removed. | 19 | <div class="col-8"> |
| 43 | 20 | You can sign up for a new account with any of those emails if you want. | 20 | <p>{% blocktrans %}Your Ubuntu One account has now been deleted. |
| 44 | 21 | {% endblocktrans %}</p> | 21 | All emails associated with the account have been removed. |
| 45 | 22 | 22 | You can sign up for a new account with any of those emails if you want. | |
| 46 | 23 | <p>{% blocktrans %}All authentication tokens associated with the account have | 23 | {% endblocktrans %}</p> |
| 47 | 24 | also been deleted. That means any apps using that account will have to login | 24 | <p>{% blocktrans %}All authentication tokens associated with the account have |
| 48 | 25 | again with a different account. | 25 | also been deleted. That means any apps using that account will have to login |
| 49 | 26 | {% endblocktrans %}</p> | 26 | again with a different account. |
| 50 | 27 | 27 | {% endblocktrans %}</p> | |
| 51 | 28 | <p>{% blocktrans %}The openid identifier associated with the account has | 28 | <p>{% blocktrans %}The openid identifier associated with the account has |
| 52 | 29 | been reserved so that it cannot be given out to anyone else. This is so that | 29 | been reserved so that it cannot be given out to anyone else. This is so that |
| 53 | 30 | no-one can impersonate you using openid. If you sign up for a new account | 30 | no-one can impersonate you using openid. If you sign up for a new account |
| 54 | 31 | you will have a different openid identifier. | 31 | you will have a different openid identifier. |
| 55 | 32 | {% endblocktrans %}</p> | 32 | {% endblocktrans %}</p> |
| 56 | 33 | </div> | ||
| 57 | 34 | </div> | ||
| 58 | 33 | {% endblock %} | 35 | {% endblock %} |
| 59 | 34 | 36 | ||
| 60 | === modified file 'src/webui/templates/account/confirm_email_invalidation.html' | |||
| 61 | --- src/webui/templates/account/confirm_email_invalidation.html 2018-09-07 16:32:46 +0000 | |||
| 62 | +++ src/webui/templates/account/confirm_email_invalidation.html 2019-09-05 13:35:58 +0000 | |||
| 63 | @@ -1,32 +1,31 @@ | |||
| 65 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 66 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 67 | 3 | 3 | ||
| 68 | 4 | {% comment %} | 4 | {% comment %} |
| 70 | 5 | Copyright 2010-2013 Canonical Ltd. This software is licensed under the | 5 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 71 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 72 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 73 | 8 | 8 | ||
| 74 | 9 | {% block title %}{% trans "Email invalidation" %}{% endblock %} | 9 | {% block title %}{% trans "Email invalidation" %}{% endblock %} |
| 75 | 10 | 10 | ||
| 77 | 11 | {% block text_title %}<h1 class="u1-h-main">{% trans "Email invalidation" %}</h1>{% endblock %} | 11 | {% block text_title %}<h1>{% trans "Email invalidation" %}</h1>{% endblock %} |
| 78 | 12 | 12 | ||
| 79 | 13 | {% block content %} | 13 | {% block content %} |
| 96 | 14 | 14 | <div class="row"> | |
| 97 | 15 | <div class="info"> | 15 | <div class="col-8"> |
| 98 | 16 | <p>{% blocktrans %}<strong>WARNING:</strong> Invalidating an e-mail address will prevent logging in to Ubuntu One using that address.{% endblocktrans %}</p> | 16 | <div class="p-notification--caution"> |
| 99 | 17 | <p>{% blocktrans %}If you intended to <em>validate</em> the address instead, please check the confirmation e-mail you received and click on the first URL to confirm the address.{% endblocktrans %}</p> | 17 | <p class="p-notification__response"> |
| 100 | 18 | <p>{% blocktrans %}Are you sure you want to <strong>invalidate</strong> the email address {{ email }}?{% endblocktrans %}</p> | 18 | {% blocktrans %}<span class="p-notification__status">WARNING:</span> Invalidating an e-mail address will prevent logging in to Ubuntu One using that address.{% endblocktrans %} |
| 101 | 19 | </div> | 19 | </p> |
| 102 | 20 | <div class="actions"> | 20 | </div> |
| 103 | 21 | <form action="" method="POST"> | 21 | <p>{% blocktrans %}If you intended to <em>validate</em> the address instead, please check the confirmation e-mail you received and click on the first URL to confirm the address.{% endblocktrans %}</p> |
| 104 | 22 | {% csrf_token %} | 22 | <p>{% blocktrans %}Are you sure you want to <strong>invalidate</strong> the email address {{ email }}?{% endblocktrans %}</p> |
| 105 | 23 | <p> | 23 | <form action="" method="POST"> |
| 106 | 24 | <button type="submit" class="btn cta" name="invalidate" data-qa-id="confirm_email_invalidation"> | 24 | {% csrf_token %} |
| 107 | 25 | <span>{% trans "Yes, invalidate" %}</span> | 25 | <button type="submit" class="p-button--negative" name="invalidate" data-qa-id="confirm_email_invalidation">{% trans "Yes, invalidate" %}</button> |
| 108 | 26 | </button> | 26 | {% include "common/cancel_link.html" %} |
| 109 | 27 | {% include "common/cancel_link.html" %} | 27 | </form> |
| 110 | 28 | </p> | 28 | </div> |
| 95 | 29 | </form> | ||
| 111 | 30 | </div> | 29 | </div> |
| 112 | 31 | 30 | ||
| 113 | 32 | {% endblock %} | 31 | {% endblock %} |
| 114 | 33 | 32 | ||
| 115 | === modified file 'src/webui/templates/account/confirm_new_email.html' | |||
| 116 | --- src/webui/templates/account/confirm_new_email.html 2016-12-02 21:16:07 +0000 | |||
| 117 | +++ src/webui/templates/account/confirm_new_email.html 2019-09-05 13:35:58 +0000 | |||
| 118 | @@ -1,8 +1,8 @@ | |||
| 120 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 121 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 122 | 3 | 3 | ||
| 123 | 4 | {% comment %} | 4 | {% comment %} |
| 125 | 5 | Copyright 2010 Canonical Ltd. This software is licensed under the | 5 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 126 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 127 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 128 | 8 | 8 | ||
| 129 | @@ -10,37 +10,28 @@ | |||
| 130 | 10 | 10 | ||
| 131 | 11 | {% block title %}{% trans "Complete email address validation" %}{% endblock %} | 11 | {% block title %}{% trans "Complete email address validation" %}{% endblock %} |
| 132 | 12 | 12 | ||
| 134 | 13 | {% block text_title %}<h1 class="u1-h-main">{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h1>{% endblock %} | 13 | {% block text_title %}<h1>{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h1>{% endblock %} |
| 135 | 14 | 14 | ||
| 136 | 15 | {% block content_id %}auth{% endblock %} | 15 | {% block content_id %}auth{% endblock %} |
| 137 | 16 | 16 | ||
| 138 | 17 | {% block content %} | 17 | {% block content %} |
| 142 | 18 | <p>{% blocktrans %}Are you sure you want to confirm and validate this email address?{% endblocktrans %}</p> | 18 | <div class="row"> |
| 143 | 19 | 19 | <p>{% blocktrans %}Are you sure you want to confirm and validate this email address?{% endblocktrans %}</p> | |
| 141 | 20 | <div class="actions"> | ||
| 144 | 21 | <form action="" method="post"> | 20 | <form action="" method="post"> |
| 145 | 22 | {% csrf_token %} | 21 | {% csrf_token %} |
| 146 | 23 | |||
| 147 | 24 | {% if captcha_required %} | 22 | {% if captcha_required %} |
| 148 | 25 | <p class="captcha" id="captcha"> | 23 | <p class="captcha" id="captcha"> |
| 155 | 26 | {% if captcha_error_message %} | 24 | {% if captcha_error_message %} |
| 156 | 27 | <span class="error"> | 25 | <span class="error"> |
| 157 | 28 | {{ captcha_error_message }} | 26 | {{ captcha_error_message }} |
| 158 | 29 | </span> | 27 | </span> |
| 159 | 30 | {% endif %} | 28 | {% endif %} |
| 160 | 31 | {% include "widgets/recaptcha-v2.html" %} | 29 | {% include "widgets/recaptcha-v2.html" %} |
| 161 | 32 | </p> | 30 | </p> |
| 162 | 33 | {% endif %} | 31 | {% endif %} |
| 171 | 34 | 32 | <input type="hidden" name="post" value="yes" /> | |
| 172 | 35 | <p> | 33 | <a class="p-button--base" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a> |
| 173 | 36 | <input type="hidden" name="post" value="yes" /> | 34 | <button type="submit" name="continue" class="p-button--positive" data-qa-id="confirm_email_validation">{% trans "Yes, I'm sure" %}</button> |
| 166 | 37 | <button type="submit" name="continue" class="btn cta" data-qa-id="confirm_email_validation"> | ||
| 167 | 38 | <span>{% trans "Yes, I'm sure" %}</span> | ||
| 168 | 39 | </button> | ||
| 169 | 40 | <a class="cta secondary" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a> | ||
| 170 | 41 | </p> | ||
| 174 | 42 | </form> | 35 | </form> |
| 175 | 43 | </div> | 36 | </div> |
| 176 | 44 | |||
| 177 | 45 | <br style="clear: both" /> | ||
| 178 | 46 | {% endblock %} | 37 | {% endblock %} |
| 179 | 47 | 38 | ||
| 180 | === modified file 'src/webui/templates/account/deactivated.html' | |||
| 181 | --- src/webui/templates/account/deactivated.html 2014-12-09 21:41:56 +0000 | |||
| 182 | +++ src/webui/templates/account/deactivated.html 2019-09-05 13:35:58 +0000 | |||
| 183 | @@ -2,18 +2,22 @@ | |||
| 184 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 185 | 3 | 3 | ||
| 186 | 4 | {% comment %} | 4 | {% comment %} |
| 188 | 5 | Copyright 2010 Canonical Ltd. This software is licensed under the | 5 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 189 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 190 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 191 | 8 | 8 | ||
| 192 | 9 | {% block title %}{% trans "Account deactivated" %}{% endblock %} | 9 | {% block title %}{% trans "Account deactivated" %}{% endblock %} |
| 193 | 10 | 10 | ||
| 195 | 11 | {% block text_title %}<h1 class="u1-h-main">{% trans "Account deactivated" %}</h1>{% endblock %} | 11 | {% block text_title %}<h1>{% trans "Account deactivated" %}</h1>{% endblock %} |
| 196 | 12 | 12 | ||
| 197 | 13 | {% block content %} | 13 | {% block content %} |
| 202 | 14 | <div> | 14 | <div class="row"> |
| 203 | 15 | <p> | 15 | <div class="col-8"> |
| 204 | 16 | {% blocktrans %}Your account has been deactivated.{% endblocktrans %} | 16 | <div class="p-notification--negative"> |
| 205 | 17 | </p> | 17 | <p class="p-notification__response"> |
| 206 | 18 | {% blocktrans %}Your account has been deactivated.{% endblocktrans %} | ||
| 207 | 19 | </p> | ||
| 208 | 20 | </div> | ||
| 209 | 21 | </div> | ||
| 210 | 18 | </div> | 22 | </div> |
| 211 | 19 | {% endblock %} | 23 | {% endblock %} |
| 212 | 20 | 24 | ||
| 213 | === modified file 'src/webui/templates/account/delete_email.html' | |||
| 214 | --- src/webui/templates/account/delete_email.html 2014-12-09 21:41:56 +0000 | |||
| 215 | +++ src/webui/templates/account/delete_email.html 2019-09-05 13:35:58 +0000 | |||
| 216 | @@ -1,35 +1,30 @@ | |||
| 218 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 219 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 220 | 3 | 3 | ||
| 221 | 4 | {% comment %} | 4 | {% comment %} |
| 223 | 5 | Copyright 2013 Canonical Ltd. This software is licensed under the | 5 | Copyright 2013-2019 Canonical Ltd. This software is licensed under the |
| 224 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 225 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 226 | 8 | 8 | ||
| 227 | 9 | {% block html_extra %}data-qa-id="delete_email"{% endblock %} | 9 | {% block html_extra %}data-qa-id="delete_email"{% endblock %} |
| 228 | 10 | 10 | ||
| 229 | 11 | {% block title %} | 11 | {% block title %} |
| 231 | 12 | {% trans "Delete unverified email" %} | 12 | {% trans "Delete unverified email" %} |
| 232 | 13 | {% endblock %} | 13 | {% endblock %} |
| 233 | 14 | 14 | ||
| 235 | 15 | {% block text_title %}<h1 class="u1-h-main">{% blocktrans %}Delete {{ email }}?{% endblocktrans %}</h1>{% endblock %} | 15 | {% block text_title %}<h1>{% blocktrans %}Delete {{ email }}?{% endblocktrans %}</h1>{% endblock %} |
| 236 | 16 | 16 | ||
| 237 | 17 | {% block content_id %}auth{% endblock %} | 17 | {% block content_id %}auth{% endblock %} |
| 238 | 18 | 18 | ||
| 239 | 19 | {% block content %} | 19 | {% block content %} |
| 255 | 20 | <div class="info"> | 20 | <div class="row"> |
| 256 | 21 | <p>{% blocktrans %}Are you sure you want to delete this email address?{% endblocktrans %}</p> | 21 | <div class="col-8"> |
| 257 | 22 | </div> | 22 | <p>{% blocktrans %}Are you sure you want to delete this email address?{% endblocktrans %}</p> |
| 258 | 23 | <div class="actions"> | 23 | <form action="" method="POST"> |
| 259 | 24 | <form action="" method="POST"> | 24 | {% csrf_token %} |
| 260 | 25 | {% csrf_token %} | 25 | <button type="submit" class="p-button--negative" name="delete" data-qa-id="confirm_delete_email">{% trans "Yes, delete" %}</button> |
| 261 | 26 | <p> | 26 | {% include "common/cancel_link.html" %} |
| 262 | 27 | <button type="submit" class="btn cta" name="delete" data-qa-id="confirm_delete_email"> | 27 | </form> |
| 263 | 28 | <span>{% trans "Yes, delete" %}</span> | 28 | </div> |
| 264 | 29 | </button> | 29 | </div> |
| 250 | 30 | {% include "common/cancel_link.html" %} | ||
| 251 | 31 | </p> | ||
| 252 | 32 | </form> | ||
| 253 | 33 | </div> | ||
| 254 | 34 | <br style="clear: both" /> | ||
| 265 | 35 | {% endblock %} | 30 | {% endblock %} |
| 266 | 36 | 31 | ||
| 267 | === modified file 'src/webui/templates/account/edit.html' | |||
| 268 | --- src/webui/templates/account/edit.html 2019-08-21 16:06:42 +0000 | |||
| 269 | +++ src/webui/templates/account/edit.html 2019-09-05 13:35:58 +0000 | |||
| 270 | @@ -107,9 +107,11 @@ | |||
| 271 | 107 | <div class="p-strip is-shallow"> | 107 | <div class="p-strip is-shallow"> |
| 272 | 108 | <hr> | 108 | <hr> |
| 273 | 109 | </div> | 109 | </div> |
| 275 | 110 | <h4 class="legend" data-qa-id="authentication_devices">{% trans "Authentication devices" %}</h4> | 110 | |
| 276 | 111 | <div class="p-form-validation{% if form.twofactor_required.errors %} is-errors{% endif %}"> | 111 | <div class="p-form-validation{% if form.twofactor_required.errors %} is-errors{% endif %}"> |
| 278 | 112 | {{ form.twofactor_required }} | 112 | <h4 class="legend" data-qa-id="authentication_devices">{% trans "Authentication devices" %}</h4> |
| 279 | 113 | <input type="radio" name="twofactor_required" value="True" {% if form.twofactor_required.value == True %}checked{% endif %} id="id_twofactor_required_0"><label for="id_twofactor_required_0">Always require an authentication device</label> | ||
| 280 | 114 | <input type="radio" name="twofactor_required" value="False" id="id_twofactor_required_1" {% if form.twofactor_required.value == False %}checked{% endif %}><label for="id_twofactor_required_1">Require only when logging in to sites that request it</label> | ||
| 281 | 113 | {% if form.twofactor_required.errors %} | 115 | {% if form.twofactor_required.errors %} |
| 282 | 114 | <p class="p-form-validation__message"> | 116 | <p class="p-form-validation__message"> |
| 283 | 115 | <strong>Error:</strong> {{ form.twofactor_required.errors|first }} | 117 | <strong>Error:</strong> {{ form.twofactor_required.errors|first }} |
| 284 | 116 | 118 | ||
| 285 | === modified file 'src/webui/templates/account/invalidate_email.html' | |||
| 286 | --- src/webui/templates/account/invalidate_email.html 2014-12-09 21:41:56 +0000 | |||
| 287 | +++ src/webui/templates/account/invalidate_email.html 2019-09-05 13:35:58 +0000 | |||
| 288 | @@ -1,20 +1,27 @@ | |||
| 290 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 291 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 292 | 3 | 3 | ||
| 293 | 4 | {% comment %} | 4 | {% comment %} |
| 295 | 5 | Copyright 2010-2013 Canonical Ltd. This software is licensed under the | 5 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 296 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 297 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 298 | 8 | 8 | ||
| 299 | 9 | {% block title %}{% trans "Email invalidated" %}{% endblock %} | 9 | {% block title %}{% trans "Email invalidated" %}{% endblock %} |
| 300 | 10 | 10 | ||
| 302 | 11 | {% block text_title %}<h1 class="u1-h-main">{% trans "Email invalidated" %}</h1>{% endblock %} | 11 | {% block text_title %}<h1>{% trans "Email invalidated" %}</h1>{% endblock %} |
| 303 | 12 | 12 | ||
| 304 | 13 | {% block content %} | 13 | {% block content %} |
| 311 | 14 | <p>{% blocktrans %} | 14 | <div class="row"> |
| 312 | 15 | The email {{ email }} was successfully invalidated in our system. | 15 | <div class="p-notification" id="notification"> |
| 313 | 16 | {% endblocktrans %}</p> | 16 | <p class="p-notification__response"> |
| 314 | 17 | <p>{% blocktrans %} | 17 | {% blocktrans %} |
| 315 | 18 | Thank you for helping us provide a better service! | 18 | The email {{ email }} was successfully invalidated in our system. |
| 316 | 19 | {% endblocktrans %}</p> | 19 | {% endblocktrans %} |
| 317 | 20 | </p> | ||
| 318 | 21 | <button class="p-icon--close" aria-label="Close notification" onclick="closeNotification('notification')">Close</button> | ||
| 319 | 22 | </div> | ||
| 320 | 23 | <p>{% blocktrans %} | ||
| 321 | 24 | Thank you for helping us provide a better service! | ||
| 322 | 25 | {% endblocktrans %}</p> | ||
| 323 | 26 | </div> | ||
| 324 | 20 | {% endblock %} | 27 | {% endblock %} |
| 325 | 21 | 28 | ||
| 326 | === modified file 'src/webui/templates/account/new_email.html' | |||
| 327 | --- src/webui/templates/account/new_email.html 2014-12-09 21:41:56 +0000 | |||
| 328 | +++ src/webui/templates/account/new_email.html 2019-09-05 13:35:58 +0000 | |||
| 329 | @@ -1,37 +1,39 @@ | |||
| 331 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 332 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 333 | 3 | 3 | ||
| 334 | 4 | {% comment %} | 4 | {% comment %} |
| 336 | 5 | Copyright 2010 Canonical Ltd. This software is licensed under the | 5 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 337 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 338 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 339 | 8 | 8 | ||
| 340 | 9 | {% block title %}{% trans "Add an email" %}{% endblock %} | 9 | {% block title %}{% trans "Add an email" %}{% endblock %} |
| 341 | 10 | 10 | ||
| 343 | 11 | {% block text_title %}<h1 class="u1-h-main">{% trans "Add an email address to your account" %}</h1>{% endblock %} | 11 | {% block text_title %}<h1>{% trans "Add an email address to your account" %}</h1>{% endblock %} |
| 344 | 12 | 12 | ||
| 345 | 13 | {% block content_id %}auth{% endblock %} | 13 | {% block content_id %}auth{% endblock %} |
| 346 | 14 | 14 | ||
| 347 | 15 | {% block content %} | 15 | {% block content %} |
| 348 | 16 | <div class="row"> | ||
| 349 | 17 | <div class="col-8"> | ||
| 350 | 16 | <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p> | 18 | <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p> |
| 351 | 17 | |||
| 352 | 18 | <form action="{% url 'new_email' %}" method="post" name="newemailform"> | 19 | <form action="{% url 'new_email' %}" method="post" name="newemailform"> |
| 367 | 19 | {% csrf_token %} | 20 | {% csrf_token %} |
| 368 | 20 | <p class="input-row{% if form.newemail.errors %} haserrors{% endif %}"> | 21 | <div class="p-form-validation{% if form.newemail.errors %} is-error{% endif %}"> |
| 369 | 21 | <label for="id_newemail">{% trans "Email address" %}</label> | 22 | <label for="id_newemail">{% trans "Email address" %}</label> |
| 370 | 22 | {{ form.newemail }} | 23 | {{ form.newemail }} |
| 371 | 23 | {% if form.newemail.errors %} | 24 | {% if form.newemail.errors %} |
| 372 | 24 | <span class="error">{{ form.newemail.errors|first }}</span> | 25 | <p class="p-form-validation__message" id="input-error-message-inline" role="alert"> |
| 373 | 25 | {% endif %} | 26 | <strong>Error:</strong> {{ form.newemail.errors|first }} |
| 374 | 26 | </p> | 27 | </p> |
| 375 | 27 | <p class="actions"> | 28 | {% endif %} |
| 376 | 28 | <button type="submit" class="btn cta" name="continue" data-qa-id="send_instructions_confirm_email"> | 29 | </div> |
| 377 | 29 | <span>{% trans "Send instructions" %}</span> | 30 | <a class="p-button--base" href="/">{% trans "Cancel" %}</a> |
| 378 | 30 | </button> | 31 | <button type="submit" class="p-button--positive" name="continue" data-qa-id="send_instructions_confirm_email">{% trans "Send instructions" %}</button> |
| 365 | 31 | <a class="cta secondary" href=".">{% trans "Cancel" %}</a> | ||
| 366 | 32 | </p> | ||
| 379 | 33 | </form> | 32 | </form> |
| 383 | 34 | <script type="text/javascript"> | 33 | </div> |
| 384 | 35 | document.newemailform.newemail.focus(); | 34 | </div> |
| 385 | 36 | </script> | 35 | |
| 386 | 36 | <script type="text/javascript"> | ||
| 387 | 37 | document.newemailform.newemail.focus(); | ||
| 388 | 38 | </script> | ||
| 389 | 37 | {% endblock %} | 39 | {% endblock %} |
| 390 | 38 | 40 | ||
| 391 | === modified file 'src/webui/templates/account/suspended.html' | |||
| 392 | --- src/webui/templates/account/suspended.html 2014-12-09 21:41:56 +0000 | |||
| 393 | +++ src/webui/templates/account/suspended.html 2019-09-05 13:35:58 +0000 | |||
| 394 | @@ -2,7 +2,7 @@ | |||
| 395 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 396 | 3 | 3 | ||
| 397 | 4 | {% comment %} | 4 | {% comment %} |
| 399 | 5 | Copyright 2010 Canonical Ltd. This software is licensed under the | 5 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 400 | 6 | GNU Affero General Public License version 3 (see the file LICENSE). | 6 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 401 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 402 | 8 | 8 | ||
| 403 | @@ -10,12 +10,16 @@ | |||
| 404 | 10 | 10 | ||
| 405 | 11 | {% block title %}{% trans "Account suspended" %}{% endblock %} | 11 | {% block title %}{% trans "Account suspended" %}{% endblock %} |
| 406 | 12 | 12 | ||
| 408 | 13 | {% block text_title %}<h1 class="u1-h-main">{% trans "Account suspended" %}</h1>{% endblock %} | 13 | {% block text_title %}<h1>{% trans "Account suspended" %}</h1>{% endblock %} |
| 409 | 14 | 14 | ||
| 410 | 15 | {% block content %} | 15 | {% block content %} |
| 415 | 16 | <div> | 16 | <div class="row"> |
| 416 | 17 | <p> | 17 | <div class="col-8"> |
| 417 | 18 | {% blocktrans %}Your account has been suspended.{% endblocktrans %} | 18 | <div class="p-notification--negative"> |
| 418 | 19 | </p> | 19 | <p class="p-notification__response"> |
| 419 | 20 | {% blocktrans %}Your account has been suspended.{% endblocktrans %} | ||
| 420 | 21 | </p> | ||
| 421 | 22 | </div> | ||
| 422 | 23 | </div> | ||
| 423 | 20 | </div> | 24 | </div> |
| 424 | 21 | {% endblock %} | 25 | {% endblock %} |
| 425 | 22 | 26 | ||
| 426 | === modified file 'src/webui/templates/account/user_logged_out_no_valid_emails.html' | |||
| 427 | --- src/webui/templates/account/user_logged_out_no_valid_emails.html 2014-12-09 21:41:56 +0000 | |||
| 428 | +++ src/webui/templates/account/user_logged_out_no_valid_emails.html 2019-09-05 13:35:58 +0000 | |||
| 429 | @@ -1,21 +1,25 @@ | |||
| 431 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 432 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 433 | 3 | {% load static_url %} | 3 | {% load static_url %} |
| 434 | 4 | 4 | ||
| 435 | 5 | {% comment %} | 5 | {% comment %} |
| 437 | 6 | Copyright 2010-2013 Canonical Ltd. This software is licensed under the | 6 | Copyright 2010-2019 Canonical Ltd. This software is licensed under the |
| 438 | 7 | GNU Affero General Public License version 3 (see the file LICENSE). | 7 | GNU Affero General Public License version 3 (see the file LICENSE). |
| 439 | 8 | {% endcomment %} | 8 | {% endcomment %} |
| 440 | 9 | 9 | ||
| 441 | 10 | {% block title %}{% trans "Your account does not have a valid email address" %}{% endblock %} | 10 | {% block title %}{% trans "Your account does not have a valid email address" %}{% endblock %} |
| 442 | 11 | 11 | ||
| 444 | 12 | {% block text_title %}<h1 class="u1-h-main">{% trans "Your account does not have a valid email address" %}</h1>{% endblock %} | 12 | {% block text_title %}<h1>{% trans "Your account does not have a valid email address" %}</h1>{% endblock %} |
| 445 | 13 | 13 | ||
| 446 | 14 | {% block content %} | 14 | {% block content %} |
| 452 | 15 | <p>{% blocktrans %} | 15 | <div class="row"> |
| 453 | 16 | You have no valid email addresses linked to your account, so it was deactivated. | 16 | <div class="col-8"> |
| 454 | 17 | To reactivate the account please contact our support team at:{% endblocktrans %} | 17 | <p>{% blocktrans %} |
| 455 | 18 | <a href="{{ 'support_form'|static_url }}">{{ 'support_form'|static_url }}</a> | 18 | You have no valid email addresses linked to your account, so it was deactivated. |
| 456 | 19 | </p> | 19 | To reactivate the account please contact our support team at:{% endblocktrans %} |
| 457 | 20 | <a href="{{ 'support_form'|static_url }}">{{ 'support_form'|static_url }}</a> | ||
| 458 | 21 | </p> | ||
| 459 | 22 | </div> | ||
| 460 | 23 | </div> | ||
| 461 | 20 | 24 | ||
| 462 | 21 | {% endblock %} | 25 | {% endblock %} |
| 463 | 22 | 26 | ||
| 464 | === modified file 'src/webui/templates/device/generate-codes.html' | |||
| 465 | --- src/webui/templates/device/generate-codes.html 2013-06-12 16:20:01 +0000 | |||
| 466 | +++ src/webui/templates/device/generate-codes.html 2019-09-05 13:35:58 +0000 | |||
| 467 | @@ -1,8 +1,8 @@ | |||
| 469 | 1 | {% extends "base.html" %} | 1 | {% extends "vanilla/base.html" %} |
| 470 | 2 | {% load i18n %} | 2 | {% load i18n %} |
| 471 | 3 | 3 | ||
| 472 | 4 | {% comment %} | 4 | {% comment %} |
| 474 | 5 | Copyright 2012 Canonical Ltd. This software is licensed under the GNU | 5 | Copyright 2012-2019 Canonical Ltd. This software is licensed under the GNU |
| 475 | 6 | Affero General Public License version 3 (see the file LICENSE). | 6 | Affero General Public License version 3 (see the file LICENSE). |
| 476 | 7 | {% endcomment %} | 7 | {% endcomment %} |
| 477 | 8 | 8 | ||
| 478 | @@ -14,26 +14,33 @@ | |||
| 479 | 14 | 14 | ||
| 480 | 15 | 15 | ||
| 481 | 16 | {% block text_title %} | 16 | {% block text_title %} |
| 483 | 17 | <h1 class="main">{% trans "Generate new codes" %}</h1> | 17 | <h1>{% trans "Generate new codes" %}</h1> |
| 484 | 18 | {% endblock %} | 18 | {% endblock %} |
| 485 | 19 | 19 | ||
| 486 | 20 | {% block content %} | 20 | {% block content %} |
| 505 | 21 | 21 | <div class="row"> | |
| 506 | 22 | <h3>{% blocktrans %} | 22 | <div class="col-8"> |
| 507 | 23 | Confirming the new codes will <strong>invalidate</strong> all the previous codes.<br/> | 23 | <div class="p-notification--warning"> |
| 508 | 24 | Please print this new list and <strong>destroy any old lists</strong>. | 24 | <p class="p-notification__response"> |
| 509 | 25 | {% endblocktrans %}</h3> | 25 | {% blocktrans %} |
| 510 | 26 | 26 | Confirming the new codes will <strong>invalidate</strong> all the previous codes.<br/> | |
| 511 | 27 | {% include 'device/code-list.html' %} | 27 | Please print this new list and <strong>destroy any old lists</strong>. |
| 512 | 28 | 28 | {% endblocktrans %} | |
| 513 | 29 | <form method="post"> | 29 | </p> |
| 514 | 30 | {% csrf_token %} | 30 | </div> |
| 515 | 31 | <p> | 31 | |
| 516 | 32 | <button class="btn" type="submit" data-qa-id="confirm_new_codes"> | 32 | <hr> |
| 517 | 33 | <span><span>{% trans "Confirm new codes" %}</span></span> | 33 | |
| 518 | 34 | </button> | 34 | {% include 'device/code-list.html' %} |
| 519 | 35 | {% trans "or" %} | 35 | |
| 520 | 36 | <a href="{% url 'device-print' device_id %}" data-qa-id="cancel_new_codes">{% trans "cancel" %}</a> | 36 | <hr> |
| 521 | 37 | </p> | 37 | |
| 522 | 38 | </form> | 38 | <form method="post"> |
| 523 | 39 | {% csrf_token %} | ||
| 524 | 40 | <button class="p-button--positive" type="submit" data-qa-id="confirm_new_codes">{% trans "Confirm new codes" %}</button> | ||
| 525 | 41 | {% trans "or" %} | ||
| 526 | 42 | <a href="{% url 'device-print' device_id %}" data-qa-id="cancel_new_codes">{% trans "cancel" %}</a> | ||
| 527 | 43 | </form> | ||
| 528 | 44 | </div> | ||
| 529 | 45 | </div> | ||
| 530 | 39 | {% endblock %} | 46 | {% endblock %} |
Few comments in the code