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

Proposed by Karl Williams on 2019-08-12
Status: Merged
Approved by: Karl Williams on 2019-08-19
Approved revision: 1701
Merged at revision: 1701
Proposed branch: lp:~deadlight/canonical-identity-provider/delete-account
Merge into: lp:~deadlight/canonical-identity-provider/vanilla
Prerequisite: lp:~deadlight/canonical-identity-provider/my-account
Diff against target: 136 lines (+50/-55)
2 files modified
src/identityprovider/static_src/scss/styles.scss (+4/-2)
src/webui/templates/account/delete.html (+46/-53)
To merge this branch: bzr merge lp:~deadlight/canonical-identity-provider/delete-account
Reviewer Review Type Date Requested Status
Anthony Dillon (community) 2019-08-12 Approve on 2019-08-15
Review via email: mp+371205@code.launchpad.net

Description of the change

Added the delete account page

QA:

When logged in go to: http://[HOST]:8000/+delete

To post a comment you must log in.
Barry McGee (barry-mcgee) wrote :

One small comment. No QA.

Anthony Dillon (ya-bo-ng) wrote :

QA +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/identityprovider/static_src/scss/styles.scss'
--- src/identityprovider/static_src/scss/styles.scss 2019-08-12 14:33:21 +0000
+++ src/identityprovider/static_src/scss/styles.scss 2019-08-12 14:33:22 +0000
@@ -52,6 +52,8 @@
52}52}
5353
54// Fix for mixed buttons54// Fix for mixed buttons
55[class^="p-button"] + [class^="p-button"] {55@media only screen and (min-width: $breakpoint-x-small + 1) {
56 margin-left: $sph-inner;56 [class^="p-button"] + [class^="p-button"] {
57 margin-left: $sph-inner;
58 }
57}59}
5860
=== modified file 'src/webui/templates/account/delete.html'
--- src/webui/templates/account/delete.html 2018-12-13 17:22:24 +0000
+++ src/webui/templates/account/delete.html 2019-08-12 14:33:22 +0000
@@ -1,71 +1,64 @@
1{% extends "base.html" %}1{% extends "vanilla/base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% comment %}4{% comment %}
5Copyright 2013 Canonical Ltd. This software is licensed under the5Copyright 2013-2019 Canonical Ltd. This software is licensed under the
6GNU Affero General Public License version 3 (see the file LICENSE).6GNU Affero General Public License version 3 (see the file LICENSE).
7{% endcomment %}7{% endcomment %}
88
9{% block html_extra %}data-qa-id="edit_account"{% endblock %}9{% block html_extra %}data-qa-id="edit_account"{% endblock %}
1010
11{% block title %}11{% block title %}
12 {% blocktrans %}Delete account{% endblocktrans %}12 {% blocktrans %}Delete account{% endblocktrans %}
13{% endblock %}13{% endblock %}
1414
15{% block text_title %}15{% block text_title %}
16 <h1 class="main">{% trans "Delete account" %}</h1>16 <h1>{% trans "My account" %}</h1>
17{% endblock %}17{% endblock %}
1818
19{% block content %}19{% block content %}
2020<section class="p-strip">
21<p>{% blocktrans %}Please be aware that deleting your Ubuntu One 21 <h2>{% trans "Delete account" %}</h2>
22account means you'll lose access to all your accounts tied to your 22 <p>{% blocktrans %}Please be aware that deleting your Ubuntu One
23Ubuntu One login. This means you won't be able to change their 23 account means you'll lose access to all your accounts tied to your
24status or cancel any services associated.24 Ubuntu One login. This means you won't be able to change their
25{% endblocktrans %}</p>25 status or cancel any services associated.
2626 {% endblocktrans %}</p>
27<h2>Launchpad:</h2>27 <h3>Launchpad:</h3>
2828 <p>{% blocktrans %}All content published under your Launchpad user will remain
29<p>{% blocktrans %}All content published under your Launchpad user will remain29 public unless you deactivate your launchpad account first.
30public unless you deactivate your launchpad account first.30 {% endblocktrans %}</p>
31{% endblocktrans %}</p>31 <h3>{% trans "Other services:" %}</h3>
3232 <p>{% blocktrans %}Landscape, Ubuntu wiki sites, Ubuntu Forum and AskUbuntu
33<h2>{% trans "Other services:" %}</h2>33 accounts won't be deleted, but you will lose access to those too. You should
3434 contact each team if you want to make sure each of those are eliminated too.
35<p>{% blocktrans %}Landscape, Ubuntu wiki sites, Ubuntu Forum and AskUbuntu 35 {% endblocktrans %}</p>
36accounts won't be deleted, but you will lose access to those too. You should 36 <p>{% blocktrans %}For more information check out:{% endblocktrans %}
37contact each team if you want to make sure each of those are eliminated too.37 <a href="/+faq#can-i-delete-my-ubuntu-one-account">{% trans "Can I delete my account?" %}</a>.
38{% endblocktrans %}</p>38 </p>
3939 <p>{% blocktrans %}Please take a moment to read through this page and make sure
40<p>{% blocktrans %}For more information check out:{% endblocktrans %}40 you understand the consequences of deleting your account before you confirm
41<a href="https://login.ubuntu.com/+faq#can-i-delete-my-ubuntu-one-account">{% trans "Can I delete my account?" %}</a>. 41 this action.
42</p>42 {% endblocktrans %}</p>
43<p>{% blocktrans %}Please take a moment to read through this page and make sure43
44you understand the consequences of deleting your account before you confirm44
45this action.45 {% include "widgets/last_auth_sites.html" %}
46{% endblocktrans %}</p>46 <form action="" method="post" class="row">
4747 <div class="col-8 col-medium-6">
4848 {% csrf_token %}
49{% include "widgets/last_auth_sites.html" %}49
50<form action="" method="post" class="confirm-password-deletion">50 {% if not readonly %}
51 {% csrf_token %}51 <p>{% trans "Please confirm your account's password before deletion." %}</p>
5252 <div class="input-row{% if fields.password.errors or fields.non_field_errors %} haserrors{% endif %} password-input">
53 {% if not readonly %}
54 <p>{% trans "Please confirm your account's password before deletion." %}</p>
55 <div class="input-row{% if fields.password.errors or fields.non_field_errors %} haserrors{% endif %} password-input">
56 {{ form }}53 {{ form }}
54 </div>
55 {% endif %}
56
57 {% if not readonly %}
58 <button type="submit" class="p-button--negative">{% trans "Permanently delete account" %}</button>
59 {% endif %}
60 <a class="p-button" href="/">{% trans "Cancel" %}</a>
57 </div>61 </div>
58 {% endif %}62 </form>
5963</section>
60 <p class="actions">
61 <a class="cta secondary" href="/">{% trans "Cancel" %}</a>
62 {% if not readonly %}
63 {% trans "or" %}
64 <button type="submit" class="btn cta delete-button">
65 <span><span>{% trans "Permanently delete account" %}</span></span>
66 </button>
67 {% endif %}
68 </p>
69</form>
70
71{% endblock %}64{% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: