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
1=== modified file 'lib/lp/blueprints/stories/blueprints/07-milestones.txt'
2--- lib/lp/blueprints/stories/blueprints/07-milestones.txt 2009-09-11 14:03:37 +0000
3+++ lib/lp/blueprints/stories/blueprints/07-milestones.txt 2009-09-21 19:15:03 +0000
4@@ -15,8 +15,9 @@
5 >>> admin_browser.open(
6 ... 'http://blueprints.launchpad.dev/firefox/+spec/canvas')
7 >>> admin_browser.getLink('Target milestone').click()
8- >>> admin_browser.title
9- 'Edit blueprint details'
10+ >>> print admin_browser.title
11+ Target to a milestone : Support <canvas> Objects :
12+ Blueprints for Mozilla Firefox : Mozilla Firefox
13 >>> back_link = admin_browser.getLink('Support <canvas> Objects')
14 >>> back_link.url
15 'http://blueprints.launchpad.dev/firefox/+spec/canvas'
16
17=== modified file 'lib/lp/blueprints/stories/blueprints/xx-overview.txt'
18--- lib/lp/blueprints/stories/blueprints/xx-overview.txt 2009-09-18 23:33:06 +0000
19+++ lib/lp/blueprints/stories/blueprints/xx-overview.txt 2009-09-21 19:15:03 +0000
20@@ -1,4 +1,6 @@
21-= Blueprints Overview =
22+===================
23+Blueprints Overview
24+===================
25
26 Launchpad makes it easy for users to see the blueprints filed against any
27 product or distribution. There's a page where users can find the latest
28@@ -6,14 +8,16 @@
29 lists of blueprints for a given product or distribution.
30
31
32-== Viewing lists of blueprints ==
33+Viewing lists of blueprints
34+===========================
35
36 Launchpad provides a dedicated page where users can browse through all the
37 available blueprints for any product or distribution. Users can reach this
38 page from any context by following the "Blueprints" tab.
39
40
41-=== Viewing blueprints targeted to a product ===
42+Viewing blueprints targeted to a product
43+----------------------------------------
44
45 Let's use the Mozilla Firefox product as an example. Users can see the list
46 of blueprints attached to Mozilla Firefox by following the "Blueprints" tab:
47@@ -27,7 +31,8 @@
48 High ...svg-support ...Approved...Beta Available...
49
50
51-=== Viewing blueprints targeted to a product series ===
52+Viewing blueprints targeted to a product series
53+-----------------------------------------------
54
55 It's possible to narrow down the list of blueprints to show only those
56 targeted to a given product series. Let's pick the Mozilla Firefox 1.0
57@@ -80,6 +85,8 @@
58 >>> browser.getLink('Target milestone').click()
59 >>> main = find_main_content(browser.contents)
60 >>> print extract_text(main).encode('ascii', 'backslashreplace')
61+ Target to a milestone
62+ ...
63 Support Native SVG Objects
64 Select the milestone of Mozilla Firefox in which you would like
65 this feature to be implemented...
66@@ -109,7 +116,8 @@
67 Mozilla Firefox 1.0.9
68
69
70-=== Viewing blueprints targeted to a distribution ===
71+Viewing blueprints targeted to a distribution
72+---------------------------------------------
73
74 Let's use the Ubuntu distribution as an example. Users can see the list of
75 blueprints attached to Ubuntu Linux by following the "Blueprints" tab:
76@@ -123,7 +131,8 @@
77 Undefined...media-integrity-check...Discussion...Unknown
78
79
80-=== Viewing blueprints targeted to a distribution series ===
81+Viewing blueprints targeted to a distribution series
82+----------------------------------------------------
83
84 As before, it's possible to narrow down the list of blueprints to show only
85 those targeted to a given distribution series. Let's pick the Grumpy Groundhog
86@@ -175,6 +184,8 @@
87 >>> browser.getLink('media-integrity-check').click()
88 >>> browser.getLink('Target milestone').click()
89 >>> print extract_text(find_main_content(browser.contents))
90+ Target to a milestone
91+ ...
92 CD Media Integrity Check
93 Select the milestone of Ubuntu in which you would like this feature
94 to be implemented...
95@@ -182,7 +193,8 @@
96 >>> milestones = browser.getControl('Milestone')
97 >>> milestones.displayValue = ['Ubuntu drift-1']
98 >>> browser.getControl('Change').click()
99- >>> print extract_text(find_tag_by_id(browser.contents, 'milestone-target'))
100+ >>> print extract_text(
101+ ... find_tag_by_id(browser.contents, 'milestone-target'))
102 Milestone target: drift-1
103
104 Finally, the blueprint listing for Grumpy includes an entry for our chosen
105
106=== modified file 'lib/lp/blueprints/templates/specification-edit.pt'
107--- lib/lp/blueprints/templates/specification-edit.pt 2009-07-17 17:59:07 +0000
108+++ lib/lp/blueprints/templates/specification-edit.pt 2009-09-21 19:15:03 +0000
109@@ -2,13 +2,7 @@
110 xmlns="http://www.w3.org/1999/xhtml"
111 xmlns:tal="http://xml.zope.org/namespaces/tal"
112 xmlns:metal="http://xml.zope.org/namespaces/metal"
113- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
114- xml:lang="en"
115- lang="en"
116- dir="ltr"
117- metal:use-macro="context/@@main_template/master"
118- i18n:domain="launchpad"
119->
120+ metal:use-macro="view/macro:page/main_only">
121
122 <body>
123
124
125=== modified file 'lib/lp/blueprints/templates/specification-linkbug.pt'
126--- lib/lp/blueprints/templates/specification-linkbug.pt 2009-07-17 17:59:07 +0000
127+++ lib/lp/blueprints/templates/specification-linkbug.pt 2009-09-21 19:15:03 +0000
128@@ -2,20 +2,13 @@
129 xmlns="http://www.w3.org/1999/xhtml"
130 xmlns:tal="http://xml.zope.org/namespaces/tal"
131 xmlns:metal="http://xml.zope.org/namespaces/metal"
132- xml:lang="en"
133- lang="en"
134- dir="ltr"
135- metal:use-macro="context/@@main_template/master">
136+ metal:use-macro="view/macro:page/main_only">
137
138 <body>
139
140-<metal:leftportlets fill-slot="portlets_one">
141- <div tal:replace="structure context/@@+portlet-bugs" />
142-</metal:leftportlets>
143-
144 <div metal:fill-slot="main">
145
146- <div tal:content="structure context/fmt:link" />
147+ <div tal:content="structure context/fmt:link" />
148
149 <div metal:use-macro="context/@@launchpad_form/form">
150 <metal:heading fill-slot="heading">
151@@ -38,4 +31,3 @@
152 </div>
153 </body>
154 </html>
155-