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

Proposed by Karl Williams on 2019-09-05
Status: Merged
Merged at revision: 1722
Proposed branch: lp:~deadlight/canonical-identity-provider/misc-static
Merge into: lp:~deadlight/canonical-identity-provider/vanilla
Prerequisite: lp:~deadlight/canonical-identity-provider/misc-account
Diff against target: 76 lines (+21/-26)
2 files modified
src/webui/templates/static/description.html (+2/-2)
src/webui/templates/static/one-redirect.html (+19/-24)
To merge this branch: bzr merge lp:~deadlight/canonical-identity-provider/misc-static
Reviewer Review Type Date Requested Status
Anthony Dillon (community) 2019-09-05 Approve on 2019-09-05
Review via email: mp+372332@code.launchpad.net

Description of the change

Converted the two remaining used static templates to Vanilla

To post a comment you must log in.
Anthony Dillon (ya-bo-ng) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webui/templates/static/description.html'
2--- src/webui/templates/static/description.html 2014-12-09 21:32:43 +0000
3+++ src/webui/templates/static/description.html 2019-09-05 10:31:46 +0000
4@@ -1,9 +1,9 @@
5-{% extends "base.html" %}
6+{% extends "vanilla/base.html" %}
7 {% load i18n %}
8 {% load static_url %}
9
10 {% comment %}
11-Copyright 2010 Canonical Ltd. This software is licensed under the
12+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
13 GNU Affero General Public License version 3 (see the file LICENSE).
14 {% endcomment %}
15
16
17=== modified file 'src/webui/templates/static/one-redirect.html'
18--- src/webui/templates/static/one-redirect.html 2014-08-14 16:54:07 +0000
19+++ src/webui/templates/static/one-redirect.html 2019-09-05 10:31:46 +0000
20@@ -1,10 +1,10 @@
21-{% extends "base.html" %}
22+{% extends "vanilla/base.html" %}
23 {% load i18n %}
24 {% load static_url %}
25 {% load menu_item %}
26
27 {% comment %}
28-Copyright 2014 Canonical Ltd. This software is licensed under the
29+Copyright 2014-2019 Canonical Ltd. This software is licensed under the
30 GNU Affero General Public License version 3 (see the file LICENSE).
31 {% endcomment %}
32
33@@ -14,26 +14,21 @@
34 {% block menu %}{% endblock %}
35 {% block content %}
36 {% url 'faq' as faq_url %}
37-<div class="yui3-g-r">
38-
39- <div class="yui3-u-2-3 account-information">
40- <p>
41- {% blocktrans %}Ubuntu One is the single account you use to log in to
42- all services and sites related to Ubuntu. For more information please read the <a href="{{ faq_url }}">Ubuntu One FAQ.</a>{% endblocktrans %}
43- </p>
44- <h3>Looking for Ubuntu One File Services?</h3>
45- <p>
46- {% 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="isd-support@canonical.com" %}
47- 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).
48- If you have questions about the Ubuntu One File Services shutdown, please email <a href="mailto:{{ email }}">{{ email }}</a>.
49- {% endblocktrans %}
50- </p>
51- <p>
52- {% url 'login' as login_url %}
53- {% blocktrans %}
54- <a href="{{ login_url }}">Create or log in</a> to your Ubuntu One account.
55- {% endblocktrans %}
56- </p>
57- </div>
58-</div>
59+ <p>
60+ {% blocktrans %}Ubuntu One is the single account you use to log in to
61+ all services and sites related to Ubuntu. For more information please read the <a href="{{ faq_url }}">Ubuntu One FAQ.</a>{% endblocktrans %}
62+ </p>
63+ <h3>Looking for Ubuntu One File Services?</h3>
64+ <p>
65+ {% 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="isd-support@canonical.com" %}
66+ 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).
67+ If you have questions about the Ubuntu One File Services shutdown, please email <a href="mailto:{{ email }}">{{ email }}</a>.
68+ {% endblocktrans %}
69+ </p>
70+ <p>
71+ {% url 'login' as login_url %}
72+ {% blocktrans %}
73+ <a href="{{ login_url }}">Create or log in</a> to your Ubuntu One account.
74+ {% endblocktrans %}
75+ </p>
76 {% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: