Launchpad itself

Merge lp://staging/~gary/launchpad/launchpad-templates into lp://staging/launchpad

  1. launchpad-templates
  2. Merge into devel
Proposed by Gary Poster
Status: Merged
Approved by: Edwin Grubbs
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~gary/launchpad/launchpad-templates
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/launchpad/launchpad-templates
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) code Approve
Review via email: mp+11930@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This changes the logintoken pages to use the new template layout. This was almost exclusively trivial mechanical changes.

Notes:

- Most of these token pages use context/@@main_template/master . The conversion guidelines suggest main_side or main_only for these, but locationless seems more appropriate. I checked with Guilherme and he agreed.

- I did not see how to verify the logintoken-index.pt page in the browser. It redirects to the correct page, so you do not actually see it. I could have done a wget or other tricks but I felt it was unnecessary.

- Someone had already migrated logintoken-mergepeople.pt.

Thank you!

Gary

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Hi Gary,

The template changes look good, but there are some other changes that are part of the 3.0 conversion. For each template that is updated to use the new layout, we want to get rid of the variable in lib/c/l/pagetitles.py, since the page title is now automatically generated to be the reverse breadcrumbs.

logintoken-validatesignonlygpg.pt and logintoken-index.pt have <h1> tags that should be eliminated by adding a "label" attribute on the view, and it will default to filling the heading slot with that.

-Edwin

review: Needs Fixing
Revision history for this message
Gary Poster (gary) wrote :

Thank you Edwin.

I think I made the necessary changes. They are pushed to the branch, and the incremental diff is here: http://pastebin.ubuntu.com/273020/ .

Gary

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Looks good.

merge-approved

-Edwin

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/templates/logintoken-claimprofile.pt'
--- lib/canonical/launchpad/templates/logintoken-claimprofile.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-claimprofile.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12<body>9<body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-claimteam.pt'
--- lib/canonical/launchpad/templates/logintoken-claimteam.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-claimteam.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12<body>9<body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-index.pt'
--- lib/canonical/launchpad/templates/logintoken-index.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-index.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
129
@@ -18,7 +15,7 @@
1815
19 <p>16 <p>
20 You reached this page probably because you followed a link received by17 You reached this page probably because you followed a link received by
21 email. That link was sent to confirm you have access to the email 18 email. That link was sent to confirm you have access to the email
22 address it was sent to, but this confirmation was already concluded, so19 address it was sent to, but this confirmation was already concluded, so
23 you don't need to do anything else.20 you don't need to do anything else.
24 </p>21 </p>
2522
=== modified file 'lib/canonical/launchpad/templates/logintoken-newaccount.pt'
--- lib/canonical/launchpad/templates/logintoken-newaccount.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-newaccount.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12 <body>9 <body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-resetpassword.pt'
--- lib/canonical/launchpad/templates/logintoken-resetpassword.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-resetpassword.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12 <body>9 <body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-validateemail.pt'
--- lib/canonical/launchpad/templates/logintoken-validateemail.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-validateemail.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12 <body>9 <body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-validategpg.pt'
--- lib/canonical/launchpad/templates/logintoken-validategpg.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-validategpg.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12 <body>9 <body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-validatesignonlygpg.pt'
--- lib/canonical/launchpad/templates/logintoken-validatesignonlygpg.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-validatesignonlygpg.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12 <body>9 <body>
1310
=== modified file 'lib/canonical/launchpad/templates/logintoken-validateteamemail.pt'
--- lib/canonical/launchpad/templates/logintoken-validateteamemail.pt 2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/logintoken-validateteamemail.pt 2009-09-16 20:51:57 +0000
@@ -3,10 +3,7 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/locationless"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12 <body>9 <body>