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

[Karl Williams]

Added the delete account page

QA:

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

[Barry McGee (barry-mcgee)]

One small comment. No QA.

[Anthony Dillon (ya-bo-ng)]

QA +1

review: Approve

=== 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 @@
 }
 
 // Fix for mixed buttons
-[class^="p-button"] + [class^="p-button"] {
-  margin-left: $sph-inner;
+@media only screen and (min-width: $breakpoint-x-small + 1) {
+  [class^="p-button"] + [class^="p-button"] {
+    margin-left: $sph-inner;
+  }
 }

=== 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 @@
-{% extends "base.html" %}
+{% extends "vanilla/base.html" %}
 {% load i18n %}
 
 {% comment %}
-Copyright 2013 Canonical Ltd.  This software is licensed under the
+Copyright 2013-2019 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
 {% block html_extra %}data-qa-id="edit_account"{% endblock %}
 
 {% block title %}
-    {% blocktrans %}Delete account{% endblocktrans %}
+  {% blocktrans %}Delete account{% endblocktrans %}
 {% endblock %}
 
 {% block text_title %}
-  <h1 class="main">{% trans "Delete account" %}</h1>
+  <h1>{% trans "My account" %}</h1>
 {% endblock %}
 
 {% block content %}
-
-<p>{% blocktrans %}Please be aware that deleting your Ubuntu One 
-account means you'll lose access to all your accounts tied to your 
-Ubuntu One login. This means you won't be able to change their 
-status or cancel any services associated.
-{% endblocktrans %}</p>
-
-<h2>Launchpad:</h2>
-
-<p>{% blocktrans %}All content published under your Launchpad user will remain
-public unless you deactivate your launchpad account first.
-{% endblocktrans %}</p>
-
-<h2>{% trans "Other services:" %}</h2>
-
-<p>{% blocktrans %}Landscape, Ubuntu wiki sites, Ubuntu Forum and AskUbuntu 
-accounts won't be deleted, but you will lose access to those too. You should 
-contact each team if you want to make sure each of those are eliminated too.
-{% endblocktrans %}</p>
-
-<p>{% blocktrans %}For more information check out:{% endblocktrans %}
-<a href="https://login.ubuntu.com/+faq#can-i-delete-my-ubuntu-one-account">{% trans "Can I delete my account?" %}</a>. 
-</p>
-<p>{% blocktrans %}Please take a moment to read through this page and make sure
-you understand the consequences of deleting your account before you confirm
-this action.
-{% endblocktrans %}</p>
-
-
-{% include "widgets/last_auth_sites.html" %}
-<form action="" method="post" class="confirm-password-deletion">
-    {% csrf_token %}
-
-    {% if not readonly %}
-    <p>{% trans "Please confirm your account's password before deletion." %}</p>
-    <div class="input-row{% if fields.password.errors or fields.non_field_errors %} haserrors{% endif %} password-input">
+<section class="p-strip">
+  <h2>{% trans "Delete account" %}</h2>
+  <p>{% blocktrans %}Please be aware that deleting your Ubuntu One
+  account means you'll lose access to all your accounts tied to your
+  Ubuntu One login. This means you won't be able to change their
+  status or cancel any services associated.
+  {% endblocktrans %}</p>
+  <h3>Launchpad:</h3>
+  <p>{% blocktrans %}All content published under your Launchpad user will remain
+  public unless you deactivate your launchpad account first.
+  {% endblocktrans %}</p>
+  <h3>{% trans "Other services:" %}</h3>
+  <p>{% blocktrans %}Landscape, Ubuntu wiki sites, Ubuntu Forum and AskUbuntu
+  accounts won't be deleted, but you will lose access to those too. You should
+  contact each team if you want to make sure each of those are eliminated too.
+  {% endblocktrans %}</p>
+  <p>{% blocktrans %}For more information check out:{% endblocktrans %}
+  <a href="/+faq#can-i-delete-my-ubuntu-one-account">{% trans "Can I delete my account?" %}</a>.
+  </p>
+  <p>{% blocktrans %}Please take a moment to read through this page and make sure
+  you understand the consequences of deleting your account before you confirm
+  this action.
+  {% endblocktrans %}</p>
+
+
+  {% include "widgets/last_auth_sites.html" %}
+  <form action="" method="post" class="row">
+    <div class="col-8 col-medium-6">
+      {% csrf_token %}
+
+      {% if not readonly %}
+      <p>{% trans "Please confirm your account's password before deletion." %}</p>
+      <div class="input-row{% if fields.password.errors or fields.non_field_errors %} haserrors{% endif %} password-input">
         {{ form }}
+      </div>
+      {% endif %}
+
+      {% if not readonly %}
+        <button type="submit" class="p-button--negative">{% trans "Permanently delete account" %}</button>
+      {% endif %}
+      <a class="p-button" href="/">{% trans "Cancel" %}</a>
     </div>
-    {% endif %}
-
-    <p class="actions">
-        <a class="cta secondary" href="/">{% trans "Cancel" %}</a>
-    {% if not readonly %}
-        {% trans "or" %}
-        <button type="submit" class="btn cta delete-button">
-            <span><span>{% trans "Permanently delete account" %}</span></span>
-        </button>
-    {% endif %}
-    </p>
-</form>
-
+  </form>
+</section>
 {% endblock %}