Merge lp:~matthew.revell/launchpad/whatsnew-1006 into lp:launchpad

Proposed by Matthew Revell
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: 11066
Proposed branch: lp:~matthew.revell/launchpad/whatsnew-1006
Merge into: lp:launchpad
Diff against target: 85 lines (+21/-25)
3 files modified
lib/lp/app/browser/tests/base-layout.txt (+8/-14)
lib/lp/app/templates/base-layout-macros.pt (+3/-0)
lib/lp/app/templates/root-index.pt (+10/-11)
To merge this branch: bzr merge lp:~matthew.revell/launchpad/whatsnew-1006
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+28519@code.launchpad.net

Description of the change

Updates the "What's new" on the front page and adds a link to the survey in the footer, updating base-layout.txt test to take account of that.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt 2010-06-16 19:07:12 +0000
+++ lib/lp/app/browser/tests/base-layout.txt 2010-06-25 16:33:38 +0000
@@ -450,20 +450,14 @@
450 >>> footer = find_tag_by_id(html, 'footer')450 >>> footer = find_tag_by_id(html, 'footer')
451 >>> for tag in footer.findAll('a'):451 >>> for tag in footer.findAll('a'):
452 ... print tag.string, tag['href']452 ... print tag.string, tag['href']
453 None453 None http://launchpad.dev/
454 http://launchpad.dev/454 Take the tour http://launchpad.dev/+tour
455 Take the tour455 Read the guide https://help.launchpad.net/
456 http://launchpad.dev/+tour456 Canonical Ltd. http://canonical.com/
457 Read the guide457 Terms of use http://launchpad.dev/legal
458 https://help.launchpad.net/458 Contact Launchpad Support https://help.launchpad.net/Feedback
459 Canonical Ltd.459 System status http://identi.ca/launchpadstatus
460 http://canonical.com/460 None http://www.surveymonkey.com/s/launchpadsummer2010
461 Terms of use
462 http://launchpad.dev/legal
463 Contact Launchpad Support
464 https://help.launchpad.net/Feedback
465 System status
466 http://identi.ca/launchpadstatus
467461
468462
469Page registering463Page registering
470464
=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt 2010-06-18 00:46:17 +0000
+++ lib/lp/app/templates/base-layout-macros.pt 2010-06-25 16:33:38 +0000
@@ -418,6 +418,9 @@
418  • 418  • 
419 <a href="http://identi.ca/launchpadstatus"419 <a href="http://identi.ca/launchpadstatus"
420 >System status</a>420 >System status</a>
421 &nbsp;&bull;&nbsp;
422 <a href="http://www.surveymonkey.com/s/launchpadsummer2010"
423 ><strong>Take our survey!</strong></a>
421 <span id="lp-version" tal:condition="not:is_lpnet">424 <span id="lp-version" tal:condition="not:is_lpnet">
422 &nbsp;&bull;&nbsp;425 &nbsp;&bull;&nbsp;
423 r<tal:revno replace="revno" />426 r<tal:revno replace="revno" />
424427
=== modified file 'lib/lp/app/templates/root-index.pt'
--- lib/lp/app/templates/root-index.pt 2010-06-11 18:40:23 +0000
+++ lib/lp/app/templates/root-index.pt 2010-06-25 16:33:38 +0000
@@ -132,6 +132,16 @@
132 <h2>Recent Launchpad blog posts</h2>132 <h2>Recent Launchpad blog posts</h2>
133 <ul>133 <ul>
134 <li class="news">134 <li class="news">
135 <a href="http://www.surveymonkey.com/s/launchpadsummer2010">
136 Take the Launchpad survey</a><span class="registered"> &ndash; 01 July 2010</span><br />
137 Tell us a little about how you use Launchpad by answering our short survey.
138 </li>
139 <li class="news">
140 <a href="http://blog.launchpad.net?p=1607">
141 SFTP uploads</a><span class="registered"> &ndash; 01 July 2010</span><br />
142 Upload source packages to your Personal Package Archive using SFTP.
143 </li>
144 <li class="news">
135 <a href="http://blog.launchpad.net?p=1513">145 <a href="http://blog.launchpad.net?p=1513">
136 2GiB PPAs for everyone!</a><span class="registered"> &ndash; 04 May 2010</span><br />146 2GiB PPAs for everyone!</a><span class="registered"> &ndash; 04 May 2010</span><br />
137 We've doubled the standard Personal Package Archive size to 2 GiB.147 We've doubled the standard Personal Package Archive size to 2 GiB.
@@ -148,17 +158,6 @@
148 Launchpad now helps you specify which Ubuntu package is associated with any project in Launchpad.158 Launchpad now helps you specify which Ubuntu package is associated with any project in Launchpad.
149 </li>159 </li>
150 <li class="news">160 <li class="news">
151 <a href="http://blog.launchpad.net?p=1501">
152 Easier project configuration</a><span class="registered"> &ndash; 04 May 2010</span><br />
153 There are new links to configure your project's use of Launchpad right on its project overview page.
154 </li>
155 <li class="news">
156 <a href="http://blog.launchpad.net/?p=1356">
157 Finding and managing patches</a><span class="registered"> &ndash; 03 Mar 2010</span><br />
158 Pick the low-hanging fruit. Launchpad now makes it easy to find and work with all bug
159 patches associated with a project or package.
160 </li>
161 <li class="news">
162 <a href="http://blog.launchpad.net/general/launchpad-is-now-open-source">161 <a href="http://blog.launchpad.net/general/launchpad-is-now-open-source">
163 Launchpad now open source</a><span class="registered"> &ndash; 21 Jul 2009</span><br />162 Launchpad now open source</a><span class="registered"> &ndash; 21 Jul 2009</span><br />
164 Get the code to Launchpad and join our development community.163 Get the code to Launchpad and join our development community.