Merge lp:~rockstar/launchpad/branches-code into lp:launchpad
- branches-code
- Merge into devel
Proposed by
Paul Hummer
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Curtis Hovey | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 10890 | ||||
Proposed branch: | lp:~rockstar/launchpad/branches-code | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
718 lines (+71/-69) 37 files modified
lib/canonical/launchpad/browser/launchpad.py (+1/-1) lib/canonical/launchpad/webapp/__init__.py (+2/-2) lib/lp/app/stories/launchpad-root/front-pages.txt (+2/-2) lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-bug-activity.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-bug-index.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-malone-homepage.txt (+1/-1) lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt (+1/-1) lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt (+2/-2) lib/lp/code/browser/branchlisting.py (+1/-1) lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+2/-2) lib/lp/code/stories/branches/xx-branch-deletion.txt (+1/-1) lib/lp/code/stories/branches/xx-branch-index.txt (+4/-4) lib/lp/code/stories/branches/xx-creating-branches.txt (+1/-1) lib/lp/code/stories/branches/xx-distribution-branches.txt (+1/-1) lib/lp/code/stories/branches/xx-distroseries-branches.txt (+1/-1) lib/lp/code/stories/branches/xx-person-branches.txt (+3/-3) lib/lp/code/stories/branches/xx-product-branches.txt (+1/-1) lib/lp/code/stories/branches/xx-project-branches.txt (+9/-7) lib/lp/registry/browser/person.py (+1/-1) lib/lp/registry/browser/personproduct.py (+1/-1) lib/lp/registry/browser/product.py (+1/-1) lib/lp/registry/browser/productseries.py (+1/-1) lib/lp/registry/browser/project.py (+1/-1) lib/lp/registry/stories/milestone/object-milestones.txt (+2/-2) lib/lp/registry/stories/productseries/xx-productseries-index.txt (+1/-1) lib/lp/registry/stories/team-polls/create-polls.txt (+1/-1) lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt (+3/-3) lib/lp/soyuz/stories/packaging/package-pages-navigation.txt (+10/-10) lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt (+3/-3) lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt (+1/-1) lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+1/-1) lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt (+1/-1) lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt (+1/-1) lib/lp/translations/stories/navigation-links/pofile.txt (+2/-2) lib/lp/translations/stories/navigation-links/pomsgset.txt (+2/-2) lib/lp/translations/stories/navigation-links/potemplate.txt (+2/-2) |
||||
To merge this branch: | bzr merge lp:~rockstar/launchpad/branches-code | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | Approve | ||
Review via email: mp+25249@code.launchpad.net |
Commit message
Description of the change
This branch just changes the "Branches" tabe to be the "Code" tab, and then
changes the breadcrumb as well. It's probably going to fail more tests, but
I'm 0/4 on ec2 runs of this branch, and the tests that I have fixed just
demonstrate how to fix those tests as well.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/canonical/launchpad/browser/launchpad.py' |
2 | --- lib/canonical/launchpad/browser/launchpad.py 2010-04-23 03:30:30 +0000 |
3 | +++ lib/canonical/launchpad/browser/launchpad.py 2010-05-19 05:50:57 +0000 |
4 | @@ -405,7 +405,7 @@ |
5 | |
6 | def branches(self): |
7 | target = '' |
8 | - text = 'Branches' |
9 | + text = 'Code' |
10 | summary = 'The Code Bazaar' |
11 | return Link(target, text, summary) |
12 | |
13 | |
14 | === modified file 'lib/canonical/launchpad/webapp/__init__.py' |
15 | --- lib/canonical/launchpad/webapp/__init__.py 2009-09-23 11:10:00 +0000 |
16 | +++ lib/canonical/launchpad/webapp/__init__.py 2010-05-19 05:50:57 +0000 |
17 | @@ -124,6 +124,6 @@ |
18 | def branches(self): |
19 | # this is disabled by default, because relatively few objects have |
20 | # branch views |
21 | - text = 'Branches' |
22 | - summary = 'View related branches of code' |
23 | + text = 'Code' |
24 | + summary = 'View related code' |
25 | return Link('', text, summary=summary) |
26 | |
27 | === modified file 'lib/lp/app/stories/launchpad-root/front-pages.txt' |
28 | --- lib/lp/app/stories/launchpad-root/front-pages.txt 2010-01-08 21:39:00 +0000 |
29 | +++ lib/lp/app/stories/launchpad-root/front-pages.txt 2010-05-19 05:50:57 +0000 |
30 | @@ -63,7 +63,7 @@ |
31 | >>> anon_browser.open('http://code.launchpad.dev/') |
32 | >>> print_location_apps(anon_browser.contents) |
33 | * Launchpad Home - http://launchpad.dev/ |
34 | - * Branches (selected) - http://code.launchpad.dev/ |
35 | + * Code (selected) - http://code.launchpad.dev/ |
36 | * Bugs - http://bugs.launchpad.dev/ |
37 | * Blueprints - http://blueprints.launchpad.dev/ |
38 | * Translations - http://translations.launchpad.dev/ |
39 | @@ -72,7 +72,7 @@ |
40 | >>> user_browser.open('http://answers.launchpad.dev/') |
41 | >>> print_location_apps(user_browser.contents) |
42 | * Launchpad Home - http://launchpad.dev/ |
43 | - * Branches - http://code.launchpad.dev/ |
44 | + * Code - http://code.launchpad.dev/ |
45 | * Bugs - http://bugs.launchpad.dev/ |
46 | * Blueprints - http://blueprints.launchpad.dev/ |
47 | * Translations - http://translations.launchpad.dev/ |
48 | |
49 | === modified file 'lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt' |
50 | --- lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt 2009-09-24 17:41:06 +0000 |
51 | +++ lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt 2010-05-19 05:50:57 +0000 |
52 | @@ -14,7 +14,7 @@ |
53 | Hierarchy: Ubuntu > ?mozilla-firefox? package > Bugs > Bug #1... |
54 | Tabs: |
55 | * Overview - http://launchpad.dev/ubuntu/+source/mozilla-firefox |
56 | - * Branches - http://code.launchpad.dev/ubuntu/+source/mozilla-firefox |
57 | + * Code - http://code.launchpad.dev/ubuntu/+source/mozilla-firefox |
58 | * Bugs (selected) - http://bugs.launchpad.dev/ubuntu/+source/mozilla-firefox |
59 | * Blueprints - not linked |
60 | * Translations - not linked |
61 | |
62 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt' |
63 | --- lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2010-01-19 21:33:16 +0000 |
64 | +++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2010-05-19 05:50:57 +0000 |
65 | @@ -14,7 +14,7 @@ |
66 | Hierarchy: Debian > ?mozilla-firefox? package > Bugs > Bug #3... |
67 | Tabs: |
68 | * Overview - http://launchpad.dev/debian/+source/mozilla-firefox |
69 | - * Branches - http://code.launchpad.dev/debian/+source/mozilla-firefox |
70 | + * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox |
71 | * Bugs (selected) - http://bugs.launchpad.dev/debian/+source/mozilla-firefox |
72 | * Blueprints - not linked |
73 | * Translations - not linked |
74 | |
75 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-index.txt' |
76 | --- lib/lp/bugs/stories/bugs/xx-bug-index.txt 2009-12-09 16:32:19 +0000 |
77 | +++ lib/lp/bugs/stories/bugs/xx-bug-index.txt 2010-05-19 05:50:57 +0000 |
78 | @@ -16,7 +16,7 @@ |
79 | Hierarchy: Debian > ?mozilla-firefox? package > Bug #2 (blackhole) |
80 | Tabs: |
81 | * Overview - http://launchpad.dev/debian/+source/mozilla-firefox |
82 | - * Branches - http://code.launchpad.dev/debian/+source/mozilla-firefox |
83 | + * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox |
84 | * Bugs (selected) - http://bugs.launchpad.dev/debian/+source/mozilla-firefox |
85 | * Blueprints - not linked |
86 | * Translations - not linked |
87 | |
88 | === modified file 'lib/lp/bugs/stories/bugs/xx-malone-homepage.txt' |
89 | --- lib/lp/bugs/stories/bugs/xx-malone-homepage.txt 2009-09-23 11:10:00 +0000 |
90 | +++ lib/lp/bugs/stories/bugs/xx-malone-homepage.txt 2010-05-19 05:50:57 +0000 |
91 | @@ -8,7 +8,7 @@ |
92 | Hierarchy: None displayed |
93 | Tabs: |
94 | * Launchpad Home - http://launchpad.dev/ |
95 | - * Branches - http://code.launchpad.dev/ |
96 | + * Code - http://code.launchpad.dev/ |
97 | * Bugs (selected) - http://bugs.launchpad.dev/ |
98 | * Blueprints - http://blueprints.launchpad.dev/ |
99 | * Translations - http://translations.launchpad.dev/ |
100 | |
101 | === modified file 'lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt' |
102 | --- lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt 2010-03-16 22:07:45 +0000 |
103 | +++ lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt 2010-05-19 05:50:57 +0000 |
104 | @@ -8,7 +8,7 @@ |
105 | Hierarchy: None displayed |
106 | Tabs: |
107 | * Launchpad Home - http://launchpad.dev/ |
108 | - * Branches - http://code.launchpad.dev/ |
109 | + * Code - http://code.launchpad.dev/ |
110 | * Bugs (selected) - http://bugs.launchpad.dev/ |
111 | * Blueprints - http://blueprints.launchpad.dev/ |
112 | * Translations - http://translations.launchpad.dev/ |
113 | |
114 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt' |
115 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2010-02-05 13:25:46 +0000 |
116 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2010-05-19 05:50:57 +0000 |
117 | @@ -17,7 +17,7 @@ |
118 | Hierarchy: Bug trackers > The Mozilla.org Bug Tracker |
119 | Tabs: |
120 | * Launchpad Home - http://launchpad.dev/ |
121 | - * Branches - http://code.launchpad.dev/ |
122 | + * Code - http://code.launchpad.dev/ |
123 | * Bugs (selected) - http://bugs.launchpad.dev/ |
124 | * Blueprints - http://blueprints.launchpad.dev/ |
125 | * Translations - http://translations.launchpad.dev/ |
126 | @@ -73,7 +73,7 @@ |
127 | Hierarchy: Bug trackers > The Mozilla.org Bug Tracker |
128 | Tabs: |
129 | * Launchpad Home - http://launchpad.dev/ |
130 | - * Branches - http://code.launchpad.dev/ |
131 | + * Code - http://code.launchpad.dev/ |
132 | * Bugs (selected) - http://bugs.launchpad.dev/ |
133 | * Blueprints - http://blueprints.launchpad.dev/ |
134 | * Translations - http://translations.launchpad.dev/ |
135 | |
136 | === modified file 'lib/lp/code/browser/branchlisting.py' |
137 | --- lib/lp/code/browser/branchlisting.py 2010-04-11 22:45:09 +0000 |
138 | +++ lib/lp/code/browser/branchlisting.py 2010-05-19 05:50:57 +0000 |
139 | @@ -96,7 +96,7 @@ |
140 | |
141 | class CodeVHostBreadcrumb(Breadcrumb): |
142 | rootsite = 'code' |
143 | - text = 'Branches' |
144 | + text = 'Code' |
145 | |
146 | |
147 | class BranchBadges(HasBadgeBase): |
148 | |
149 | === modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py' |
150 | --- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-05-17 17:40:32 +0000 |
151 | +++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-05-19 05:50:57 +0000 |
152 | @@ -404,7 +404,7 @@ |
153 | """Test the basic index page.""" |
154 | main_text = self.getMainText(self.makeBuild(), '+index') |
155 | self.assertTextMatchesExpressionIgnoreWhitespace("""\ |
156 | - Branches |
157 | + Code |
158 | my-recipe |
159 | Build status |
160 | Needs building |
161 | @@ -433,7 +433,7 @@ |
162 | main_text = self.getMainText( |
163 | release.source_package_recipe_build, '+index') |
164 | self.assertTextMatchesExpressionIgnoreWhitespace("""\ |
165 | - Branches |
166 | + Code |
167 | my-recipe |
168 | Build status |
169 | Successfully built |
170 | |
171 | === modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt' |
172 | --- lib/lp/code/stories/branches/xx-branch-deletion.txt 2009-12-24 01:41:54 +0000 |
173 | +++ lib/lp/code/stories/branches/xx-branch-deletion.txt 2010-05-19 05:50:57 +0000 |
174 | @@ -11,7 +11,7 @@ |
175 | >>> browser.getControl('Name').value = 'to-delete' |
176 | >>> browser.getControl('Register Branch').click() |
177 | >>> print browser.title |
178 | - to-delete : Branches : Mozilla Firefox |
179 | + to-delete : Code : Mozilla Firefox |
180 | |
181 | The newly created branch has an action 'Delete branch'. |
182 | |
183 | |
184 | === modified file 'lib/lp/code/stories/branches/xx-branch-index.txt' |
185 | --- lib/lp/code/stories/branches/xx-branch-index.txt 2010-05-11 03:16:42 +0000 |
186 | +++ lib/lp/code/stories/branches/xx-branch-index.txt 2010-05-19 05:50:57 +0000 |
187 | @@ -388,10 +388,10 @@ |
188 | >>> browser.open( |
189 | ... 'http://code.launchpad.dev/~name12/gnome-terminal/scanned') |
190 | >>> print_location(browser.contents) |
191 | - Hierarchy: GNOME Terminal > Branches > scanned |
192 | + Hierarchy: GNOME Terminal > Code > scanned |
193 | Tabs: |
194 | * Overview - http://launchpad.dev/gnome-terminal |
195 | - * Branches (selected) - http://code.launchpad.dev/gnome-terminal |
196 | + * Code (selected) - http://code.launchpad.dev/gnome-terminal |
197 | * Bugs - http://bugs.launchpad.dev/gnome-terminal |
198 | * Blueprints - http://blueprints.launchpad.dev/gnome-terminal |
199 | * Translations - http://translations.launchpad.dev/gnome-terminal |
200 | @@ -400,10 +400,10 @@ |
201 | |
202 | >>> browser.open('http://code.launchpad.dev/~name12/+junk/junk.dev') |
203 | >>> print_location(browser.contents) |
204 | - Hierarchy: Sample Person > Branches > junk.dev |
205 | + Hierarchy: Sample Person > Code > junk.dev |
206 | Tabs: |
207 | * Overview - http://launchpad.dev/~name12 |
208 | - * Branches (selected) - http://code.launchpad.dev/~name12 |
209 | + * Code (selected) - http://code.launchpad.dev/~name12 |
210 | * Bugs - http://bugs.launchpad.dev/~name12 |
211 | * Blueprints - http://blueprints.launchpad.dev/~name12 |
212 | * Translations - http://translations.launchpad.dev/~name12 |
213 | |
214 | === modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt' |
215 | --- lib/lp/code/stories/branches/xx-creating-branches.txt 2010-04-12 23:10:39 +0000 |
216 | +++ lib/lp/code/stories/branches/xx-creating-branches.txt 2010-05-19 05:50:57 +0000 |
217 | @@ -190,7 +190,7 @@ |
218 | >>> browser.getControl('Experimental').click() |
219 | >>> browser.getControl('Register Branch').click() |
220 | >>> print browser.title |
221 | - master : Branches : GNOME Terminal |
222 | + master : Code : GNOME Terminal |
223 | |
224 | |
225 | == Finding person/+addbranch == |
226 | |
227 | === modified file 'lib/lp/code/stories/branches/xx-distribution-branches.txt' |
228 | --- lib/lp/code/stories/branches/xx-distribution-branches.txt 2009-09-23 14:35:05 +0000 |
229 | +++ lib/lp/code/stories/branches/xx-distribution-branches.txt 2010-05-19 05:50:57 +0000 |
230 | @@ -23,7 +23,7 @@ |
231 | |
232 | >>> print_location_apps(browser.contents) |
233 | * Overview (selected) ... |
234 | - * Branches - http://code.launchpad.dev/mint |
235 | + * Code - http://code.launchpad.dev/mint |
236 | ... |
237 | |
238 | Going to this page shows us a listing ordered by most recently changed first. |
239 | |
240 | === modified file 'lib/lp/code/stories/branches/xx-distroseries-branches.txt' |
241 | --- lib/lp/code/stories/branches/xx-distroseries-branches.txt 2009-09-23 14:35:05 +0000 |
242 | +++ lib/lp/code/stories/branches/xx-distroseries-branches.txt 2010-05-19 05:50:57 +0000 |
243 | @@ -23,7 +23,7 @@ |
244 | |
245 | >>> print_location_apps(browser.contents) |
246 | * Overview (selected) ... |
247 | - * Branches - http://code.launchpad.dev/mint/stable |
248 | + * Code - http://code.launchpad.dev/mint/stable |
249 | ... |
250 | |
251 | Going to this page shows us a listing of all branches associated with that |
252 | |
253 | === modified file 'lib/lp/code/stories/branches/xx-person-branches.txt' |
254 | --- lib/lp/code/stories/branches/xx-person-branches.txt 2010-04-20 03:11:26 +0000 |
255 | +++ lib/lp/code/stories/branches/xx-person-branches.txt 2010-05-19 05:50:57 +0000 |
256 | @@ -9,7 +9,7 @@ |
257 | >>> browser = setupBrowser(auth='Basic test@canonical.com:test') |
258 | >>> browser.open('http://code.launchpad.dev/~name12') |
259 | >>> print browser.title |
260 | - Branches : Sample Person |
261 | + Code : Sample Person |
262 | |
263 | The heading in the main content is the same as the page title text. |
264 | |
265 | @@ -54,7 +54,7 @@ |
266 | >>> browser.open('http://code.launchpad.dev/~name12') |
267 | >>> browser.getLink('registered').click() |
268 | >>> print browser.title |
269 | - Registered : Branches : Sample Person |
270 | + Registered : Code : Sample Person |
271 | >>> table = find_tag_by_id(browser.contents, 'branchtable') |
272 | >>> for row in table.tbody.fetch('tr'): |
273 | ... print extract_text(row) |
274 | @@ -71,7 +71,7 @@ |
275 | >>> browser.open('http://code.launchpad.dev/~name12') |
276 | >>> browser.getLink('subscribed').click() |
277 | >>> print browser.title |
278 | - Subscribed : Branches : Sample Person |
279 | + Subscribed : Code : Sample Person |
280 | >>> table = find_tag_by_id(browser.contents, 'branchtable') |
281 | >>> for row in table.tbody.fetch('tr'): |
282 | ... print extract_text(row) |
283 | |
284 | === modified file 'lib/lp/code/stories/branches/xx-product-branches.txt' |
285 | --- lib/lp/code/stories/branches/xx-product-branches.txt 2010-04-01 13:31:28 +0000 |
286 | +++ lib/lp/code/stories/branches/xx-product-branches.txt 2010-05-19 05:50:57 +0000 |
287 | @@ -29,7 +29,7 @@ |
288 | |
289 | >>> browser.open('http://code.launchpad.dev/applets') |
290 | >>> print browser.title |
291 | - Branches : Gnome Applets |
292 | + Code : Gnome Applets |
293 | |
294 | If there are not any branches, a helpful message is shown. |
295 | |
296 | |
297 | === modified file 'lib/lp/code/stories/branches/xx-project-branches.txt' |
298 | --- lib/lp/code/stories/branches/xx-project-branches.txt 2010-04-16 15:06:55 +0000 |
299 | +++ lib/lp/code/stories/branches/xx-project-branches.txt 2010-05-19 05:50:57 +0000 |
300 | @@ -1,4 +1,5 @@ |
301 | -= ProjectGroup Branches Overview = |
302 | +ProjectGroup Branches Overview |
303 | +============================== |
304 | |
305 | >>> from lp.code.tests.branch_helper import ( |
306 | ... reset_all_branch_last_modified) |
307 | @@ -8,12 +9,13 @@ |
308 | ProjectGroups link their branch listing page. |
309 | |
310 | >>> browser.open('http://launchpad.dev/mozilla') |
311 | - >>> browser.getLink('Branches').click() |
312 | + >>> browser.getLink('Code').click() |
313 | >>> print browser.title |
314 | - Branches : the Mozilla Project |
315 | - |
316 | - |
317 | -== Default page for code site == |
318 | + Code : the Mozilla Project |
319 | + |
320 | + |
321 | +Default page for code site |
322 | +========================== |
323 | |
324 | When going directly to a project on the code rootsite for launchpad, |
325 | the branch listing is the default page shown. |
326 | @@ -35,7 +37,7 @@ |
327 | |
328 | >>> browser.open('http://code.launchpad.dev/aaa') |
329 | >>> print browser.title |
330 | - Branches : the Test Project |
331 | + Code : the Test Project |
332 | >>> message = find_tag_by_id(browser.contents, 'no-branch-message') |
333 | >>> print extract_text(message) |
334 | There are no branches registered for the Test Project in Launchpad... |
335 | |
336 | === modified file 'lib/lp/registry/browser/person.py' |
337 | --- lib/lp/registry/browser/person.py 2010-05-11 12:31:49 +0000 |
338 | +++ lib/lp/registry/browser/person.py 2010-05-19 05:50:57 +0000 |
339 | @@ -729,7 +729,7 @@ |
340 | return Link('', text, summary) |
341 | |
342 | def branches(self): |
343 | - text = 'Branches' |
344 | + text = 'Code' |
345 | summary = ('Bazaar Branches and revisions registered and authored ' |
346 | 'by %s' % self.context.displayname) |
347 | return Link('', text, summary) |
348 | |
349 | === modified file 'lib/lp/registry/browser/personproduct.py' |
350 | --- lib/lp/registry/browser/personproduct.py 2010-02-16 20:36:48 +0000 |
351 | +++ lib/lp/registry/browser/personproduct.py 2010-05-19 05:50:57 +0000 |
352 | @@ -59,7 +59,7 @@ |
353 | enable_only = ['branches'] |
354 | |
355 | def branches(self): |
356 | - text = 'Branches' |
357 | + text = 'Code' |
358 | summary = ('Bazaar Branches of %s owned by %s' % |
359 | (self.context.product.displayname, |
360 | self.context.person.displayname)) |
361 | |
362 | === modified file 'lib/lp/registry/browser/product.py' |
363 | --- lib/lp/registry/browser/product.py 2010-05-17 13:20:00 +0000 |
364 | +++ lib/lp/registry/browser/product.py 2010-05-19 05:50:57 +0000 |
365 | @@ -323,7 +323,7 @@ |
366 | return Link('', text, summary) |
367 | |
368 | def branches(self): |
369 | - text = 'Branches' |
370 | + text = 'Code' |
371 | summary = 'Branches for %s' % self.context.displayname |
372 | return Link('', text, summary) |
373 | |
374 | |
375 | === modified file 'lib/lp/registry/browser/productseries.py' |
376 | --- lib/lp/registry/browser/productseries.py 2010-05-03 18:28:16 +0000 |
377 | +++ lib/lp/registry/browser/productseries.py 2010-05-19 05:50:57 +0000 |
378 | @@ -166,7 +166,7 @@ |
379 | def branches(self): |
380 | """Return a link to view the branches related to this series.""" |
381 | # Override to go to the branches for the product. |
382 | - text = 'Branches' |
383 | + text = 'Code' |
384 | summary = 'View related branches of code' |
385 | link = canonical_url(self.context.product, rootsite='code') |
386 | return Link(link, text, summary=summary) |
387 | |
388 | === modified file 'lib/lp/registry/browser/project.py' |
389 | --- lib/lp/registry/browser/project.py 2010-02-17 12:13:47 +0000 |
390 | +++ lib/lp/registry/browser/project.py 2010-05-19 05:50:57 +0000 |
391 | @@ -134,7 +134,7 @@ |
392 | 'answers', 'translations'] |
393 | |
394 | def branches(self): |
395 | - text = 'Branches' |
396 | + text = 'Code' |
397 | return Link('', text, enabled=self.context.hasProducts()) |
398 | |
399 | def bugs(self): |
400 | |
401 | === modified file 'lib/lp/registry/stories/milestone/object-milestones.txt' |
402 | --- lib/lp/registry/stories/milestone/object-milestones.txt 2010-04-19 08:11:52 +0000 |
403 | +++ lib/lp/registry/stories/milestone/object-milestones.txt 2010-05-19 05:50:57 +0000 |
404 | @@ -155,7 +155,7 @@ |
405 | Hierarchy: Mozilla Firefox > 1.0 |
406 | Tabs: |
407 | * Overview (selected) - http://launchpad.dev/firefox |
408 | - * Branches - http://code.launchpad.dev/firefox |
409 | + * Code - http://code.launchpad.dev/firefox |
410 | * Bugs - http://bugs.launchpad.dev/firefox |
411 | * Blueprints - http://blueprints.launchpad.dev/firefox |
412 | * Translations - http://translations.launchpad.dev/firefox |
413 | @@ -173,7 +173,7 @@ |
414 | Hierarchy: Debian > 3.1 |
415 | Tabs: |
416 | * Overview (selected) - http://launchpad.dev/debian |
417 | - * Branches - http://code.launchpad.dev/debian |
418 | + * Code - http://code.launchpad.dev/debian |
419 | * Bugs - http://bugs.launchpad.dev/debian |
420 | * Blueprints - http://blueprints.launchpad.dev/debian |
421 | * Translations - http://translations.launchpad.dev/debian |
422 | |
423 | === modified file 'lib/lp/registry/stories/productseries/xx-productseries-index.txt' |
424 | --- lib/lp/registry/stories/productseries/xx-productseries-index.txt 2010-05-03 18:44:42 +0000 |
425 | +++ lib/lp/registry/stories/productseries/xx-productseries-index.txt 2010-05-19 05:50:57 +0000 |
426 | @@ -152,4 +152,4 @@ |
427 | <Link ... url='http://code.launchpad.dev/evolution/+addbranch'> |
428 | >>> user_browser.getLink('Submit code').click() |
429 | >>> print user_browser.title |
430 | - Register a branch : Branches : Evolution |
431 | + Register a branch : Code : Evolution |
432 | |
433 | === modified file 'lib/lp/registry/stories/team-polls/create-polls.txt' |
434 | --- lib/lp/registry/stories/team-polls/create-polls.txt 2009-11-19 16:02:26 +0000 |
435 | +++ lib/lp/registry/stories/team-polls/create-polls.txt 2010-05-19 05:50:57 +0000 |
436 | @@ -114,7 +114,7 @@ |
437 | Hierarchy: ?Ubuntu Team? team > Debian Project Leader Election 2080 |
438 | Tabs: |
439 | * Overview (selected) - http://launchpad.dev/~ubuntu-team |
440 | - * Branches - http://code.launchpad.dev/~ubuntu-team |
441 | + * Code - http://code.launchpad.dev/~ubuntu-team |
442 | * Bugs - http://bugs.launchpad.dev/~ubuntu-team |
443 | * Blueprints - http://blueprints.launchpad.dev/~ubuntu-team |
444 | * Translations - http://translations.launchpad.dev/~ubuntu-team |
445 | |
446 | === modified file 'lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt' |
447 | --- lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt 2010-05-18 14:07:45 +0000 |
448 | +++ lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt 2010-05-19 05:50:57 +0000 |
449 | @@ -215,7 +215,7 @@ |
450 | Hierarchy: Ubuntu > ?iceweasel? package |
451 | Tabs: |
452 | * Overview (selected) - not linked |
453 | - * Branches - http://code.launchpad.dev/ubuntu/+source/iceweasel |
454 | + * Code - http://code.launchpad.dev/ubuntu/+source/iceweasel |
455 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/iceweasel |
456 | * Blueprints - not linked |
457 | * Translations - not linked |
458 | @@ -407,7 +407,7 @@ |
459 | Hierarchy: Ubuntu > ?foobar? package > Change log |
460 | Tabs: |
461 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/foobar |
462 | - * Branches - http://code.launchpad.dev/ubuntu/+source/foobar |
463 | + * Code - http://code.launchpad.dev/ubuntu/+source/foobar |
464 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/foobar |
465 | * Blueprints - not linked |
466 | * Translations - not linked |
467 | @@ -600,7 +600,7 @@ |
468 | Hierarchy: Ubuntu > ?alsa-utils? package > Publishing history |
469 | Tabs: |
470 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
471 | - * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
472 | + * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
473 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
474 | * Blueprints - not linked |
475 | * Translations - not linked |
476 | |
477 | === modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt' |
478 | --- lib/lp/soyuz/stories/packaging/package-pages-navigation.txt 2010-03-08 13:07:07 +0000 |
479 | +++ lib/lp/soyuz/stories/packaging/package-pages-navigation.txt 2010-05-19 05:50:57 +0000 |
480 | @@ -22,7 +22,7 @@ |
481 | Hierarchy: Ubuntu > ?alsa-utils? package |
482 | Tabs: |
483 | * Overview (selected) - not linked |
484 | - * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
485 | + * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
486 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
487 | * Blueprints - not linked |
488 | * Translations - not linked |
489 | @@ -34,7 +34,7 @@ |
490 | Hierarchy: Ubuntu > ?alsa-utils? package > Bugs |
491 | Tabs: |
492 | * Overview - http://launchpad.dev/ubuntu/+source/alsa-utils |
493 | - * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
494 | + * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
495 | * Bugs (selected) - not linked |
496 | * Blueprints - not linked |
497 | * Translations - not linked |
498 | @@ -55,7 +55,7 @@ |
499 | Hierarchy: Ubuntu > ?alsa-utils? package > 1.0.9a-4ubuntu1 |
500 | Tabs: |
501 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
502 | - * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
503 | + * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
504 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
505 | * Blueprints - not linked |
506 | * Translations - not linked |
507 | @@ -77,7 +77,7 @@ |
508 | Hierarchy: Ubuntu > ?alsa-utils? package > 1.0.9a-4ubuntu1 > i386 build |
509 | Tabs: |
510 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
511 | - * Branches - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
512 | + * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
513 | * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils |
514 | * Blueprints - not linked |
515 | * Translations - not linked |
516 | @@ -96,7 +96,7 @@ |
517 | Hierarchy: Ubuntu > Hoary (5.04) > ?alsa-utils? source package |
518 | Tabs: |
519 | * Overview (selected) - not linked |
520 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
521 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
522 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
523 | * Blueprints - not linked |
524 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
525 | @@ -112,7 +112,7 @@ |
526 | Hierarchy: Ubuntu > Hoary (5.04) > ?alsa-utils? source package > Questions |
527 | Tabs: |
528 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils |
529 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
530 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
531 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
532 | * Blueprints - not linked |
533 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
534 | @@ -134,7 +134,7 @@ |
535 | Hierarchy: Ubuntu > Hoary (5.04) > ?alsa-utils? source package |
536 | Tabs: |
537 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils |
538 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
539 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
540 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
541 | * Blueprints - not linked |
542 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/alsa-utils |
543 | @@ -153,7 +153,7 @@ |
544 | Hierarchy: Ubuntu > Hoary (5.04) > i386 |
545 | Tabs: |
546 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary |
547 | - * Branches - http://code.launchpad.dev/ubuntu/hoary |
548 | + * Code - http://code.launchpad.dev/ubuntu/hoary |
549 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary |
550 | * Blueprints - http://blueprints.launchpad.dev/ubuntu/hoary |
551 | * Translations - http://translations.launchpad.dev/ubuntu/hoary |
552 | @@ -171,7 +171,7 @@ |
553 | Hierarchy: Ubuntu > Hoary (5.04) > i386 > pmount |
554 | Tabs: |
555 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary |
556 | - * Branches - http://code.launchpad.dev/ubuntu/hoary |
557 | + * Code - http://code.launchpad.dev/ubuntu/hoary |
558 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary |
559 | * Blueprints - http://blueprints.launchpad.dev/ubuntu/hoary |
560 | * Translations - http://translations.launchpad.dev/ubuntu/hoary |
561 | @@ -190,7 +190,7 @@ |
562 | Hierarchy: Ubuntu > Hoary (5.04) > i386 > pmount > 0.1-1 |
563 | Tabs: |
564 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary |
565 | - * Branches - http://code.launchpad.dev/ubuntu/hoary |
566 | + * Code - http://code.launchpad.dev/ubuntu/hoary |
567 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary |
568 | * Blueprints - http://blueprints.launchpad.dev/ubuntu/hoary |
569 | * Translations - http://translations.launchpad.dev/ubuntu/hoary |
570 | |
571 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt' |
572 | --- lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt 2010-03-08 09:27:36 +0000 |
573 | +++ lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt 2010-05-19 05:50:57 +0000 |
574 | @@ -51,7 +51,7 @@ |
575 | Hierarchy: Celso Providelo > PPA for Celso Providelo |
576 | Tabs: |
577 | * Overview (selected) - http://launchpad.dev/~cprov |
578 | - * Branches - http://code.launchpad.dev/~cprov |
579 | + * Code - http://code.launchpad.dev/~cprov |
580 | * Bugs - http://bugs.launchpad.dev/~cprov |
581 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
582 | * Translations - http://translations.launchpad.dev/~cprov |
583 | @@ -72,7 +72,7 @@ |
584 | Hierarchy: Celso Providelo > Default PPA |
585 | Tabs: |
586 | * Overview (selected) - http://launchpad.dev/~cprov |
587 | - * Branches - http://code.launchpad.dev/~cprov |
588 | + * Code - http://code.launchpad.dev/~cprov |
589 | * Bugs - http://bugs.launchpad.dev/~cprov |
590 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
591 | * Translations - http://translations.launchpad.dev/~cprov |
592 | @@ -117,7 +117,7 @@ |
593 | Hierarchy: Celso Providelo > Default PPA > i386 build of iceweasel 1.0 |
594 | Tabs: |
595 | * Overview (selected) - http://launchpad.dev/~cprov |
596 | - * Branches - http://code.launchpad.dev/~cprov |
597 | + * Code - http://code.launchpad.dev/~cprov |
598 | * Bugs - http://bugs.launchpad.dev/~cprov |
599 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
600 | * Translations - http://translations.launchpad.dev/~cprov |
601 | |
602 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt' |
603 | --- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2010-04-28 17:16:30 +0000 |
604 | +++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt 2010-05-19 05:50:57 +0000 |
605 | @@ -23,7 +23,7 @@ |
606 | Hierarchy: Celso Providelo > PPA for Celso Providelo > Packages in... |
607 | Tabs: |
608 | * Overview (selected) - http://launchpad.dev/~cprov |
609 | - * Branches - http://code.launchpad.dev/~cprov |
610 | + * Code - http://code.launchpad.dev/~cprov |
611 | * Bugs - http://bugs.launchpad.dev/~cprov |
612 | * Blueprints - http://blueprints.launchpad.dev/~cprov |
613 | * Translations - http://translations.launchpad.dev/~cprov |
614 | |
615 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt' |
616 | --- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-04-09 15:46:09 +0000 |
617 | +++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-05-19 05:50:57 +0000 |
618 | @@ -8,7 +8,7 @@ |
619 | Hierarchy: Ubuntu > Personal Package Archives |
620 | Tabs: |
621 | * Overview (selected) - http://launchpad.dev/ubuntu |
622 | - * Branches - http://code.launchpad.dev/ubuntu |
623 | + * Code - http://code.launchpad.dev/ubuntu |
624 | * Bugs - http://bugs.launchpad.dev/ubuntu |
625 | * Blueprints - http://blueprints.launchpad.dev/ubuntu |
626 | * Translations - http://translations.launchpad.dev/ubuntu |
627 | |
628 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt' |
629 | --- lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2010-03-08 13:07:07 +0000 |
630 | +++ lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2010-05-19 05:50:57 +0000 |
631 | @@ -48,7 +48,7 @@ |
632 | Hierarchy: ubuntutest > ?testing-dspr? package > 1.0 |
633 | Tabs: |
634 | * Overview (selected) - http://launchpad.dev/ubuntutest/+source/testing-dspr |
635 | - * Branches - http://code.launchpad.dev/ubuntutest/+source/testing-dspr |
636 | + * Code - http://code.launchpad.dev/ubuntutest/+source/testing-dspr |
637 | * Bugs - http://bugs.launchpad.dev/ubuntutest/+source/testing-dspr |
638 | * Blueprints - not linked |
639 | * Translations - not linked |
640 | |
641 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt' |
642 | --- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2010-03-06 21:05:16 +0000 |
643 | +++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2010-05-19 05:50:57 +0000 |
644 | @@ -8,7 +8,7 @@ |
645 | Hierarchy: Ubuntu > Hoary (5.04) > ...pmount... source package > Change log |
646 | Tabs: |
647 | * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/pmount |
648 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/pmount |
649 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/pmount |
650 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/pmount |
651 | * Blueprints - not linked |
652 | * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/pmount |
653 | |
654 | === modified file 'lib/lp/translations/stories/navigation-links/pofile.txt' |
655 | --- lib/lp/translations/stories/navigation-links/pofile.txt 2009-09-23 11:10:00 +0000 |
656 | +++ lib/lp/translations/stories/navigation-links/pofile.txt 2010-05-19 05:50:57 +0000 |
657 | @@ -15,7 +15,7 @@ |
658 | |
659 | >>> print_location_apps(admin_browser.contents) |
660 | * Overview - http://launchpad.dev/evolution/trunk |
661 | - * Branches - http://code.launchpad.dev/evolution |
662 | + * Code - http://code.launchpad.dev/evolution |
663 | * Bugs - http://bugs.launchpad.dev/evolution/trunk |
664 | * Blueprints - http://blueprints.launchpad.dev/evolution/trunk |
665 | * Translations (selected) - http://translations.launchpad.dev/evolution/trunk |
666 | @@ -33,7 +33,7 @@ |
667 | |
668 | >>> print_location_apps(admin_browser.contents) |
669 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/evolution |
670 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
671 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
672 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/evolution |
673 | * Blueprints - not linked |
674 | * Translations (selected) - http://translations.launchpad.dev/ubuntu/hoary/+source/evolution |
675 | |
676 | === modified file 'lib/lp/translations/stories/navigation-links/pomsgset.txt' |
677 | --- lib/lp/translations/stories/navigation-links/pomsgset.txt 2009-09-23 11:10:00 +0000 |
678 | +++ lib/lp/translations/stories/navigation-links/pomsgset.txt 2010-05-19 05:50:57 +0000 |
679 | @@ -17,7 +17,7 @@ |
680 | |
681 | >>> print_location_apps(browser.contents) |
682 | * Overview - http://launchpad.dev/evolution/trunk |
683 | - * Branches - http://code.launchpad.dev/evolution |
684 | + * Code - http://code.launchpad.dev/evolution |
685 | * Bugs - http://bugs.launchpad.dev/evolution/trunk |
686 | * Blueprints - http://blueprints.launchpad.dev/evolution/trunk |
687 | * Translations (selected) - http://translations.launchpad.dev/evolution/trunk |
688 | @@ -39,7 +39,7 @@ |
689 | |
690 | >>> print_location_apps(browser.contents) |
691 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/evolution |
692 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
693 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
694 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/evolution |
695 | * Blueprints - not linked |
696 | * Translations (selected) - http://translations.launchpad.dev/ubuntu/hoary/+source/evolution |
697 | |
698 | === modified file 'lib/lp/translations/stories/navigation-links/potemplate.txt' |
699 | --- lib/lp/translations/stories/navigation-links/potemplate.txt 2009-09-23 11:10:00 +0000 |
700 | +++ lib/lp/translations/stories/navigation-links/potemplate.txt 2010-05-19 05:50:57 +0000 |
701 | @@ -13,7 +13,7 @@ |
702 | |
703 | >>> print_location_apps(admin_browser.contents) |
704 | * Overview - http://launchpad.dev/evolution/trunk |
705 | - * Branches - http://code.launchpad.dev/evolution |
706 | + * Code - http://code.launchpad.dev/evolution |
707 | * Bugs - http://bugs.launchpad.dev/evolution/trunk |
708 | * Blueprints - http://blueprints.launchpad.dev/evolution/trunk |
709 | * Translations (selected) - http://translations.launchpad.dev/evolution/trunk |
710 | @@ -31,7 +31,7 @@ |
711 | |
712 | >>> print_location_apps(admin_browser.contents) |
713 | * Overview - http://launchpad.dev/ubuntu/hoary/+source/evolution |
714 | - * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
715 | + * Code - http://code.launchpad.dev/ubuntu/hoary/+source/evolution |
716 | * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/evolution |
717 | * Blueprints - not linked |
718 | * Translations (selected) - http://translations.launchpad.dev/ubuntu/hoary/+source/evolution |
Thanks for working on this.
We discusses the inconsistencies in link summaries (tooltips) as realted to bug 211117. You have my premission to fix any that you see are odd or missing in your branch.