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

[Karl Williams]

Converted the two remaining used static templates to Vanilla

[Anthony Dillon (ya-bo-ng)]

LGTM +1

review: Approve

=== modified file 'src/webui/templates/static/description.html'
--- src/webui/templates/static/description.html	2014-12-09 21:32:43 +0000
+++ src/webui/templates/static/description.html	2019-09-05 10:31:46 +0000
@@ -1,9 +1,9 @@
-{% extends "base.html" %}
+{% extends "vanilla/base.html" %}
 {% load i18n %}
 {% load static_url %}
 
 {% comment %}
-Copyright 2010 Canonical Ltd.  This software is licensed under the
+Copyright 2010-2019 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 

=== modified file 'src/webui/templates/static/one-redirect.html'
--- src/webui/templates/static/one-redirect.html	2014-08-14 16:54:07 +0000
+++ src/webui/templates/static/one-redirect.html	2019-09-05 10:31:46 +0000
@@ -1,10 +1,10 @@
-{% extends "base.html" %}
+{% extends "vanilla/base.html" %}
 {% load i18n %}
 {% load static_url %}
 {% load menu_item %}
 
 {% comment %}
-Copyright 2014 Canonical Ltd.  This software is licensed under the
+Copyright 2014-2019 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
@@ -14,26 +14,21 @@
 {% block menu %}{% endblock %}
 {% block content %}
 {% url 'faq' as faq_url %}
-<div class="yui3-g-r">
-
-  <div class="yui3-u-2-3 account-information">
-    <p>
-    {% blocktrans %}Ubuntu One is the single account you use to log in to
-    all services and sites related to Ubuntu. For more information please read the <a href="{{ faq_url }}">Ubuntu One FAQ.</a>{% endblocktrans %}
-    </p>
-    <h3>Looking for Ubuntu One File Services?</h3>
-    <p>
-    {% blocktrans with url1="http://blog.canonical.com/2014/04/02/shutting-down-ubuntu-one-file-services/" url2="http://voices.canonical.com/ubuntuone/2014/06/03/moving-your-content-away-from-ubuntu-one-file-services/" email="[e-mail]" %}
-    The Ubuntu One Files Services have been closed (see the <a href="{{ url1 }}">original announcement</a> or <a href="{{ url2 }}">follow up posts</a> for more details).
-    If you have questions about the Ubuntu One File Services shutdown, please email <a href="mailto:{{ email }}">{{ email }}</a>.
-    {% endblocktrans %}
-    </p>
-    <p>
-    {% url 'login' as login_url %}
-    {% blocktrans %}
-    <a href="{{ login_url }}">Create or log in</a> to your Ubuntu One account.
-    {% endblocktrans %}
-    </p>
-  </div>
-</div>
+  <p>
+  {% blocktrans %}Ubuntu One is the single account you use to log in to
+  all services and sites related to Ubuntu. For more information please read the <a href="{{ faq_url }}">Ubuntu One FAQ.</a>{% endblocktrans %}
+  </p>
+  <h3>Looking for Ubuntu One File Services?</h3>
+  <p>
+  {% blocktrans with url1="http://blog.canonical.com/2014/04/02/shutting-down-ubuntu-one-file-services/" url2="http://voices.canonical.com/ubuntuone/2014/06/03/moving-your-content-away-from-ubuntu-one-file-services/" email="[e-mail]" %}
+  The Ubuntu One Files Services have been closed (see the <a href="{{ url1 }}">original announcement</a> or <a href="{{ url2 }}">follow up posts</a> for more details).
+  If you have questions about the Ubuntu One File Services shutdown, please email <a href="mailto:{{ email }}">{{ email }}</a>.
+  {% endblocktrans %}
+  </p>
+  <p>
+  {% url 'login' as login_url %}
+  {% blocktrans %}
+  <a href="{{ login_url }}">Create or log in</a> to your Ubuntu One account.
+  {% endblocktrans %}
+  </p>
 {% endblock %}