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
1=== modified file 'src/identityprovider/static_src/scss/styles.scss'
2--- src/identityprovider/static_src/scss/styles.scss 2019-08-12 14:33:21 +0000
3+++ src/identityprovider/static_src/scss/styles.scss 2019-08-12 14:33:22 +0000
4@@ -52,6 +52,8 @@
5 }
6
7 // Fix for mixed buttons
8-[class^="p-button"] + [class^="p-button"] {
9- margin-left: $sph-inner;
10+@media only screen and (min-width: $breakpoint-x-small + 1) {
11+ [class^="p-button"] + [class^="p-button"] {
12+ margin-left: $sph-inner;
13+ }
14 }
15
16=== modified file 'src/webui/templates/account/delete.html'
17--- src/webui/templates/account/delete.html 2018-12-13 17:22:24 +0000
18+++ src/webui/templates/account/delete.html 2019-08-12 14:33:22 +0000
19@@ -1,71 +1,64 @@
20-{% extends "base.html" %}
21+{% extends "vanilla/base.html" %}
22 {% load i18n %}
23
24 {% comment %}
25-Copyright 2013 Canonical Ltd. This software is licensed under the
26+Copyright 2013-2019 Canonical Ltd. This software is licensed under the
27 GNU Affero General Public License version 3 (see the file LICENSE).
28 {% endcomment %}
29
30 {% block html_extra %}data-qa-id="edit_account"{% endblock %}
31
32 {% block title %}
33- {% blocktrans %}Delete account{% endblocktrans %}
34+ {% blocktrans %}Delete account{% endblocktrans %}
35 {% endblock %}
36
37 {% block text_title %}
38- <h1 class="main">{% trans "Delete account" %}</h1>
39+ <h1>{% trans "My account" %}</h1>
40 {% endblock %}
41
42 {% block content %}
43-
44-<p>{% blocktrans %}Please be aware that deleting your Ubuntu One
45-account means you'll lose access to all your accounts tied to your
46-Ubuntu One login. This means you won't be able to change their
47-status or cancel any services associated.
48-{% endblocktrans %}</p>
49-
50-<h2>Launchpad:</h2>
51-
52-<p>{% blocktrans %}All content published under your Launchpad user will remain
53-public unless you deactivate your launchpad account first.
54-{% endblocktrans %}</p>
55-
56-<h2>{% trans "Other services:" %}</h2>
57-
58-<p>{% blocktrans %}Landscape, Ubuntu wiki sites, Ubuntu Forum and AskUbuntu
59-accounts won't be deleted, but you will lose access to those too. You should
60-contact each team if you want to make sure each of those are eliminated too.
61-{% endblocktrans %}</p>
62-
63-<p>{% blocktrans %}For more information check out:{% endblocktrans %}
64-<a href="https://login.ubuntu.com/+faq#can-i-delete-my-ubuntu-one-account">{% trans "Can I delete my account?" %}</a>.
65-</p>
66-<p>{% blocktrans %}Please take a moment to read through this page and make sure
67-you understand the consequences of deleting your account before you confirm
68-this action.
69-{% endblocktrans %}</p>
70-
71-
72-{% include "widgets/last_auth_sites.html" %}
73-<form action="" method="post" class="confirm-password-deletion">
74- {% csrf_token %}
75-
76- {% if not readonly %}
77- <p>{% trans "Please confirm your account's password before deletion." %}</p>
78- <div class="input-row{% if fields.password.errors or fields.non_field_errors %} haserrors{% endif %} password-input">
79+<section class="p-strip">
80+ <h2>{% trans "Delete account" %}</h2>
81+ <p>{% blocktrans %}Please be aware that deleting your Ubuntu One
82+ account means you'll lose access to all your accounts tied to your
83+ Ubuntu One login. This means you won't be able to change their
84+ status or cancel any services associated.
85+ {% endblocktrans %}</p>
86+ <h3>Launchpad:</h3>
87+ <p>{% blocktrans %}All content published under your Launchpad user will remain
88+ public unless you deactivate your launchpad account first.
89+ {% endblocktrans %}</p>
90+ <h3>{% trans "Other services:" %}</h3>
91+ <p>{% blocktrans %}Landscape, Ubuntu wiki sites, Ubuntu Forum and AskUbuntu
92+ accounts won't be deleted, but you will lose access to those too. You should
93+ contact each team if you want to make sure each of those are eliminated too.
94+ {% endblocktrans %}</p>
95+ <p>{% blocktrans %}For more information check out:{% endblocktrans %}
96+ <a href="/+faq#can-i-delete-my-ubuntu-one-account">{% trans "Can I delete my account?" %}</a>.
97+ </p>
98+ <p>{% blocktrans %}Please take a moment to read through this page and make sure
99+ you understand the consequences of deleting your account before you confirm
100+ this action.
101+ {% endblocktrans %}</p>
102+
103+
104+ {% include "widgets/last_auth_sites.html" %}
105+ <form action="" method="post" class="row">
106+ <div class="col-8 col-medium-6">
107+ {% csrf_token %}
108+
109+ {% if not readonly %}
110+ <p>{% trans "Please confirm your account's password before deletion." %}</p>
111+ <div class="input-row{% if fields.password.errors or fields.non_field_errors %} haserrors{% endif %} password-input">
112 {{ form }}
113+ </div>
114+ {% endif %}
115+
116+ {% if not readonly %}
117+ <button type="submit" class="p-button--negative">{% trans "Permanently delete account" %}</button>
118+ {% endif %}
119+ <a class="p-button" href="/">{% trans "Cancel" %}</a>
120 </div>
121- {% endif %}
122-
123- <p class="actions">
124- <a class="cta secondary" href="/">{% trans "Cancel" %}</a>
125- {% if not readonly %}
126- {% trans "or" %}
127- <button type="submit" class="btn cta delete-button">
128- <span><span>{% trans "Permanently delete account" %}</span></span>
129- </button>
130- {% endif %}
131- </p>
132-</form>
133-
134+ </form>
135+</section>
136 {% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: