Launchpad itself

Merge lp:~barry/launchpad/434058-specs into lp:launchpad

  1. 434058-specs
  2. Merge into devel
Proposed by Barry Warsaw
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~barry/launchpad/434058-specs
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~barry/launchpad/434058-specs
Reviewer Review Type Date Requested Status
Brad Crittenden (community) release-critical Approve
Aaron Bentley (community) code Approve
Review via email: mp+12183@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

 reviewer abentley

= Summary =

Bug 434058 describes yet another mechanical change to some blueprint pages.

== Proposed fix ==

Update the templates and tests.

== Pre-implementation notes ==

None.

== Implementation details ==

Pretty straightforward. I cleaned up a doctest while I was at it.

== Tests ==

bin/test -vv -t stories/blueprints

== Demo and Q/A ==

https://blueprints.launchpad.dev/firefox/+spec/svg-support/+linkbug
https://blueprints.launchpad.dev/firefox/+spec/svg-support/+edit

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/blueprints/stories/blueprints/07-milestones.txt
  lib/lp/blueprints/stories/blueprints/xx-overview.txt
  lib/lp/blueprints/templates/specification-edit.pt
  lib/lp/blueprints/templates/specification-linkbug.pt

Revision history for this message
Aaron Bentley (abentley) wrote :

Looks straightforward.

review: Approve (code)
Revision history for this message
Brad Crittenden (bac) wrote :

Thanks Barry

review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/blueprints/stories/blueprints/07-milestones.txt'
--- lib/lp/blueprints/stories/blueprints/07-milestones.txt 2009-09-11 14:03:37 +0000
+++ lib/lp/blueprints/stories/blueprints/07-milestones.txt 2009-09-21 19:15:03 +0000
@@ -15,8 +15,9 @@
15 >>> admin_browser.open(15 >>> admin_browser.open(
16 ... 'http://blueprints.launchpad.dev/firefox/+spec/canvas')16 ... 'http://blueprints.launchpad.dev/firefox/+spec/canvas')
17 >>> admin_browser.getLink('Target milestone').click()17 >>> admin_browser.getLink('Target milestone').click()
18 >>> admin_browser.title18 >>> print admin_browser.title
19 'Edit blueprint details'19 Target to a milestone : Support <canvas> Objects :
20 Blueprints for Mozilla Firefox : Mozilla Firefox
20 >>> back_link = admin_browser.getLink('Support <canvas> Objects')21 >>> back_link = admin_browser.getLink('Support <canvas> Objects')
21 >>> back_link.url22 >>> back_link.url
22 'http://blueprints.launchpad.dev/firefox/+spec/canvas'23 'http://blueprints.launchpad.dev/firefox/+spec/canvas'
2324
=== modified file 'lib/lp/blueprints/stories/blueprints/xx-overview.txt'
--- lib/lp/blueprints/stories/blueprints/xx-overview.txt 2009-09-18 23:33:06 +0000
+++ lib/lp/blueprints/stories/blueprints/xx-overview.txt 2009-09-21 19:15:03 +0000
@@ -1,4 +1,6 @@
1= Blueprints Overview =1===================
2Blueprints Overview
3===================
24
3Launchpad makes it easy for users to see the blueprints filed against any5Launchpad makes it easy for users to see the blueprints filed against any
4product or distribution. There's a page where users can find the latest6product or distribution. There's a page where users can find the latest
@@ -6,14 +8,16 @@
6lists of blueprints for a given product or distribution.8lists of blueprints for a given product or distribution.
79
810
9== Viewing lists of blueprints ==11Viewing lists of blueprints
12===========================
1013
11Launchpad provides a dedicated page where users can browse through all the14Launchpad provides a dedicated page where users can browse through all the
12available blueprints for any product or distribution. Users can reach this15available blueprints for any product or distribution. Users can reach this
13page from any context by following the "Blueprints" tab.16page from any context by following the "Blueprints" tab.
1417
1518
16=== Viewing blueprints targeted to a product ===19Viewing blueprints targeted to a product
20----------------------------------------
1721
18Let's use the Mozilla Firefox product as an example. Users can see the list22Let's use the Mozilla Firefox product as an example. Users can see the list
19of blueprints attached to Mozilla Firefox by following the "Blueprints" tab:23of blueprints attached to Mozilla Firefox by following the "Blueprints" tab:
@@ -27,7 +31,8 @@
27 High ...svg-support ...Approved...Beta Available...31 High ...svg-support ...Approved...Beta Available...
2832
2933
30=== Viewing blueprints targeted to a product series ===34Viewing blueprints targeted to a product series
35-----------------------------------------------
3136
32It's possible to narrow down the list of blueprints to show only those37It's possible to narrow down the list of blueprints to show only those
33targeted to a given product series. Let's pick the Mozilla Firefox 1.038targeted to a given product series. Let's pick the Mozilla Firefox 1.0
@@ -80,6 +85,8 @@
80 >>> browser.getLink('Target milestone').click()85 >>> browser.getLink('Target milestone').click()
81 >>> main = find_main_content(browser.contents)86 >>> main = find_main_content(browser.contents)
82 >>> print extract_text(main).encode('ascii', 'backslashreplace')87 >>> print extract_text(main).encode('ascii', 'backslashreplace')
88 Target to a milestone
89 ...
83 Support Native SVG Objects90 Support Native SVG Objects
84 Select the milestone of Mozilla Firefox in which you would like91 Select the milestone of Mozilla Firefox in which you would like
85 this feature to be implemented...92 this feature to be implemented...
@@ -109,7 +116,8 @@
109 Mozilla Firefox 1.0.9116 Mozilla Firefox 1.0.9
110117
111118
112=== Viewing blueprints targeted to a distribution ===119Viewing blueprints targeted to a distribution
120---------------------------------------------
113121
114Let's use the Ubuntu distribution as an example. Users can see the list of122Let's use the Ubuntu distribution as an example. Users can see the list of
115blueprints attached to Ubuntu Linux by following the "Blueprints" tab:123blueprints attached to Ubuntu Linux by following the "Blueprints" tab:
@@ -123,7 +131,8 @@
123 Undefined...media-integrity-check...Discussion...Unknown131 Undefined...media-integrity-check...Discussion...Unknown
124132
125133
126=== Viewing blueprints targeted to a distribution series ===134Viewing blueprints targeted to a distribution series
135----------------------------------------------------
127136
128As before, it's possible to narrow down the list of blueprints to show only137As before, it's possible to narrow down the list of blueprints to show only
129those targeted to a given distribution series. Let's pick the Grumpy Groundhog138those targeted to a given distribution series. Let's pick the Grumpy Groundhog
@@ -175,6 +184,8 @@
175 >>> browser.getLink('media-integrity-check').click()184 >>> browser.getLink('media-integrity-check').click()
176 >>> browser.getLink('Target milestone').click()185 >>> browser.getLink('Target milestone').click()
177 >>> print extract_text(find_main_content(browser.contents))186 >>> print extract_text(find_main_content(browser.contents))
187 Target to a milestone
188 ...
178 CD Media Integrity Check189 CD Media Integrity Check
179 Select the milestone of Ubuntu in which you would like this feature190 Select the milestone of Ubuntu in which you would like this feature
180 to be implemented...191 to be implemented...
@@ -182,7 +193,8 @@
182 >>> milestones = browser.getControl('Milestone')193 >>> milestones = browser.getControl('Milestone')
183 >>> milestones.displayValue = ['Ubuntu drift-1']194 >>> milestones.displayValue = ['Ubuntu drift-1']
184 >>> browser.getControl('Change').click()195 >>> browser.getControl('Change').click()
185 >>> print extract_text(find_tag_by_id(browser.contents, 'milestone-target'))196 >>> print extract_text(
197 ... find_tag_by_id(browser.contents, 'milestone-target'))
186 Milestone target: drift-1198 Milestone target: drift-1
187199
188Finally, the blueprint listing for Grumpy includes an entry for our chosen200Finally, the blueprint listing for Grumpy includes an entry for our chosen
189201
=== modified file 'lib/lp/blueprints/templates/specification-edit.pt'
--- lib/lp/blueprints/templates/specification-edit.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/specification-edit.pt 2009-09-21 19:15:03 +0000
@@ -2,13 +2,7 @@
2 xmlns="http://www.w3.org/1999/xhtml"2 xmlns="http://www.w3.org/1999/xhtml"
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 metal:use-macro="view/macro:page/main_only">
6 xml:lang="en"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"
11>
126
13<body>7<body>
148
159
=== modified file 'lib/lp/blueprints/templates/specification-linkbug.pt'
--- lib/lp/blueprints/templates/specification-linkbug.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/specification-linkbug.pt 2009-09-21 19:15:03 +0000
@@ -2,20 +2,13 @@
2 xmlns="http://www.w3.org/1999/xhtml"2 xmlns="http://www.w3.org/1999/xhtml"
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 xml:lang="en"5 metal:use-macro="view/macro:page/main_only">
6 lang="en"
7 dir="ltr"
8 metal:use-macro="context/@@main_template/master">
96
10<body>7<body>
118
12<metal:leftportlets fill-slot="portlets_one">
13 <div tal:replace="structure context/@@+portlet-bugs" />
14</metal:leftportlets>
15
16<div metal:fill-slot="main">9<div metal:fill-slot="main">
1710
18 <div tal:content="structure context/fmt:link" />11 <div tal:content="structure context/fmt:link" />
1912
20 <div metal:use-macro="context/@@launchpad_form/form">13 <div metal:use-macro="context/@@launchpad_form/form">
21 <metal:heading fill-slot="heading">14 <metal:heading fill-slot="heading">
@@ -38,4 +31,3 @@
38</div>31</div>
39</body>32</body>
40</html>33</html>
41