Launchpad itself

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

  1. whatsnew-1006
  2. Merge into devel
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
1=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
2--- lib/lp/app/browser/tests/base-layout.txt 2010-06-16 19:07:12 +0000
3+++ lib/lp/app/browser/tests/base-layout.txt 2010-06-25 16:33:38 +0000
4@@ -450,20 +450,14 @@
5 >>> footer = find_tag_by_id(html, 'footer')
6 >>> for tag in footer.findAll('a'):
7 ... print tag.string, tag['href']
8- None
9- http://launchpad.dev/
10- Take the tour
11- http://launchpad.dev/+tour
12- Read the guide
13- https://help.launchpad.net/
14- Canonical Ltd.
15- http://canonical.com/
16- Terms of use
17- http://launchpad.dev/legal
18- Contact Launchpad Support
19- https://help.launchpad.net/Feedback
20- System status
21- http://identi.ca/launchpadstatus
22+ None http://launchpad.dev/
23+ Take the tour http://launchpad.dev/+tour
24+ Read the guide https://help.launchpad.net/
25+ Canonical Ltd. http://canonical.com/
26+ Terms of use http://launchpad.dev/legal
27+ Contact Launchpad Support https://help.launchpad.net/Feedback
28+ System status http://identi.ca/launchpadstatus
29+ None http://www.surveymonkey.com/s/launchpadsummer2010
30
31
32 Page registering
33
34=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
35--- lib/lp/app/templates/base-layout-macros.pt 2010-06-18 00:46:17 +0000
36+++ lib/lp/app/templates/base-layout-macros.pt 2010-06-25 16:33:38 +0000
37@@ -418,6 +418,9 @@
38  • 
39 <a href="http://identi.ca/launchpadstatus"
40 >System status</a>
41+ &nbsp;&bull;&nbsp;
42+ <a href="http://www.surveymonkey.com/s/launchpadsummer2010"
43+ ><strong>Take our survey!</strong></a>
44 <span id="lp-version" tal:condition="not:is_lpnet">
45 &nbsp;&bull;&nbsp;
46 r<tal:revno replace="revno" />
47
48=== modified file 'lib/lp/app/templates/root-index.pt'
49--- lib/lp/app/templates/root-index.pt 2010-06-11 18:40:23 +0000
50+++ lib/lp/app/templates/root-index.pt 2010-06-25 16:33:38 +0000
51@@ -132,6 +132,16 @@
52 <h2>Recent Launchpad blog posts</h2>
53 <ul>
54 <li class="news">
55+ <a href="http://www.surveymonkey.com/s/launchpadsummer2010">
56+ Take the Launchpad survey</a><span class="registered"> &ndash; 01 July 2010</span><br />
57+ Tell us a little about how you use Launchpad by answering our short survey.
58+ </li>
59+ <li class="news">
60+ <a href="http://blog.launchpad.net?p=1607">
61+ SFTP uploads</a><span class="registered"> &ndash; 01 July 2010</span><br />
62+ Upload source packages to your Personal Package Archive using SFTP.
63+ </li>
64+ <li class="news">
65 <a href="http://blog.launchpad.net?p=1513">
66 2GiB PPAs for everyone!</a><span class="registered"> &ndash; 04 May 2010</span><br />
67 We've doubled the standard Personal Package Archive size to 2 GiB.
68@@ -148,17 +158,6 @@
69 Launchpad now helps you specify which Ubuntu package is associated with any project in Launchpad.
70 </li>
71 <li class="news">
72- <a href="http://blog.launchpad.net?p=1501">
73- Easier project configuration</a><span class="registered"> &ndash; 04 May 2010</span><br />
74- There are new links to configure your project's use of Launchpad right on its project overview page.
75- </li>
76- <li class="news">
77- <a href="http://blog.launchpad.net/?p=1356">
78- Finding and managing patches</a><span class="registered"> &ndash; 03 Mar 2010</span><br />
79- Pick the low-hanging fruit. Launchpad now makes it easy to find and work with all bug
80- patches associated with a project or package.
81- </li>
82- <li class="news">
83 <a href="http://blog.launchpad.net/general/launchpad-is-now-open-source">
84 Launchpad now open source</a><span class="registered"> &ndash; 21 Jul 2009</span><br />
85 Get the code to Launchpad and join our development community.