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