Merge lp:~deadlight/canonical-identity-provider/misc-account into lp:~deadlight/canonical-identity-provider/vanilla

Proposed by Karl Williams on 2019-09-05
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
Reviewer Review Type Date Requested Status
Anthony Dillon (community) 2019-09-05 Approve on 2019-09-06
Review via email: mp+372325@code.launchpad.net

Description of the change

Updated the following small templates:
 src/webui/templates/account/invalidate_email.html
src/webui/templates/account/delete_email.html
src/webui/templates/account/new_email.html
src/webui/templates/account/account_deleted.html
src/webui/templates/account/user_logged_out_no_valid_emails.html
src/webui/templates/account/suspended.html
src/webui/templates/account/deactivated.html
src/webui/templates/account/confirm_new_email.html
src/webui/templates/account/confirm_email_invalidation.html
src/webui/templates/device/generate-codes.html

Also fixed the radio buttons on the main user details page.

To post a comment you must log in.
Anthony Dillon (ya-bo-ng) wrote :

Few comments in the code

review: Needs Fixing
1720. By Karl Williams on 2019-09-05

Update notifcation and validation markup

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 @@
5-{% extends "base.html" %}
6+{% extends "vanilla/base.html" %}
7 {% load i18n %}
8
9 {% comment %}
10-Copyright 2013 Canonical Ltd. This software is licensed under the
11+Copyright 2013-2019 Canonical Ltd. This software is licensed under the
12 GNU Affero General Public License version 3 (see the file LICENSE).
13 {% endcomment %}
14
15 {% block title %}
16- {% blocktrans %}Account Deleted{% endblocktrans %}
17+ {% blocktrans %}Account Deleted{% endblocktrans %}
18 {% endblock %}
19
20 {% block text_title %}
21- <h1 class="main">{% trans "Account Deleted" %}</h1>
22+ <h1>{% trans "Account Deleted" %}</h1>
23 {% endblock %}
24
25 {% block content %}
26-<p>{% blocktrans %}Your Ubuntu One account has now been deleted.
27-All emails associated with the account have been removed.
28-You can sign up for a new account with any of those emails if you want.
29-{% endblocktrans %}</p>
30-
31-<p>{% blocktrans %}All authentication tokens associated with the account have
32-also been deleted. That means any apps using that account will have to login
33-again with a different account.
34-{% endblocktrans %}</p>
35-
36-<p>{% blocktrans %}The openid identifier associated with the account has
37-been reserved so that it cannot be given out to anyone else. This is so that
38-no-one can impersonate you using openid. If you sign up for a new account
39-you will have a different openid identifier.
40-{% endblocktrans %}</p>
41+ <div class="row">
42+ <div class="col-8">
43+ <p>{% blocktrans %}Your Ubuntu One account has now been deleted.
44+ All emails associated with the account have been removed.
45+ You can sign up for a new account with any of those emails if you want.
46+ {% endblocktrans %}</p>
47+ <p>{% blocktrans %}All authentication tokens associated with the account have
48+ also been deleted. That means any apps using that account will have to login
49+ again with a different account.
50+ {% endblocktrans %}</p>
51+ <p>{% blocktrans %}The openid identifier associated with the account has
52+ been reserved so that it cannot be given out to anyone else. This is so that
53+ no-one can impersonate you using openid. If you sign up for a new account
54+ you will have a different openid identifier.
55+ {% endblocktrans %}</p>
56+ </div>
57+ </div>
58 {% endblock %}
59
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 @@
64-{% extends "base.html" %}
65+{% extends "vanilla/base.html" %}
66 {% load i18n %}
67
68 {% comment %}
69-Copyright 2010-2013 Canonical Ltd. This software is licensed under the
70+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
71 GNU Affero General Public License version 3 (see the file LICENSE).
72 {% endcomment %}
73
74 {% block title %}{% trans "Email invalidation" %}{% endblock %}
75
76-{% block text_title %}<h1 class="u1-h-main">{% trans "Email invalidation" %}</h1>{% endblock %}
77+{% block text_title %}<h1>{% trans "Email invalidation" %}</h1>{% endblock %}
78
79 {% block content %}
80-
81-<div class="info">
82- <p>{% blocktrans %}<strong>WARNING:</strong> Invalidating an e-mail address will prevent logging in to Ubuntu One using that address.{% endblocktrans %}</p>
83- <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>
84- <p>{% blocktrans %}Are you sure you want to <strong>invalidate</strong> the email address {{ email }}?{% endblocktrans %}</p>
85-</div>
86-<div class="actions">
87- <form action="" method="POST">
88- {% csrf_token %}
89- <p>
90- <button type="submit" class="btn cta" name="invalidate" data-qa-id="confirm_email_invalidation">
91- <span>{% trans "Yes, invalidate" %}</span>
92- </button>
93- {% include "common/cancel_link.html" %}
94-</p>
95-</form>
96+<div class="row">
97+ <div class="col-8">
98+ <div class="p-notification--caution">
99+ <p class="p-notification__response">
100+ {% 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+ </p>
102+ </div>
103+ <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+ <p>{% blocktrans %}Are you sure you want to <strong>invalidate</strong> the email address {{ email }}?{% endblocktrans %}</p>
105+ <form action="" method="POST">
106+ {% csrf_token %}
107+ <button type="submit" class="p-button--negative" name="invalidate" data-qa-id="confirm_email_invalidation">{% trans "Yes, invalidate" %}</button>
108+ {% include "common/cancel_link.html" %}
109+ </form>
110+ </div>
111 </div>
112
113 {% endblock %}
114
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 @@
119-{% extends "base.html" %}
120+{% extends "vanilla/base.html" %}
121 {% load i18n %}
122
123 {% comment %}
124-Copyright 2010 Canonical Ltd. This software is licensed under the
125+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
126 GNU Affero General Public License version 3 (see the file LICENSE).
127 {% endcomment %}
128
129@@ -10,37 +10,28 @@
130
131 {% block title %}{% trans "Complete email address validation" %}{% endblock %}
132
133-{% block text_title %}<h1 class="u1-h-main">{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h1>{% endblock %}
134+{% block text_title %}<h1>{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h1>{% endblock %}
135
136 {% block content_id %}auth{% endblock %}
137
138 {% block content %}
139-<p>{% blocktrans %}Are you sure you want to confirm and validate this email address?{% endblocktrans %}</p>
140-
141-<div class="actions">
142+<div class="row">
143+ <p>{% blocktrans %}Are you sure you want to confirm and validate this email address?{% endblocktrans %}</p>
144 <form action="" method="post">
145 {% csrf_token %}
146-
147 {% if captcha_required %}
148 <p class="captcha" id="captcha">
149- {% if captcha_error_message %}
150- <span class="error">
151- {{ captcha_error_message }}
152- </span>
153- {% endif %}
154- {% include "widgets/recaptcha-v2.html" %}
155+ {% if captcha_error_message %}
156+ <span class="error">
157+ {{ captcha_error_message }}
158+ </span>
159+ {% endif %}
160+ {% include "widgets/recaptcha-v2.html" %}
161 </p>
162 {% endif %}
163-
164- <p>
165- <input type="hidden" name="post" value="yes" />
166- <button type="submit" name="continue" class="btn cta" data-qa-id="confirm_email_validation">
167- <span>{% trans "Yes, I'm sure" %}</span>
168- </button>
169- <a class="cta secondary" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a>
170- </p>
171+ <input type="hidden" name="post" value="yes" />
172+ <a class="p-button--base" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a>
173+ <button type="submit" name="continue" class="p-button--positive" data-qa-id="confirm_email_validation">{% trans "Yes, I'm sure" %}</button>
174 </form>
175 </div>
176-
177-<br style="clear: both" />
178 {% endblock %}
179
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 {% load i18n %}
185
186 {% comment %}
187-Copyright 2010 Canonical Ltd. This software is licensed under the
188+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
189 GNU Affero General Public License version 3 (see the file LICENSE).
190 {% endcomment %}
191
192 {% block title %}{% trans "Account deactivated" %}{% endblock %}
193
194-{% block text_title %}<h1 class="u1-h-main">{% trans "Account deactivated" %}</h1>{% endblock %}
195+{% block text_title %}<h1>{% trans "Account deactivated" %}</h1>{% endblock %}
196
197 {% block content %}
198-<div>
199- <p>
200- {% blocktrans %}Your account has been deactivated.{% endblocktrans %}
201- </p>
202+<div class="row">
203+ <div class="col-8">
204+ <div class="p-notification--negative">
205+ <p class="p-notification__response">
206+ {% blocktrans %}Your account has been deactivated.{% endblocktrans %}
207+ </p>
208+ </div>
209+ </div>
210 </div>
211 {% endblock %}
212
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 @@
217-{% extends "base.html" %}
218+{% extends "vanilla/base.html" %}
219 {% load i18n %}
220
221 {% comment %}
222-Copyright 2013 Canonical Ltd. This software is licensed under the
223+Copyright 2013-2019 Canonical Ltd. This software is licensed under the
224 GNU Affero General Public License version 3 (see the file LICENSE).
225 {% endcomment %}
226
227 {% block html_extra %}data-qa-id="delete_email"{% endblock %}
228
229 {% block title %}
230- {% trans "Delete unverified email" %}
231+ {% trans "Delete unverified email" %}
232 {% endblock %}
233
234-{% block text_title %}<h1 class="u1-h-main">{% blocktrans %}Delete {{ email }}?{% endblocktrans %}</h1>{% endblock %}
235+{% block text_title %}<h1>{% blocktrans %}Delete {{ email }}?{% endblocktrans %}</h1>{% endblock %}
236
237 {% block content_id %}auth{% endblock %}
238
239 {% block content %}
240- <div class="info">
241- <p>{% blocktrans %}Are you sure you want to delete this email address?{% endblocktrans %}</p>
242- </div>
243- <div class="actions">
244- <form action="" method="POST">
245- {% csrf_token %}
246- <p>
247- <button type="submit" class="btn cta" name="delete" data-qa-id="confirm_delete_email">
248- <span>{% trans "Yes, delete" %}</span>
249- </button>
250- {% include "common/cancel_link.html" %}
251- </p>
252- </form>
253- </div>
254- <br style="clear: both" />
255+ <div class="row">
256+ <div class="col-8">
257+ <p>{% blocktrans %}Are you sure you want to delete this email address?{% endblocktrans %}</p>
258+ <form action="" method="POST">
259+ {% csrf_token %}
260+ <button type="submit" class="p-button--negative" name="delete" data-qa-id="confirm_delete_email">{% trans "Yes, delete" %}</button>
261+ {% include "common/cancel_link.html" %}
262+ </form>
263+ </div>
264+ </div>
265 {% endblock %}
266
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 <div class="p-strip is-shallow">
272 <hr>
273 </div>
274- <h4 class="legend" data-qa-id="authentication_devices">{% trans "Authentication devices" %}</h4>
275+
276 <div class="p-form-validation{% if form.twofactor_required.errors %} is-errors{% endif %}">
277- {{ form.twofactor_required }}
278+ <h4 class="legend" data-qa-id="authentication_devices">{% trans "Authentication devices" %}</h4>
279+ <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+ <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 {% if form.twofactor_required.errors %}
282 <p class="p-form-validation__message">
283 <strong>Error:</strong> {{ form.twofactor_required.errors|first }}
284
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 @@
289-{% extends "base.html" %}
290+{% extends "vanilla/base.html" %}
291 {% load i18n %}
292
293 {% comment %}
294-Copyright 2010-2013 Canonical Ltd. This software is licensed under the
295+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
296 GNU Affero General Public License version 3 (see the file LICENSE).
297 {% endcomment %}
298
299 {% block title %}{% trans "Email invalidated" %}{% endblock %}
300
301-{% block text_title %}<h1 class="u1-h-main">{% trans "Email invalidated" %}</h1>{% endblock %}
302+{% block text_title %}<h1>{% trans "Email invalidated" %}</h1>{% endblock %}
303
304 {% block content %}
305-<p>{% blocktrans %}
306-The email {{ email }} was successfully invalidated in our system.
307-{% endblocktrans %}</p>
308-<p>{% blocktrans %}
309-Thank you for helping us provide a better service!
310-{% endblocktrans %}</p>
311+ <div class="row">
312+ <div class="p-notification" id="notification">
313+ <p class="p-notification__response">
314+ {% blocktrans %}
315+ The email {{ email }} was successfully invalidated in our system.
316+ {% endblocktrans %}
317+ </p>
318+ <button class="p-icon--close" aria-label="Close notification" onclick="closeNotification('notification')">Close</button>
319+ </div>
320+ <p>{% blocktrans %}
321+ Thank you for helping us provide a better service!
322+ {% endblocktrans %}</p>
323+ </div>
324 {% endblock %}
325
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 @@
330-{% extends "base.html" %}
331+{% extends "vanilla/base.html" %}
332 {% load i18n %}
333
334 {% comment %}
335-Copyright 2010 Canonical Ltd. This software is licensed under the
336+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
337 GNU Affero General Public License version 3 (see the file LICENSE).
338 {% endcomment %}
339
340 {% block title %}{% trans "Add an email" %}{% endblock %}
341
342-{% block text_title %}<h1 class="u1-h-main">{% trans "Add an email address to your account" %}</h1>{% endblock %}
343+{% block text_title %}<h1>{% trans "Add an email address to your account" %}</h1>{% endblock %}
344
345 {% block content_id %}auth{% endblock %}
346
347 {% block content %}
348+<div class="row">
349+ <div class="col-8">
350 <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p>
351-
352 <form action="{% url 'new_email' %}" method="post" name="newemailform">
353- {% csrf_token %}
354- <p class="input-row{% if form.newemail.errors %} haserrors{% endif %}">
355- <label for="id_newemail">{% trans "Email address" %}</label>
356- {{ form.newemail }}
357- {% if form.newemail.errors %}
358- <span class="error">{{ form.newemail.errors|first }}</span>
359- {% endif %}
360- </p>
361- <p class="actions">
362- <button type="submit" class="btn cta" name="continue" data-qa-id="send_instructions_confirm_email">
363- <span>{% trans "Send instructions" %}</span>
364- </button>
365- <a class="cta secondary" href=".">{% trans "Cancel" %}</a>
366- </p>
367+ {% csrf_token %}
368+ <div class="p-form-validation{% if form.newemail.errors %} is-error{% endif %}">
369+ <label for="id_newemail">{% trans "Email address" %}</label>
370+ {{ form.newemail }}
371+ {% if form.newemail.errors %}
372+ <p class="p-form-validation__message" id="input-error-message-inline" role="alert">
373+ <strong>Error:</strong> {{ form.newemail.errors|first }}
374+ </p>
375+ {% endif %}
376+ </div>
377+ <a class="p-button--base" href="/">{% trans "Cancel" %}</a>
378+ <button type="submit" class="p-button--positive" name="continue" data-qa-id="send_instructions_confirm_email">{% trans "Send instructions" %}</button>
379 </form>
380- <script type="text/javascript">
381- document.newemailform.newemail.focus();
382- </script>
383+ </div>
384+</div>
385+
386+<script type="text/javascript">
387+ document.newemailform.newemail.focus();
388+</script>
389 {% endblock %}
390
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 {% load i18n %}
396
397 {% comment %}
398-Copyright 2010 Canonical Ltd. This software is licensed under the
399+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
400 GNU Affero General Public License version 3 (see the file LICENSE).
401 {% endcomment %}
402
403@@ -10,12 +10,16 @@
404
405 {% block title %}{% trans "Account suspended" %}{% endblock %}
406
407-{% block text_title %}<h1 class="u1-h-main">{% trans "Account suspended" %}</h1>{% endblock %}
408+{% block text_title %}<h1>{% trans "Account suspended" %}</h1>{% endblock %}
409
410 {% block content %}
411-<div>
412- <p>
413- {% blocktrans %}Your account has been suspended.{% endblocktrans %}
414- </p>
415+<div class="row">
416+ <div class="col-8">
417+ <div class="p-notification--negative">
418+ <p class="p-notification__response">
419+ {% blocktrans %}Your account has been suspended.{% endblocktrans %}
420+ </p>
421+ </div>
422+ </div>
423 </div>
424 {% endblock %}
425
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 @@
430-{% extends "base.html" %}
431+{% extends "vanilla/base.html" %}
432 {% load i18n %}
433 {% load static_url %}
434
435 {% comment %}
436-Copyright 2010-2013 Canonical Ltd. This software is licensed under the
437+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
438 GNU Affero General Public License version 3 (see the file LICENSE).
439 {% endcomment %}
440
441 {% block title %}{% trans "Your account does not have a valid email address" %}{% endblock %}
442
443-{% block text_title %}<h1 class="u1-h-main">{% trans "Your account does not have a valid email address" %}</h1>{% endblock %}
444+{% block text_title %}<h1>{% trans "Your account does not have a valid email address" %}</h1>{% endblock %}
445
446 {% block content %}
447-<p>{% blocktrans %}
448-You have no valid email addresses linked to your account, so it was deactivated.
449-To reactivate the account please contact our support team at:{% endblocktrans %}
450-<a href="{{ 'support_form'|static_url }}">{{ 'support_form'|static_url }}</a>
451-</p>
452+<div class="row">
453+ <div class="col-8">
454+ <p>{% blocktrans %}
455+ You have no valid email addresses linked to your account, so it was deactivated.
456+ To reactivate the account please contact our support team at:{% endblocktrans %}
457+ <a href="{{ 'support_form'|static_url }}">{{ 'support_form'|static_url }}</a>
458+ </p>
459+ </div>
460+</div>
461
462 {% endblock %}
463
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 @@
468-{% extends "base.html" %}
469+{% extends "vanilla/base.html" %}
470 {% load i18n %}
471
472 {% comment %}
473-Copyright 2012 Canonical Ltd. This software is licensed under the GNU
474+Copyright 2012-2019 Canonical Ltd. This software is licensed under the GNU
475 Affero General Public License version 3 (see the file LICENSE).
476 {% endcomment %}
477
478@@ -14,26 +14,33 @@
479
480
481 {% block text_title %}
482-<h1 class="main">{% trans "Generate new codes" %}</h1>
483+<h1>{% trans "Generate new codes" %}</h1>
484 {% endblock %}
485
486 {% block content %}
487-
488-<h3>{% blocktrans %}
489-Confirming the new codes will <strong>invalidate</strong> all the previous codes.<br/>
490-Please print this new list and <strong>destroy any old lists</strong>.
491-{% endblocktrans %}</h3>
492-
493-{% include 'device/code-list.html' %}
494-
495-<form method="post">
496- {% csrf_token %}
497- <p>
498- <button class="btn" type="submit" data-qa-id="confirm_new_codes">
499- <span><span>{% trans "Confirm new codes" %}</span></span>
500- </button>
501- {% trans "or" %}
502- <a href="{% url 'device-print' device_id %}" data-qa-id="cancel_new_codes">{% trans "cancel" %}</a>
503- </p>
504-</form>
505+<div class="row">
506+ <div class="col-8">
507+ <div class="p-notification--warning">
508+ <p class="p-notification__response">
509+ {% blocktrans %}
510+ Confirming the new codes will <strong>invalidate</strong> all the previous codes.<br/>
511+ Please print this new list and <strong>destroy any old lists</strong>.
512+ {% endblocktrans %}
513+ </p>
514+ </div>
515+
516+ <hr>
517+
518+ {% include 'device/code-list.html' %}
519+
520+ <hr>
521+
522+ <form method="post">
523+ {% csrf_token %}
524+ <button class="p-button--positive" type="submit" data-qa-id="confirm_new_codes">{% trans "Confirm new codes" %}</button>
525+ {% trans "or" %}
526+ <a href="{% url 'device-print' device_id %}" data-qa-id="cancel_new_codes">{% trans "cancel" %}</a>
527+ </form>
528+ </div>
529+</div>
530 {% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: