Launchpad itself

Merge lp:~sinzui/launchpad/front-page-footer-0 into lp:launchpad

  1. front-page-footer-0
  2. Merge into devel
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 11001
Proposed branch: lp:~sinzui/launchpad/front-page-footer-0
Merge into: lp:launchpad
Diff against target: 915 lines (+197/-191)
15 files modified
lib/canonical/launchpad/icing/icon-sprites.positioning (+26/-22)
lib/canonical/launchpad/icing/style-3-0.css.in (+4/-0)
lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt (+4/-13)
lib/lp/app/browser/tests/base-layout.txt (+61/-81)
lib/lp/app/templates/base-layout-macros.pt (+1/-3)
lib/lp/app/templates/base-layout.pt (+9/-11)
lib/lp/app/templates/root-index.pt (+66/-42)
lib/lp/blueprints/stories/blueprints/05-reviews.txt (+3/-3)
lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt (+8/-4)
lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt (+2/-1)
lib/lp/code/templates/bazaar-index.pt (+2/-2)
lib/lp/registry/stories/milestone/object-milestones.txt (+4/-2)
lib/lp/registry/stories/product/xx-product-add.txt (+2/-2)
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-pofile-translate.txt (+4/-4)
To merge this branch: bzr merge lp:~sinzui/launchpad/front-page-footer-0
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+27311@code.launchpad.net

Description of the change

This is my branch to fix some template and front page issues.

    lp:~sinzui/launchpad/front-page-footer-0
    Diff size: 528
    Launchpad bug:
          https://bugs.launchpad.net/bugs/321783
          https://bugs.launchpad.net/bugs/592324
          https://bugs.launchpad.net/bugs/590575
          https://bugs.launchpad.net/bugs/590621
          https://bugs.launchpad.net/bugs/524305
    Test command: ./bin/test -vv \
          -t base-layout.txt -t front-pages.txt -t xx-featuredprojects
    Pre-implementation: flacoste, jtv
    Target release: 10.06

Fix some template and front page issues
----------------------------------------

Bug #321783 ["Contact us" should be "Contact Launchpad Support"]
    The footer of each Launchpad page has a contact link labeled "Contact us".
    To the casual visitor it is not obvious, who "us" is and if he/she is
    viewing a project's/distribution's page he/she might well think "us" is
    the project/distribution maintainer.

Bug #592324 [remove launchpad release version from the footer]
    The launchpad release version is not helpful in the footer. Most servers
    have revisions after the stated version. Even lpnet has revisions after
    the stated version. Developers and testers need to use the revision
    number, which is already in the page. Remove release version.

Bug #590575 [Launchpad main page has old bazaar homepage link]
    Launchpad main page (https://launchpad.net/) used http://bazaar-vcs.org/
    for bazaar home page instead of http://bazaar.canonical.com/

Bug #590621 [Complete the conversion to sprites]
    Common pages are using <img> tags instead of sprites which have poor
    performance.

Bug #524305 [Notification leaves header cloven in two]
    Notifications split the 3.0 header from the page title.

Rules
-----

Bug #321783 ["Contact us" should be "Contact Launchpad Support"]
    * It should be "Contact Launchpad Support". The important information
      here is that this is support for Launchpad.

Bug #592324 [remove launchpad release version from the footer]
    * Delete the text and link.

Bug #590575 [Launchpad main page has old bazaar homepage link]
    * Update all occurrences of http://bazaar-vcs.org/ to
      http://bazaar.canonical.com/

Bug #590621 [Complete the conversion to sprites]
    * Update the Lp front page. It is the only page in lp/app that needs
      fixing.

Bug #524305 [Notification leaves header cloven in two]
    * Move the site message and notification block belove the bread crumbs.

QA
--

Bug #321783 ["Contact us" should be "Contact Launchpad Support"]
    * Visit edge.
    * Verify the page has a link to "Contact Launchpad Support" in the
      footer.

Bug #592324 [remove launchpad release version from the footer]
    * Visit edge.
    * Verify 10.05 is not listed in the footer.

Bug #590575 [Launchpad main page has old bazaar homepage link]
    * Visit http://edge.launchpad.net/ as an anonymous user.
    * Verify that the link the the bzr home page is
      http://bazaar.canonical.com/
    * Visit http://code.edge.launchpad.net/ as an anonymous user.
    * Verify that the link the the bzr home page is
      http://bazaar.canonical.com/

Bug #590621 [Complete the conversion to sprites]
    * Visit http://edge.launchpad.net/ as an anonymous user.
    * Verify that the Lp features section has the correct sprites for
      the links.
    * Visit http://edge.launchpad.net/ while logged in.
    * Verify that the get started links have the correct sprites.
    * Verify that we ask users to "Register a <project|team>"...we do
      not care if it is new, and we love upstream teams and projects as
      much as those hosted on Lp.
    * Verify the feature project logo and displayname are shown.

Bug #524305 [Notification leaves header cloven in two]
    * Visit a project series.
    * Chose the subscribe link and subscribe/unsubscribe yourself
    * Verify the notification is below the bread crumbs above the page
      content.

Lint
----

Linting changed files:
  lib/canonical/launchpad/icing/style-3-0.css.in
  lib/lp/app/browser/tests/base-layout.txt
  lib/lp/app/templates/base-layout-macros.pt
  lib/lp/app/templates/base-layout.pt
  lib/lp/app/templates/root-index.pt
  lib/lp/code/templates/bazaar-index.pt

Test
----

    * lib/lp/app/browser/tests/base-layout.txt
      * Refactors the fragment tests to be more precise about what is under
        test.
      * Updated the footer test to verify that the Contact Launchpad Support
        link is in the footer.
      * Added a test for the position of notifications.

Implementation
--------------

Linting changed files:
    * lib/canonical/launchpad/icing/style-3-0.css.in
      * Added a tour sprite rule. We will need to add add it to the sprite
        file in the near future.
    * lib/lp/app/templates/base-layout-macros.pt
      * Updated the test for the feedback link to Contact Launchpad Support
      * Removed the link to the LaunchpadReleases version.
    * lib/lp/app/templates/base-layout.pt
      * Moved the position of the notifications to be between the breadcrumbs
        and page content.
    * lib/lp/app/templates/root-index.pt
      * Replaced the link icons with sprites.
      * Fixed the link to bazaar.canonical.com
    * lib/lp/code/templates/bazaar-index.pt
      * Fixed the links to bazaar.canonical.com

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) wrote :
Download full text (3.2 KiB)

Hi Curtis,

a nice branch. I have just two nitpicks, see below.

> === modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
> --- lib/canonical/launchpad/icing/style-3-0.css.in 2010-06-07 21:48:06 +0000
> +++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-06-10 22:20:48 +0000
> @@ -1785,6 +1785,10 @@
> */
> padding:2px 0 0 18px;
> }
> +.tour {
> + background-image: url(/@@/tour-icon); /* needs-ref: */
> + background-repeat: no-repeat;
> + }

I think "needs-ref" above is worth an XXX.

> === modified file 'lib/lp/app/templates/root-index.pt'
> --- lib/lp/app/templates/root-index.pt 2010-04-29 13:22:29 +0000
> +++ lib/lp/app/templates/root-index.pt 2010-06-10 22:20:48 +0000
> @@ -89,27 +89,42 @@
> tal:condition="not:view/user" tal:content="cache:anonymous">
> <h2><span class="launchpad-gold">Launchpad</span> is a software collaboration platform that provides:</h2>
> <ul tal:define="apphomes view/apphomes">
> - <li><a tal:attributes="href apphomes/bugs"><img src="/@@/bug" alt="" /></a>
> - <a tal:attributes="href apphomes/bugs">Bug tracking</a></li>
> - <li><a tal:attributes="href apphomes/code"><img src="/@@/branch" alt="" /></a>
> - <a tal:attributes="href apphomes/code">Code hosting</a>
> - using <a href="http://bazaar-vcs.org/">Bazaar</a></li>
> - <li><a href="https://help.launchpad.net/Code/Review"><img src="/@@/yes" alt="" /></a>
> - <a href="https://help.launchpad.net/Code/Review">Code reviews</a></li>
> - <li><a tal:attributes="href apphomes/ubuntu"><img src="/@@/ubuntu-icon" alt="" /></a>
> - <a tal:attributes="href apphomes/ubuntu">Ubuntu package building and hosting</a></li>
> - <li><a tal:attributes="href apphomes/translations"><img src="/@@/translation" alt="" /></a>
> - <a tal:attributes="href apphomes/translations">Translations</a></li>
> - <li><a href="https://help.launchpad.net/Teams/MailingLists"><img src="/@@/mail" alt="" /></a>
> - <a href="https://help.launchpad.net/Teams/MailingLists">Mailing lists</a></li>
> - <li><a tal:attributes="href apphomes/answers"><img src="/@@/question" alt="" /></a>
> - <a tal:attributes="href apphomes/answers">Answer tracking and FAQs</a></li>
> - <li><a tal:attributes="href apphomes/blueprints"><img src="/@@/blueprint" alt="" /></a>
> - <a tal:attributes="href apphomes/blueprints">Specification tracking</a></li>
> + <li>
> + <a class="sprite bug"
> + tal:attributes="href apphomes/bugs">Bug tracking</a>
> + </li>
> + <li>
> + <a class="sprite branch"
> + tal:attributes="href apphomes/code">Code hosting</a>
> + using <a href="http://bazaar.canonical.com/">Bazaar</a>
> + </li>
> + <li>
> + <a class="sprite yes"
> + href="https://help.launchpad.net/Code/Review">Code reviews</a>
> + </li>
> +...

Read more...

review: Approve (code)
Revision history for this message
Curtis Hovey (sinzui) wrote :

I removed the trailing whitespace you pointed out.

On Fri, 2010-06-11 at 14:47 +0000, Abel Deuring wrote:
> > +.tour {
> > + background-image: url(/@@/tour-icon); /* needs-ref: */
> > + background-repeat: no-repeat;
> > + }
>
> I think "needs-ref" above is worth an XXX.

I added it to the sprite image. I intended to do this, but neglected to
followup

This is the order of steps to add to the sprite image.
1. Place the image in icing/ (we already had tour-icon)
2. Create a class like this:
   background-image: url(/@@/tour-icon); /* sprite-ref: icon-sprites */
   background-repeat: no-repeat;
3. make sprite_image
4. make sprite_css
5. make css_combine
6. make run.
7. verify you see the icon on the element
8. inspect the CSS applied to the element
   and verify that background-position was added.
9. commit the changes to the generated files.

--
__Curtis C. Hovey_________
http://launchpad.net/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/icing/icon-sprites'
0Binary files lib/canonical/launchpad/icing/icon-sprites 2010-02-17 00:43:19 +0000 and lib/canonical/launchpad/icing/icon-sprites 2010-06-12 14:35:43 +0000 differ0Binary files lib/canonical/launchpad/icing/icon-sprites 2010-02-17 00:43:19 +0000 and lib/canonical/launchpad/icing/icon-sprites 2010-06-12 14:35:43 +0000 differ
=== modified file 'lib/canonical/launchpad/icing/icon-sprites.positioning'
--- lib/canonical/launchpad/icing/icon-sprites.positioning 2010-02-17 00:43:19 +0000
+++ lib/canonical/launchpad/icing/icon-sprites.positioning 2010-06-12 14:35:43 +0000
@@ -79,11 +79,11 @@
79 ], 79 ],
80 "../images/info-large.png": [80 "../images/info-large.png": [
81 0, 81 0,
82 -1717682 -17340
83 ], 83 ],
84 "../images/trash-logo.png": [84 "../images/trash-logo.png": [
85 0, 85 0,
86 -2019486 -20358
87 ], 87 ],
88 "../images/warning.png": [88 "../images/warning.png": [
89 0, 89 0,
@@ -99,19 +99,19 @@
99 ], 99 ],
100 "../images/branch-large.png": [100 "../images/branch-large.png": [
101 0, 101 0,
102 -15902102 -16066
103 ], 103 ],
104 "../images/download-large.png": [104 "../images/download-large.png": [
105 0, 105 0,
106 -16994106 -17158
107 ], 107 ],
108 "../images/private-large.png": [108 "../images/private-large.png": [
109 0, 109 0,
110 -18086110 -18250
111 ], 111 ],
112 "../images/launchpad-large.png": [112 "../images/launchpad-large.png": [
113 0, 113 0,
114 -17358114 -17522
115 ], 115 ],
116 "../images/translation-file.png": [116 "../images/translation-file.png": [
117 0, 117 0,
@@ -123,7 +123,7 @@
123 ], 123 ],
124 "../images/project-logo.png": [124 "../images/project-logo.png": [
125 0, 125 0,
126 -18696126 -18860
127 ], 127 ],
128 "../images/bug-medium.png": [128 "../images/bug-medium.png": [
129 0, 129 0,
@@ -133,6 +133,10 @@
133 0, 133 0,
134 -12130134 -12130
135 ], 135 ],
136 "../images/tour-icon": [
137 0,
138 -15902
139 ],
136 "../images/trash-icon.png": [140 "../images/trash-icon.png": [
137 0, 141 0,
138 -11146142 -11146
@@ -175,11 +179,11 @@
175 ], 179 ],
176 "../images/person-logo.png": [180 "../images/person-logo.png": [
177 0, 181 0,
178 -19124182 -19288
179 ], 183 ],
180 "../images/distribution-logo.png": [184 "../images/distribution-logo.png": [
181 0, 185 0,
182 -18482186 -18646
183 ], 187 ],
184 "../images/retry.png": [188 "../images/retry.png": [
185 0, 189 0,
@@ -219,7 +223,7 @@
219 ], 223 ],
220 "../images/crowd-large.png": [224 "../images/crowd-large.png": [
221 0, 225 0,
222 -16266226 -16430
223 ], 227 ],
224 "../images/blueprint.png": [228 "../images/blueprint.png": [
225 0, 229 0,
@@ -247,7 +251,7 @@
247 ], 251 ],
248 "../images/flame-large.png": [252 "../images/flame-large.png": [
249 0, 253 0,
250 -16812254 -16976
251 ], 255 ],
252 "../images/bug-dupe-icon.png": [256 "../images/bug-dupe-icon.png": [
253 0, 257 0,
@@ -279,7 +283,7 @@
279 ], 283 ],
280 "../images/team-logo.png": [284 "../images/team-logo.png": [
281 0, 285 0,
282 -19552286 -19716
283 ], 287 ],
284 "../images/arrowRight.png": [288 "../images/arrowRight.png": [
285 0, 289 0,
@@ -319,7 +323,7 @@
319 ], 323 ],
320 "../images/error-large.png": [324 "../images/error-large.png": [
321 0, 325 0,
322 -16630326 -16794
323 ], 327 ],
324 "../images/news.png": [328 "../images/news.png": [
325 0, 329 0,
@@ -351,7 +355,7 @@
351 ], 355 ],
352 "../images/product-logo.png": [356 "../images/product-logo.png": [
353 0, 357 0,
354 -18910358 -19074
355 ], 359 ],
356 "../images/blueprint-medium.png": [360 "../images/blueprint-medium.png": [
357 0, 361 0,
@@ -367,11 +371,11 @@
367 ], 371 ],
368 "../images/launchpad-logo.png": [372 "../images/launchpad-logo.png": [
369 0, 373 0,
370 -18268374 -18432
371 ], 375 ],
372 "../images/flame-logo.png": [376 "../images/flame-logo.png": [
373 0, 377 0,
374 -19980378 -20144
375 ], 379 ],
376 "../images/translation-template.png": [380 "../images/translation-template.png": [
377 0, 381 0,
@@ -383,7 +387,7 @@
383 ], 387 ],
384 "../images/meeting-logo.png": [388 "../images/meeting-logo.png": [
385 0, 389 0,
386 -19766390 -19930
387 ], 391 ],
388 "../images/treeCollapsed.png": [392 "../images/treeCollapsed.png": [
389 0, 393 0,
@@ -399,7 +403,7 @@
399 ], 403 ],
400 "../images/trash-large.png": [404 "../images/trash-large.png": [
401 0, 405 0,
402 -17904406 -18068
403 ], 407 ],
404 "../images/red-bar.png": [408 "../images/red-bar.png": [
405 0, 409 0,
@@ -415,7 +419,7 @@
415 ], 419 ],
416 "../images/person-inactive-logo.png": [420 "../images/person-inactive-logo.png": [
417 0, 421 0,
418 -19338422 -19502
419 ], 423 ],
420 "../images/edit.png": [424 "../images/edit.png": [
421 0, 425 0,
@@ -427,7 +431,7 @@
427 ], 431 ],
428 "../images/warning-large.png": [432 "../images/warning-large.png": [
429 0, 433 0,
430 -16084434 -16248
431 ], 435 ],
432 "../images/arrowEnd.png": [436 "../images/arrowEnd.png": [
433 0, 437 0,
@@ -439,7 +443,7 @@
439 ], 443 ],
440 "../images/merge-proposal-large.png": [444 "../images/merge-proposal-large.png": [
441 0, 445 0,
442 -17722446 -17886
443 ], 447 ],
444 "../images/branch.png": [448 "../images/branch.png": [
445 0, 449 0,
@@ -451,7 +455,7 @@
451 ], 455 ],
452 "../images/mentoring-large.png": [456 "../images/mentoring-large.png": [
453 0, 457 0,
454 -17540458 -17704
455 ], 459 ],
456 "../images/bug.png": [460 "../images/bug.png": [
457 0, 461 0,
458462
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in 2010-06-07 21:48:06 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-06-12 14:35:43 +0000
@@ -2176,6 +2176,10 @@
2176 background-image: url(/@@/haspatch-icon.png); /* sprite-ref: icon-sprites */2176 background-image: url(/@@/haspatch-icon.png); /* sprite-ref: icon-sprites */
2177 background-repeat: no-repeat;2177 background-repeat: no-repeat;
2178 }2178 }
2179.tour {
2180 background-image: url(/@@/tour-icon); /* sprite-ref: icon-sprites */
2181 background-repeat: no-repeat;
2182 }
2179.large-branch {2183.large-branch {
2180 background-image: url(/@@/branch-large.png); /* sprite-ref: icon-sprites */2184 background-image: url(/@@/branch-large.png); /* sprite-ref: icon-sprites */
2181 background-repeat: no-repeat;2185 background-repeat: no-repeat;
21822186
=== modified file 'lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt'
--- lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt 2010-03-09 19:11:32 +0000
+++ lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt 2010-06-12 14:35:43 +0000
@@ -51,7 +51,7 @@
51 <style...url(/@@/demo)...</style>51 <style...url(/@@/demo)...</style>
52 ...52 ...
53 >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))53 >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))
54 &bull;...Launchpad...) devmode demo site54 &bull; devmode demo site
5555
56 >>> print extract_text(find_tags_by_class(56 >>> print extract_text(find_tags_by_class(
57 ... browser.contents, 'sitemessage')[0])57 ... browser.contents, 'sitemessage')[0])
@@ -70,7 +70,7 @@
7070
71 >>> browser.open('http://launchpad.dev/ubuntu')71 >>> browser.open('http://launchpad.dev/ubuntu')
72 >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))72 >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))
73 &bull;...Launchpad...) devmode73 &bull; devmode
74 >>> len(find_tags_by_class(browser.contents, 'sitemessage'))74 >>> len(find_tags_by_class(browser.contents, 'sitemessage'))
75 075 0
7676
@@ -143,17 +143,8 @@
143143
144== Launchpad.net ==144== Launchpad.net ==
145145
146On every instance except launchpad.net, Launchpad's version and146On launchpad.net, the version and revision numbers are presented only in an
147revision numbers are displayed in the page footer.147HTML comment.
148
149 >>> print config.launchpad.is_lpnet
150 False
151 >>> browser.open('http://launchpad.dev/ubuntu')
152 >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))
153 &bull;...Launchpad ... (r...)...
154
155On launchpad.net, however, the version and revision numbers are
156presented only in an HTML comment.
157148
158 >>> # Pretend that we're on launchpad.net:149 >>> # Pretend that we're on launchpad.net:
159 >>> test_data = dedent("""150 >>> test_data = dedent("""
160151
=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt 2010-04-07 14:02:13 +0000
+++ lib/lp/app/browser/tests/base-layout.txt 2010-06-12 14:35:43 +0000
@@ -62,10 +62,12 @@
6262
63Body preamble.63Body preamble.
6464
65 >>> print html65 >>> from canonical.launchpad.testing.pages import find_tag_by_id
66 <!DOCTYPE html ...66
67 ...67 >>> body_tag = find_tag_by_id(html, 'document')
68 <body id="document"68 >>> body = str(body_tag)
69 >>> print body
70 <body id="document"
69 class="tab-overview71 class="tab-overview
70 main_side72 main_side
71 public73 public
@@ -80,8 +82,8 @@
8082
81Watermark and breadcrumbs.83Watermark and breadcrumbs.
8284
83 >>> print html85 >>> print body
84 <!DOCTYPE html ...86 <body ...
85 ...87 ...
86 <div class="watermark-apps-portlet top-portlet">88 <div class="watermark-apps-portlet top-portlet">
87 <img alt="" width="64" height="64" src="/@@/person-logo" />89 <img alt="" width="64" height="64" src="/@@/person-logo" />
@@ -102,9 +104,8 @@
102104
103Top portlet.105Top portlet.
104106
105 >>> print html107 >>> print body
106 <!DOCTYPE html ...108 <body ...
107 ...
108 <div class="top-portlet">109 <div class="top-portlet">
109 <p class="registered">110 <p class="registered">
110 Registered on 2005-09-16111 Registered on 2005-09-16
@@ -118,25 +119,20 @@
118119
119Help pane.120Help pane.
120121
121 >>> print html122 >>> print str(find_tag_by_id(body_tag, 'help-pane'))
122 <!DOCTYPE html ...123 <div id="help-pane" class="invisible">
123 ...
124 <div id="help-pane" class="invisible">
125 <div id="help-body">124 <div id="help-body">
126 <BLANKLINE>
127 <iframe id="help-pane-content" class="invisible" ...125 <iframe id="help-pane-content" class="invisible" ...
128 </div>126 </div>
129 <div id="help-footer">127 <div id="help-footer">
130 <span id="help-close"></span>128 <span id="help-close"></span>
131 </div>129 </div>
132 </div>130 </div>
133 ...
134131
135Footer.132Footer.
136133
137 >>> print html134 >>> print html
138 <!DOCTYPE html ...135 <!DOCTYPE html ...
139 ...
140 <!--136 <!--
141 Facet name: overview137 Facet name: overview
142 Page type: main_side138 Page type: main_side
@@ -172,9 +168,10 @@
172168
173Watermark.169Watermark.
174170
175 >>> print html171 >>> body_tag = find_tag_by_id(html, 'document')
176 <!DOCTYPE html ...172 >>> body = str(body_tag)
177 ...173 >>> print body
174 <body ...
178 <div class="watermark-apps-portlet top-portlet">175 <div class="watermark-apps-portlet top-portlet">
179 <img alt="" width="64" height="64" src="/@@/person-logo" />176 <img alt="" width="64" height="64" src="/@@/person-logo" />
180 <h2>Waffles</h2>177 <h2>Waffles</h2>
@@ -182,14 +179,8 @@
182179
183Main content.180Main content.
184181
185 >>> print html182 >>> print str(find_tag_by_id(body_tag, 'maincontent'))
186 <!DOCTYPE html ...183 <div id="maincontent" class="yui-main">
187 ...
188 <div id="maincontent" class="yui-main">
189 <BLANKLINE>
190 <BLANKLINE>
191 <BLANKLINE>
192 <BLANKLINE>
193 <div class="yui-b" dir="ltr">184 <div class="yui-b" dir="ltr">
194 <div>185 <div>
195 <BLANKLINE>186 <BLANKLINE>
@@ -198,6 +189,9 @@
198 </ol>189 </ol>
199 <BLANKLINE>190 <BLANKLINE>
200 </div>191 </div>
192 </div><!-- yui-b -->
193 <BLANKLINE>
194 <BLANKLINE>
201 <BLANKLINE>195 <BLANKLINE>
202 <div class="top-portlet">196 <div class="top-portlet">
203 <h1>Heading</h1>197 <h1>Heading</h1>
@@ -209,18 +203,12 @@
209 Main content of the page.203 Main content of the page.
210 </p>204 </p>
211 </div>205 </div>
212 <BLANKLINE>206 </div>
213 </div><!-- yui-b -->
214 </div><!-- yui-main -->
215 <BLANKLINE>
216 <!-- yui-b side -->
217 <!-- yui-t4 -->
218 ...
219207
220Global search.208Global search.
221209
222 >>> print html210 >>> print body
223 <!DOCTYPE html ...211 <body ...
224 <form id="globalsearch" method="get"212 <form id="globalsearch" method="get"
225 accept-charset="UTF-8"213 accept-charset="UTF-8"
226 action="http://launchpad.dev/+search">214 action="http://launchpad.dev/+search">
@@ -269,10 +257,10 @@
269257
270Body class.258Body class.
271259
272 >>> print html260 >>> body_tag = find_tag_by_id(html, 'document')
273 <!DOCTYPE html ...261 >>> body = str(body_tag)
274 ...262 >>> print body
275 <body id="document"263 <body id="document"
276 class="tab-overview264 class="tab-overview
277 searchless265 searchless
278 public266 public
@@ -285,9 +273,8 @@
285273
286Watermarks.274Watermarks.
287275
288 >>> print html276 >>> print body
289 <!DOCTYPE html ...277 <body ...
290 ...
291 <div class="watermark-apps-portlet top-portlet">278 <div class="watermark-apps-portlet top-portlet">
292 <img alt="" width="64" height="64" src="/@@/person-logo" />279 <img alt="" width="64" height="64" src="/@@/person-logo" />
293 <h2>Waffles</h2>280 <h2>Waffles</h2>
@@ -304,14 +291,8 @@
304291
305Main content.292Main content.
306293
307 >>> print html294 >>> print str(find_tag_by_id(body_tag, 'maincontent'))
308 <!DOCTYPE html ...295 <div id="maincontent" class="yui-main">
309 ...
310 <div id="maincontent" class="yui-main">
311 <BLANKLINE>
312 <BLANKLINE>
313 <BLANKLINE>
314 <BLANKLINE>
315 <div class="yui-b" dir="ltr">296 <div class="yui-b" dir="ltr">
316 <div>297 <div>
317 <BLANKLINE>298 <BLANKLINE>
@@ -322,9 +303,8 @@
322303
323Top portlet.304Top portlet.
324305
325 >>> print html306 >>> print body
326 <!DOCTYPE html ...307 <body ...
327 ...
328 <div class="top-portlet">308 <div class="top-portlet">
329 <h1>Heading</h1>309 <h1>Heading</h1>
330 <p class="registered">310 <p class="registered">
@@ -336,7 +316,6 @@
336 </p>316 </p>
337 </div>317 </div>
338 <BLANKLINE>318 <BLANKLINE>
339 </div><!-- yui-b -->
340 </div><!-- yui-main -->319 </div><!-- yui-main -->
341 <BLANKLINE>320 <BLANKLINE>
342 <!-- yui-b side -->321 <!-- yui-b side -->
@@ -384,10 +363,10 @@
384363
385Body.364Body.
386365
387 >>> print html366 >>> body_tag = find_tag_by_id(html, 'document')
388 <!DOCTYPE html ...367 >>> body = str(body_tag)
389 ...368 >>> print body
390 <body id="document"369 <body id="document"
391 class="tab-overview370 class="tab-overview
392 locationless371 locationless
393 public372 public
@@ -400,17 +379,10 @@
400379
401Main content.380Main content.
402381
403 >>> print html382 >>> print str(find_tag_by_id(body_tag, 'maincontent'))
404 <!DOCTYPE html ...383 <div id="maincontent" class="yui-main">
405 ...
406 <div id="maincontent" class="yui-main">
407 <BLANKLINE>
408 <BLANKLINE>
409 <BLANKLINE>
410 <BLANKLINE>
411 <div class="yui-b" dir="ltr">384 <div class="yui-b" dir="ltr">
412 <BLANKLINE>385 </div><!-- yui-b -->
413 <BLANKLINE>
414 <div class="top-portlet">386 <div class="top-portlet">
415 <h1>Heading</h1>387 <h1>Heading</h1>
416 <p class="registered">388 <p class="registered">
@@ -421,13 +393,7 @@
421 Main content of the page.393 Main content of the page.
422 </p>394 </p>
423 </div>395 </div>
424 <BLANKLINE>396 </div>
425 </div><!-- yui-b -->
426 </div><!-- yui-main -->
427 <BLANKLINE>
428 <!-- yui-b side -->
429 <!-- yui-t4 -->
430 ...
431397
432Footer.398Footer.
433399
@@ -466,8 +432,6 @@
466The example layouts all used the heading slot to define a heading for their432The example layouts all used the heading slot to define a heading for their
467test. The template controlled the heading.433test. The template controlled the heading.
468434
469 >>> from canonical.launchpad.testing.pages import find_tag_by_id
470
471 >>> content = find_tag_by_id(view.render(), 'maincontent')435 >>> content = find_tag_by_id(view.render(), 'maincontent')
472 >>> print content.h1436 >>> print content.h1
473 <h1>Heading</h1>437 <h1>Heading</h1>
@@ -497,12 +461,10 @@
497 http://canonical.com/461 http://canonical.com/
498 Terms of use462 Terms of use
499 http://launchpad.dev/legal463 http://launchpad.dev/legal
500 Contact us464 Contact Launchpad Support
501 https://help.launchpad.net/Feedback465 https://help.launchpad.net/Feedback
502 System status466 System status
503 http://identi.ca/launchpadstatus467 http://identi.ca/launchpadstatus
504 Launchpad ...
505 https://help.launchpad.net/LaunchpadReleases
506468
507469
508Page registering470Page registering
@@ -559,3 +521,21 @@
559 >>> body = find_tag_by_id(view.render(), 'document')521 >>> body = find_tag_by_id(view.render(), 'document')
560 >>> print body['class']522 >>> print body['class']
561 tab-overview locationless public yui-skin-sam523 tab-overview locationless public yui-skin-sam
524
525
526Notifications
527-------------
528
529Notifications are diplayed between the breadcrumbs and the page content.
530
531 >>> request.response.addInfoNotification('I cannot do that Dave.')
532 >>> view = MainOnlyView(user, request)
533 >>> body_tag = find_tag_by_id(view.render(), 'maincontent')
534 >>> print str(body_tag)
535 <div id="maincontent" ...
536 <ol class="breadcrumbs">
537 </ol>
538 ...
539 <div class="informational message">I cannot do that Dave.</div>
540 <div class="top-portlet">
541 ...
562542
=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt 2010-05-18 18:04:00 +0000
+++ lib/lp/app/templates/base-layout-macros.pt 2010-06-12 14:35:43 +0000
@@ -398,14 +398,12 @@
398 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>398 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
399 &nbsp;&bull;&nbsp;399 &nbsp;&bull;&nbsp;
400 <a href="https://help.launchpad.net/Feedback"400 <a href="https://help.launchpad.net/Feedback"
401 >Contact us</a>401 >Contact Launchpad Support</a>
402 &nbsp;&bull;&nbsp;402 &nbsp;&bull;&nbsp;
403 <a href="http://identi.ca/launchpadstatus"403 <a href="http://identi.ca/launchpadstatus"
404 >System status</a>404 >System status</a>
405 <span id="lp-version" tal:condition="not:is_lpnet">405 <span id="lp-version" tal:condition="not:is_lpnet">
406 &nbsp;&bull;&nbsp;406 &nbsp;&bull;&nbsp;
407 <a href="https://help.launchpad.net/LaunchpadReleases"
408 tal:content="version"/>
409 <tal:devmode condition="devmode">devmode</tal:devmode>407 <tal:devmode condition="devmode">devmode</tal:devmode>
410 <tal:demo condition="is_demo">demo site</tal:demo>408 <tal:demo condition="is_demo">demo site</tal:demo>
411 <tal:edge condition="is_edge">beta site</tal:edge>409 <tal:edge condition="is_edge">beta site</tal:edge>
412410
=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt 2010-04-05 21:04:09 +0000
+++ lib/lp/app/templates/base-layout.pt 2010-06-12 14:35:43 +0000
@@ -102,16 +102,6 @@
102 <div class="yui-t4"102 <div class="yui-t4"
103 tal:omit-tag="not: view/macro:pagehas/portlets">103 tal:omit-tag="not: view/macro:pagehas/portlets">
104 <div id="maincontent" class="yui-main">104 <div id="maincontent" class="yui-main">
105
106 <tal:maintenance
107 replace="structure context/@@+maintenancemessage" />
108 <tal:notifications
109 define="notifications request/notifications"
110 condition="notifications">
111 <metal:notifications
112 use-macro="context/@@+base-layout-macros/notifications"/>
113 </tal:notifications>
114
115 <div class="yui-b"105 <div class="yui-b"
116 tal:attributes="106 tal:attributes="
117 lang view/lang|default_language|default;107 lang view/lang|default_language|default;
@@ -128,8 +118,16 @@
128 ProjectName > Branches > Merge Proposals > fix-for-navigation118 ProjectName > Branches > Merge Proposals > fix-for-navigation
129 </tal:breadcrumbs>119 </tal:breadcrumbs>
130 </div>120 </div>
121 </div><!-- yui-b -->
122 <tal:maintenance
123 replace="structure context/@@+maintenancemessage" />
124 <tal:notifications
125 define="notifications request/notifications"
126 condition="notifications">
127 <metal:notifications
128 use-macro="context/@@+base-layout-macros/notifications"/>
129 </tal:notifications>
131 <metal:main define-slot="main" />130 <metal:main define-slot="main" />
132 </div><!-- yui-b -->
133 </div><!-- yui-main -->131 </div><!-- yui-main -->
134132
135 <div class="yui-b side"133 <div class="yui-b side"
136134
=== modified file 'lib/lp/app/templates/root-index.pt'
--- lib/lp/app/templates/root-index.pt 2010-04-29 13:22:29 +0000
+++ lib/lp/app/templates/root-index.pt 2010-06-12 14:35:43 +0000
@@ -89,27 +89,42 @@
89 tal:condition="not:view/user" tal:content="cache:anonymous">89 tal:condition="not:view/user" tal:content="cache:anonymous">
90 <h2><span class="launchpad-gold">Launchpad</span> is a software collaboration platform that provides:</h2>90 <h2><span class="launchpad-gold">Launchpad</span> is a software collaboration platform that provides:</h2>
91 <ul tal:define="apphomes view/apphomes">91 <ul tal:define="apphomes view/apphomes">
92 <li><a tal:attributes="href apphomes/bugs"><img src="/@@/bug" alt="" /></a>92 <li>
93 <a tal:attributes="href apphomes/bugs">Bug tracking</a></li>93 <a class="sprite bug"
94 <li><a tal:attributes="href apphomes/code"><img src="/@@/branch" alt="" /></a>94 tal:attributes="href apphomes/bugs">Bug tracking</a>
95 <a tal:attributes="href apphomes/code">Code hosting</a>95 </li>
96 using <a href="http://bazaar-vcs.org/">Bazaar</a></li>96 <li>
97 <li><a href="https://help.launchpad.net/Code/Review"><img src="/@@/yes" alt="" /></a>97 <a class="sprite branch"
98 <a href="https://help.launchpad.net/Code/Review">Code reviews</a></li>98 tal:attributes="href apphomes/code">Code hosting</a>
99 <li><a tal:attributes="href apphomes/ubuntu"><img src="/@@/ubuntu-icon" alt="" /></a>99 using <a href="http://bazaar.canonical.com/">Bazaar</a>
100 <a tal:attributes="href apphomes/ubuntu">Ubuntu package building and hosting</a></li>100 </li>
101 <li><a tal:attributes="href apphomes/translations"><img src="/@@/translation" alt="" /></a>101 <li>
102 <a tal:attributes="href apphomes/translations">Translations</a></li>102 <a class="sprite yes"
103 <li><a href="https://help.launchpad.net/Teams/MailingLists"><img src="/@@/mail" alt="" /></a>103 href="https://help.launchpad.net/Code/Review">Code reviews</a>
104 <a href="https://help.launchpad.net/Teams/MailingLists">Mailing lists</a></li>104 </li>
105 <li><a tal:attributes="href apphomes/answers"><img src="/@@/question" alt="" /></a>105 <li>
106 <a tal:attributes="href apphomes/answers">Answer tracking and FAQs</a></li>106 <a class="sprite ubuntu-logo"
107 <li><a tal:attributes="href apphomes/blueprints"><img src="/@@/blueprint" alt="" /></a>107 tal:attributes="href apphomes/ubuntu">Ubuntu package building and hosting</a>
108 <a tal:attributes="href apphomes/blueprints">Specification tracking</a></li>108 </li>
109 <li>
110 <a class="sprite translate-icon"
111 tal:attributes="href apphomes/translations">Translations</a>
112 </li>
113 <li>
114 <a class="sprite mail"
115 href="https://help.launchpad.net/Teams/MailingLists">Mailing lists</a>
116 </li>
117 <li>
118 <a class="sprite question"
119 tal:attributes="href apphomes/answers">Answer tracking and FAQs</a>
120 </li>
121 <li>
122 <a class="sprite blueprint"
123 tal:attributes="href apphomes/blueprints">Specification tracking</a>
124 </li>
109 </ul>125 </ul>
110 <div id="homepage-whatslaunchpad-tour">126 <div id="homepage-whatslaunchpad-tour">
111 <a href="/+tour"><img src="/@@/tour-icon" alt=""127 <a class="sprite tour" href="/+tour">Take the tour!</a>
112 /></a> <a href="/+tour">Take the tour!</a>
113 </div>128 </div>
114 </div>129 </div>
115130
@@ -189,27 +204,36 @@
189 in our sandbox environment.204 in our sandbox environment.
190 (<a href="/+help/home-page-staging-help.html" target="help">What's this?</a>)<br />205 (<a href="/+help/home-page-staging-help.html" target="help">What's this?</a>)<br />
191 <tal:logged_in condition="view/user" omit-tag=""206 <tal:logged_in condition="view/user" omit-tag=""
192 tal:content="cache:public">207 tal:content="cache:public">
193 If you're ready, you can:208 If you're ready, you can:
194 <ul tal:define="apphomes view/apphomes">209 <ul tal:define="apphomes view/apphomes">
195 <li><a href="https://help.launchpad.net/">210 <li>
196 <img src="/@@/info" alt="" /></a>211 <a class="sprite info"
197 <a href="https://help.launchpad.net/"> Read the user guide</a></li>212 href="https://help.launchpad.net/">Read the user guide</a>
198 <li><a href="/projects/+new"><img src="/@@/add" /></a>213 </li>
199 <a href="/projects/+new">Create a new project</a></li>214 <li>
200 <li><a href="/people/+newteam"><img src="/@@/add" /></a>215 <a class="sprite add"
201 <a href="/people/+newteam">Create a new team</a></li>216 href="/projects/+new">Register a project</a>
202 <li><a tal:attributes="href apphomes/bugs">217 </li>
203 <img src="/@@/bug" /></a>218 <li>
204 <a tal:attributes="href apphomes/bugs">Browse bugs</a></li>219 <a class="sprite add"
205 <li><a tal:attributes="href apphomes/translations">220 href="/people/+newteam">Register a team</a>
206 <img src="/@@/translation" /></a>221 </li>
207 <a tal:attributes="href apphomes/translations">Help translate</a></li>222 <li>
208 <li><a tal:attributes="href apphomes/answers">223 <a class="sprite bug"
209 <img src="/@@/question" alt="" /></a>224 tal:attributes="href apphomes/bugs">Browse bugs</a>
210 <a tal:attributes="href apphomes/answers">Find answers</a></li>225 </li>
211 <li><a href="/+tour"><img src="/@@/tour-icon" /></a>226 <li>
212 <a href="/+tour">Take the tour</a></li>227 <a class="sprite translate-icon"
228 tal:attributes="href apphomes/translations">Help translate</a>
229 </li>
230 <li>
231 <a class="sprite question"
232 tal:attributes="href apphomes/answers">Find answers</a>
233 </li>
234 <li>
235 <a class="sprite tour" href="/+tour">Take the tour</a>
236 </li>
213 </ul>237 </ul>
214 </tal:logged_in>238 </tal:logged_in>
215 </div>239 </div>
@@ -224,10 +248,10 @@
224 tal:define="topproject view/featured_projects_top"248 tal:define="topproject view/featured_projects_top"
225 tal:condition="topproject">249 tal:condition="topproject">
226 <h3>250 <h3>
227 <a tal:attributes="href topproject/fmt:url"><img251 <a tal:attributes="href topproject/fmt:url"
228 tal:replace="structure topproject/image:logo" /></a>252 tal:content="structure topproject/image:logo"><img /></a>
229 <a tal:attributes="href topproject/fmt:url"><tal:name253 <a tal:attributes="href topproject/fmt:url"
230 replace="topproject/displayname">Foo project</tal:name></a>254 tal:content="topproject/displayname">Foo project</a>
231 </h3>255 </h3>
232 <p tal:content="structure view/featured_projects_top/summary/fmt:shorten/200">256 <p tal:content="structure view/featured_projects_top/summary/fmt:shorten/200">
233 Foo project is great...257 Foo project is great...
234258
=== modified file 'lib/lp/blueprints/stories/blueprints/05-reviews.txt'
--- lib/lp/blueprints/stories/blueprints/05-reviews.txt 2009-09-23 10:17:34 +0000
+++ lib/lp/blueprints/stories/blueprints/05-reviews.txt 2010-06-12 14:35:43 +0000
@@ -134,9 +134,9 @@
134 >>> print mark_browser.url134 >>> print mark_browser.url
135 http://blueprints.launchpad.dev/firefox/+spec/canvas/+givefeedback135 http://blueprints.launchpad.dev/firefox/+spec/canvas/+givefeedback
136136
137 >>> print extract_text(find_main_content(mark_browser.contents))137 >>> for message in get_feedback_messages(mark_browser.contents):
138 Cleared requests from: Carlos Perelló Marín138 ... print extract_text(message)
139 ...139 Cleared requests from: Carlos ...
140140
141And now, the remaining two. This time we expect to be redirected.141And now, the remaining two. This time we expect to be redirected.
142142
143143
=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt 2009-09-09 23:16:08 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt 2010-06-12 14:35:43 +0000
@@ -190,7 +190,8 @@
190190
191 >>> browser.getControl('Further information').value = 'Test Bug 1'191 >>> browser.getControl('Further information').value = 'Test Bug 1'
192 >>> browser.getControl('Submit').click()192 >>> browser.getControl('Submit').click()
193 >>> print extract_text(find_main_content(browser.contents))193 >>> for message in get_feedback_messages(browser.contents):
194 ... print extract_text(message)
194 Thank you for your bug report...195 Thank you for your bug report...
195 >>> bug_1_url = browser.url196 >>> bug_1_url = browser.url
196197
@@ -199,7 +200,8 @@
199 >>> browser.getControl('Continue').click()200 >>> browser.getControl('Continue').click()
200 >>> browser.getControl('Further information').value = 'Test Bug 2'201 >>> browser.getControl('Further information').value = 'Test Bug 2'
201 >>> browser.getControl('Submit').click()202 >>> browser.getControl('Submit').click()
202 >>> print extract_text(find_main_content(browser.contents))203 >>> for message in get_feedback_messages(browser.contents):
204 ... print extract_text(message)
203 Thank you for your bug report...205 Thank you for your bug report...
204 >>> bug_2_url = browser.url206 >>> bug_2_url = browser.url
205207
@@ -212,7 +214,8 @@
212214
213 >>> browser.getControl('Person').value = subscriber215 >>> browser.getControl('Person').value = subscriber
214 >>> browser.getControl('Subscribe user').click()216 >>> browser.getControl('Subscribe user').click()
215 >>> print extract_text(find_main_content(browser.contents))217 >>> for message in get_feedback_messages(browser.contents):
218 ... print extract_text(message)
216 No Privileges Person has been subscribed to this bug...219 No Privileges Person has been subscribed to this bug...
217220
218Now if we repeat our earlier search for bugs our user is subscribed to, we'll221Now if we repeat our earlier search for bugs our user is subscribed to, we'll
@@ -235,7 +238,8 @@
235238
236 >>> browser.getControl('Person').value = subscriber239 >>> browser.getControl('Person').value = subscriber
237 >>> browser.getControl('Subscribe user').click()240 >>> browser.getControl('Subscribe user').click()
238 >>> print extract_text(find_main_content(browser.contents))241 >>> for message in get_feedback_messages(browser.contents):
242 ... print extract_text(message)
239 No Privileges Person has been subscribed to this bug...243 No Privileges Person has been subscribed to this bug...
240244
241Finally, if we repeat our earlier search for bugs our user is subscribed to,245Finally, if we repeat our earlier search for bugs our user is subscribed to,
242246
=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt 2010-01-18 20:41:52 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt 2010-06-12 14:35:43 +0000
@@ -22,7 +22,8 @@
22 >>> browser.getControl('Continue').click()22 >>> browser.getControl('Continue').click()
23 >>> browser.getControl('Further information').value = 'Test Bug 1'23 >>> browser.getControl('Further information').value = 'Test Bug 1'
24 >>> browser.getControl('Submit').click()24 >>> browser.getControl('Submit').click()
25 >>> print extract_text(find_main_content(browser.contents))25 >>> for message in get_feedback_messages(browser.contents):
26 ... print extract_text(message)
26 Thank you for your bug report...27 Thank you for your bug report...
2728
28 >>> browser.getLink('Also affects project').click()29 >>> browser.getLink('Also affects project').click()
2930
=== modified file 'lib/lp/code/templates/bazaar-index.pt'
--- lib/lp/code/templates/bazaar-index.pt 2010-03-18 21:42:06 +0000
+++ lib/lp/code/templates/bazaar-index.pt 2010-06-12 14:35:43 +0000
@@ -40,7 +40,7 @@
40 </form>40 </form>
41 <p id="application-summary">41 <p id="application-summary">
42 Launchpad can host your project&#8217;s source code42 Launchpad can host your project&#8217;s source code
43 using the <a href="http://bazaar-vcs.org/">Bazaar</a>43 using the <a href="http://bazaar.canonical.com/">Bazaar</a>
44 version control system.44 version control system.
45 We also import45 We also import
46 <tal:XXX condition="nothing">46 <tal:XXX condition="nothing">
@@ -131,7 +131,7 @@
131 branches associated with bug reports131 branches associated with bug reports
132 </div>132 </div>
133 <div>133 <div>
134 Launchpad uses <a href="http://bazaar-vcs.org/">Bazaar</a>134 Launchpad uses <a href="http://bazaar.canonical.com/">Bazaar</a>
135 <tal:version tal:content="view/bzr_version">2.0</tal:version>.135 <tal:version tal:content="view/bzr_version">2.0</tal:version>.
136 </div>136 </div>
137 </div>137 </div>
138138
=== modified file 'lib/lp/registry/stories/milestone/object-milestones.txt'
--- lib/lp/registry/stories/milestone/object-milestones.txt 2010-05-19 17:30:38 +0000
+++ lib/lp/registry/stories/milestone/object-milestones.txt 2010-06-12 14:35:43 +0000
@@ -199,7 +199,8 @@
199199
200 >>> browser.getControl('Further information').value = 'Test Bug 1'200 >>> browser.getControl('Further information').value = 'Test Bug 1'
201 >>> browser.getControl('Submit').click()201 >>> browser.getControl('Submit').click()
202 >>> print extract_text(find_main_content(browser.contents))202 >>> for message in get_feedback_messages(browser.contents):
203 ... print extract_text(message)
203 Thank you for your bug report...204 Thank you for your bug report...
204 >>> bug_1_url = browser.url205 >>> bug_1_url = browser.url
205206
@@ -209,7 +210,8 @@
209210
210 >>> browser.getControl('Further information').value = 'Test Bug 2'211 >>> browser.getControl('Further information').value = 'Test Bug 2'
211 >>> browser.getControl('Submit').click()212 >>> browser.getControl('Submit').click()
212 >>> print extract_text(find_main_content(browser.contents))213 >>> for message in get_feedback_messages(browser.contents):
214 ... print extract_text(message)
213 Thank you for your bug report...215 Thank you for your bug report...
214 >>> bug_2_url = browser.url216 >>> bug_2_url = browser.url
215217
216218
=== modified file 'lib/lp/registry/stories/product/xx-product-add.txt'
--- lib/lp/registry/stories/product/xx-product-add.txt 2010-05-12 19:06:17 +0000
+++ lib/lp/registry/stories/product/xx-product-add.txt 2010-06-12 14:35:43 +0000
@@ -5,7 +5,7 @@
5from the Launchpad home page or the projects home page.5from the Launchpad home page or the projects home page.
66
7 >>> user_browser.open('http://launchpad.dev')7 >>> user_browser.open('http://launchpad.dev')
8 >>> user_browser.getLink('Create a new project').click()8 >>> user_browser.getLink('Register a project').click()
9 >>> print user_browser.title9 >>> print user_browser.title
10 Register a project in Launchpad...10 Register a project in Launchpad...
1111
@@ -144,7 +144,7 @@
144Firefox.144Firefox.
145145
146 >>> user_browser.open('http://launchpad.dev')146 >>> user_browser.open('http://launchpad.dev')
147 >>> user_browser.getLink('Create a new project').click()147 >>> user_browser.getLink('Register a project').click()
148 >>> print user_browser.title148 >>> print user_browser.title
149 Register a project in Launchpad...149 Register a project in Launchpad...
150150
151151
=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-05-17 13:14:46 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-06-12 14:35:43 +0000
@@ -549,7 +549,7 @@
549James uses the 'delete-packages' interface in his PPA to delete the549James uses the 'delete-packages' interface in his PPA to delete the
550'pmount' source in hoary.550'pmount' source in hoary.
551551
552 >>> jblack_browser.getLink('PPA').click()552 >>> jblack_browser.getLink('Cancel').click()
553 >>> jblack_browser.getLink('Delete packages').click()553 >>> jblack_browser.getLink('Delete packages').click()
554 >>> jblack_browser.getControl(554 >>> jblack_browser.getControl(
555 ... name='field.selected_sources').value = [pmount_pub_id]555 ... name='field.selected_sources').value = [pmount_pub_id]
556556
=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate.txt 2010-04-29 12:38:47 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate.txt 2010-06-12 14:35:43 +0000
@@ -235,13 +235,13 @@
235235
236 >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/'236 >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/'
237 ... '+source/evolution/+pots/evolution-2.2/ab/+translate')237 ... '+source/evolution/+pots/evolution-2.2/ab/+translate')
238 >>> print extract_text(find_tag_by_id(238 >>> for message in get_feedback_messages(browser.contents):
239 ... browser.contents, 'maincontent'))239 ... print extract_text(message)
240 Launchpad can&#8217;t handle the plural items ...240 Launchpad can&#8217;t handle the plural items ...
241241
242 >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/'242 >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/'
243 ... '+source/evolution/+pots/evolution-2.2/ab/5/+translate')243 ... '+source/evolution/+pots/evolution-2.2/ab/5/+translate')
244 >>> print extract_text(find_tag_by_id(244 >>> for message in get_feedback_messages(browser.contents):
245 ... browser.contents, 'maincontent'))245 ... print extract_text(message)
246 Launchpad can&#8217;t handle the plural items ...246 Launchpad can&#8217;t handle the plural items ...
247247