Merge lp:~henninge/launchpad/bug-431244 into lp:launchpad

[Henning Eggers]

[Henning Eggers (henninge)]

= Summary =

The new Launchpad 3.0 home page!
See the discussion in the bug ... ;-)

== Implementation details ==

To be able to click on Link/Register in the top right corner, using the "locationless" template, I added set the height of locationbar to 1em (it was 0). This adds that much space to the top of all Launchpad pages but that does not look too bad ...

== Tests ==

bin/test -vvct front-pages

...and various other tests that are updated with this branch

== Demo ==

https://launchpad.dev/

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/icing/style.css
  lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt
  lib/canonical/launchpad/pagetests/basics/page-request-summaries.txt
  lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt
  lib/canonical/launchpad/pagetests/basics/xx-copyright.txt
  lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt
  lib/canonical/launchpad/templates/root-index.pt
  lib/canonical/testing/ftests/test_layers.py
  lib/lp/registry/browser/root.py
  lib/lp/registry/stories/launchpad-root/xx-featuredprojects.txt

== Pylint notices ==

lib/canonical/testing/ftests/test_layers.py
    24: [F0401] Unable to import 'lazr.config' (No module named config)

lib/lp/registry/browser/root.py
    44: [F0401] Unable to import 'lazr.batchnavigator.z3batching' (No module named batchnavigator)
    534: [E1002, WindowedListBatch.__iter__] Use super on an old style class

Seriously, I did not touch that. These F401 seem strange, too. Have seen that before but the view works fine ...

[Barry Warsaw (barry)]

On Sep 18, 2009, at 06:15 PM, Henning Eggers wrote:

>https://launchpad.dev/

Hi Henning,

This is a ui review. First, thanks for taking this on. Given it's the first
impression many people will have of us, your branch making it look great is so
important! And I think you /have/ made it look great. I have just a few
suggestions.

* In Martin's mockup 'Register' is called 'Create an account' for non-logged
  in users. Is that easy to change?

* Also for non-logged in users, Martin's mockup appears to line the 'Take the
  tour' icon under all the bullets in the feature list. Your branch shows
  icons for the various features instead of bullets, which I like, but the
  Tour icon is misplaced several pixes to the left.

  I suspect that lining it up under the feature icons wouldn't give the needed
  emphasis to the tour link. You can try it though and see what you think.
  Another option would be to move the Tour link to the 'Get started' section,
  which kind of makes more sense to me anyway. Would that be hard to move and
  if not, does it look okay?

  Ah, in fact for a logged in user, that's exactly where it shows up, but I
  see that it's lined up right under the other icons, so maybe it would be
  okay (and enough) to do that for the non-logged in user.

* If possible, it would be cool if the numbers in the little "20 projects, 12
  bugs, 30 branches" sub-heading were colored in the app-colors, like other
  displays like this. See style-3-0.css for the classes you can put on the
  <b> wrapper around the numbers. (Same goes for the "Browser all *20*
  projects" under the Featured projects section.)

* Do you think the words "sandbox environment" should be linked to staging's
  front page?

* "bazaar" should be capitalized.

* For a not-logged in newbie, the "(Unspecified)" tags will be completely
  meaningless. Well, they're meaningless to me too! This may just be an
  artifact of sampledata, but it would be nice to get rid of those tags.

For now, let's wait on ui approval.

 review needsfixing ui*

review: Needs Fixing (ui*)

[Barry Warsaw (barry)]

> For now, let's wait on ui approval.

I probably should have read the entire history of the bug first, but I've done
that now and see that you and Kiko have touched on many of the same issues.
Because PQM closes on Monday and this is definitely a big improvement over
what we have, I'm changing my ui review to approved. Please fix what you can,
but don't let it hold up your branch if you can't get me to re-review your
branch. You should try to get a second ui review though (I am just a
ui-mentat).

review: Approve (ui*)

[Guilherme Salgado (salgado)]

Hi Henning,

There are a few improvements we can make to this branch, but they're
quite simple. You have r=me with these changes done.

 review approve

> === modified file 'lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt'
> --- lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt 2009-01-28 21:47:33 +0000
> +++ lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt 2009-09-18 18:04:16 +0000
> @@ -17,32 +17,46 @@
>
> And links to the important applications and facets:
>
> - >>> people_link = browser.getLink(url='/people')
> - >>> people_link.url
> - 'http://launchpad.dev/people/+newteam'
> -
> - >>> people_link.text
> - '[IMG]'
> -
> >>> code_link = browser.getLink(url='code')
> >>> code_link.url
> 'http://code.launchpad.dev/'
>
> >>> code_link.text
> - 'Code'
> + '[IMG]'
>
> It also includes a search form...
>
> - >>> '<input type="submit" value="Search Launchpad"' in browser.contents
> + >>> ('<input id="search" type="submit" '+
> + ... 'value="Search Launchpad"') in browser.contents

Please use browser.getControl() here to show that there's a search form. Tests
of the form 'something in browser.contents' are the among the worst things we
can have in pagetests.

> True
>
> ...and lists of featured projects and marketing material.
>
> - >>> for tag in find_tags_by_class(browser.contents, 'three column left'):
> - ... print extract_text(tag.renderContents())
> + >>> featured = find_tag_by_id(browser.contents, 'homepage-featured')
> + >>> print extract_text(featured.renderContents())
> Featured projects
> ...
> Ubuntu
> + ...
> +
> +The homepage looks different when the use is logged in:
> +
> + >>> user_browser = setupBrowser(auth="Basic <email address hidden>:test")
> + >>> user_browser.open('http://launchpad.dev/')
> +
> +Now there are links to create projects and teams:
> +
> + >>> project_link = user_browser.getLink(url='/projects')
> + >>> project_link.url
> + 'http://launchpad.dev/projects/+new'
> + >>> project_link.text
> + '[IMG]'
> +
> + >>> people_link = user_browser.getLink(url='/people')
> + >>> people_link.url
> + 'http://launchpad.dev/people/+newteam'
> + >>> people_link.text
> + '[IMG]'

I don't see what's the point of showing that the link's text is an image; I'd
rather not show that in the test, as it already shows that the link exists and
points to the correct place.

>
>
> The front pages for the other applications, however, do have
>
> === modified file 'lib/canonical/launchpad/templates/root-index.pt'
> --- lib/canonical/launchpad/templates/root-index.pt 2009-08-03 10:00:43 +0000
> +++ lib/canonical/launchpad/templates/root-index.pt 2009-09-18 18:04:16 +0000
> @@ -3,10 +3,7 @@
> xmlns:tal="http://xml.zope.org/namespaces/tal"
> xmlns:metal="http://xml.zope.org/namespaces/metal"
> xmlns:i18n="http://xml.zope.org/namespaces/i18n"
> - xml:lang="en"
> - lang="en"
> - dir="ltr"
> - metal:use-macro="view/macro:page/search"
> + metal:use-macro="view/macro:page/locationless"
> i18n:domain="launchpad">
> <body>
> <div metal:fill-slot="main">
> @@ -35,21 +32,19 @@
> </tal:comment>
> ...

review: Approve

[Henning Eggers (henninge)]

Am 18.09.2009 22:54, Guilherme Salgado schrieb:
> Review: Approve
> Hi Henning,
>
> There are a few improvements we can make to this branch, but they're
> quite simple. You have r=me with these changes done.

Thanks for the review, I applied all the changes. I had never used
fmt:shorten though I think I have read it before. Thanks for that
valuable tip.

I went through the whole template and fixed the indention.

Thanks again! ;-)

Henning

[Henning Eggers (henninge)]

Am 18.09.2009 21:33, Barry Warsaw schrieb:
> Review: Needs Fixing ui*
> On Sep 18, 2009, at 06:15 PM, Henning Eggers wrote:
>
>> https://launchpad.dev/
>
> Hi Henning,
>
> This is a ui review. First, thanks for taking this on. Given it's the first
> impression many people will have of us, your branch making it look great is so
> important! And I think you /have/ made it look great. I have just a few
> suggestions.

I am glad you like it. I am aware that you have changed your review
since but I'd still like to address your suggestions.

>
> * In Martin's mockup 'Register' is called 'Create an account' for non-logged
> in users. Is that easy to change?

No, it is part of the "locationless" template.

>
> * Also for non-logged in users, Martin's mockup appears to line the 'Take the
> tour' icon under all the bullets in the feature list. Your branch shows
> icons for the various features instead of bullets, which I like, but the
> Tour icon is misplaced several pixes to the left.
>
> I suspect that lining it up under the feature icons wouldn't give the needed
> emphasis to the tour link. You can try it though and see what you think.
> Another option would be to move the Tour link to the 'Get started' section,
> which kind of makes more sense to me anyway. Would that be hard to move and
> if not, does it look okay?

It would probably not be hard to move but I don't want to risk upsetting
pagetests at this stage ;-)

>
> Ah, in fact for a logged in user, that's exactly where it shows up, but I
> see that it's lined up right under the other icons, so maybe it would be
> okay (and enough) to do that for the non-logged in user.

The point is that the left bullet list is a continuation of the
introductory sentence "Launchpad is ..." and the list items are features
of Launchpad. The "Take the Tour!" does not fit that category. I admit
it is probably not the best placement but that will have to be addressed
later.

>
> * If possible, it would be cool if the numbers in the little "20 projects, 12
> bugs, 30 branches" sub-heading were colored in the app-colors, like other
> displays like this. See style-3-0.css for the classes you can put on the
> <b> wrapper around the numbers. (Same goes for the "Browser all *20*
> projects" under the Featured projects section.)

What a nice idea and so easy to implement. Done. Although it does not
show for the projects since there colour is default, i.e. black and it
is inside an <a>.

>
> * Do you think the words "sandbox environment" should be linked to staging's
> front page?

I didn't on purpose because I think people should be forced to read the
wiki page first. Once they know about staging, they will enter the url
directly.

>
> * "bazaar" should be capitalized.

Yeah, obviously. Thank you! ;) I copied that from Martin ...

>
> * For a not-logged in newbie, the "(Unspecified)" tags will be completely
> meaningless. Well, they're meaningless to me too! This may just be an
> artifact of sampledata, but it would be nice to get rid of those tags.

That is part of fmt:link for projects. Since we can safely assume that
featured projects in real life *will* hav...

[Barry Warsaw (barry)]

Just a quick note and then I'm done. :)

On Sep 18, 2009, at 7:45 PM, Henning Eggers wrote:

>> * If possible, it would be cool if the numbers in the little "20
>> projects, 12
>> bugs, 30 branches" sub-heading were colored in the app-colors,
>> like other
>> displays like this. See style-3-0.css for the classes you can put
>> on the
>> <b> wrapper around the numbers. (Same goes for the "Browser all
>> *20*
>> projects" under the Featured projects section.)
>
> What a nice idea and so easy to implement. Done. Although it does not
> show for the projects since there colour is default, i.e. black and it
> is inside an <a>.

The "registry-app" color is black, for people, projects, teams...

-Barry

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2009-09-16 10:03:52 +0000
+++ lib/canonical/launchpad/icing/style.css	2009-09-18 18:04:16 +0000
@@ -1568,64 +1568,125 @@
 #packages h1, #projects h1 {margin-top: 1.2em;}
 
 /* --- Home --- */
-#home-description {
-  font-size: 1.5em;
-  font-family: "URW Gothic L","MgOpen Moderna","Lucida Sans",sans-serif;
-  text-align: center;
-  margin: auto;
-  margin-top: 1em;
-  margin-bottom: 1em;
-  padding: 0.5em;
-  background-color: #ededed;
-  width: 90%;
-}
-#home-description .smaller {
-  font-size: 80%;
-}
-#home-stats {
-  margin: auto;
-  text-align: center;
-  color: gray;
-  max-width: 40em;
-}
-#home-page h2 {
-  width: 100%;
-  text-align: center;
-  margin-left: -0.8em;
-}
-#home-page img {
-  vertical-align: middle;
-}
-#featured-projects ul {
-  list-style-type: none;
-  width: 50%;
-  margin: 0;
-  padding: 0 ;
-  float: left;
-}
-#featured-projects li {
-  padding-bottom: 2px;
-}
-.home-banners {
-  background-color: #8890ff;
-  width: 220px;
-  padding: 1em 0 1em 1em;
-  margin-top: 1em;
-  overflow: hidden;
-  -moz-border-radius: 5px;
-  -o-border-radius: 5px;
-  -webkit-border-radius: 5px;
-}
-.home-banners a {
-  font-weight: bold;
-  color: white;
-}
-.home-banner-container {
-  width: 100%;
-  background-color: #ededed;
-  padding: 1em;
-  padding-top: 0;
-}
+
+/* The following style works around the fact that the locationbar, which is
+only used of the Login/Register links in 3.0 UI, is accessible on
+"locationless" pages. It adds extra space at the top of every page in
+Launchpad but that does actually look quite good ... ;-).*/
+#locationbar {
+    height: 1em;
+}
+
+#homepage {
+    margin: auto;
+    width: 90%;
+    max-width: 80em;
+}
+
+.homepage-portlet {
+    margin-bottom: 3em;
+    line-height: 140%;
+}
+
+.homepage-portlet h2 {
+    margin-bottom: 0.5em;
+    font-size: 131%;
+}
+
+/* Home: search form */
+
+#homepage-searchform {
+    text-align: center;
+}
+
+#homepage-stats {
+    max-width: 50em;
+    margin: auto;
+    padding-top: 0.5em;
+    color: gray;
+    font-size: 83.3%
+}
+
+/* Home: What's launchpad */
+
+#homepage-whatslaunchpad ul {
+    margin-left: 1em;
+    margin-bottom: 0.5em;
+}
+
+#homepage-whatslaunchpad ul,
+#homepage-whatslaunchpad-tour {
+    font-size: 116%;
+    font-weight: bold;
+}
+
+/* Home: blog posts */
+
+#homepage-blogposts {
+    padding-right: 4em;
+}
+
+#homepage-blogposts .blogdate {
+    font-size: 85%;
+    color: grey;
+}
+
+#homepage-blogposts-older {
+    text-align: right;
+}
+
+/* Home: Get started */
+
+#homepage-getstarted ul {
+    margin-top: 0.5em;
+}
+
+/* Home: Featured projects */
+
+#homepage-featured {
+    width: 100%;
+}
+
+#homepage-featured ul {
+    width: 48%;
+}
+
+#homepage-featured-left {
+    float: left;
+}
+
+#homepage-featured-right {
+    float: right;
+}
+
+#homepage-featured-top img {
+    float: left;
+}
+#homepage-featured-top-title {
+    height: 64px;
+    display: block;
+    margin-left: 70px;
+}
+
+#homepage-featured-top-title span{
+    font-size: 131%;
+    font-weight: bold;
+    position: relative;
+    top: 20px;
+}
+
+#homepage-featured-top-text {
+    margin-top: 0.5em;
+    margin-bottom: 1em;
+}
+
+#homepage-featured-more {
+    margin-top: 0.5em;
+    text-align: right;
+    clear: both;
+}
+
+/* -- Notices -- */
 
 .important-notice-container {
   text-align: center;

=== modified file 'lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt'
--- lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt	2009-09-17 15:24:12 +0000
+++ lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt	2009-09-18 18:04:16 +0000
@@ -59,23 +59,6 @@
     >>> print browser.getLink(url="http://example.com").text
     File a bug
 
-And for a non-3-0 page:
-
-    >>> browser.open('http://launchpad.dev/')
-    >>> print browser.contents
-    <...
-    <style...url(/@@/demo)...</style>
-    ...
-    >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))
-    |...Launchpad...) devmode demo site
-
-    >>> print extract_text(find_tags_by_class(
-    ...     browser.contents, 'sitemessage')[0])
-    This is a demo site mmk. File a bug.
-    >>> print browser.getLink(url="http://example.com").text
-    File a bug
-
-
 When you are not on a demo site, the text no longer appears.
 
     >>> # Restore the previous config:
@@ -92,15 +75,6 @@
     0
 
 
-And for a non-3-0 page:
-
-    >>> browser.open('http://launchpad.dev/')
-    >>> print extract_text(find_tag_by_id(browser.contents, 'lp-version'))
-    |...Launchpad...) devmode
-    >>> len(find_tags_by_class(browser.contents, 'sitemessage'))
-    0
-
-
 == Launchpad Edge ==
 
 Additionally, when a server is running as an edge server, the site-message

=== modified file 'lib/canonical/launchpad/pagetests/basics/page-request-summaries.txt'
--- lib/canonical/launchpad/pagetests/basics/page-request-summaries.txt	2009-09-16 22:57:42 +0000
+++ lib/canonical/launchpad/pagetests/basics/page-request-summaries.txt	2009-09-18 18:04:16 +0000
@@ -6,7 +6,7 @@
   >>> browser.open('http://launchpad.dev/')
   >>> print browser.contents
   <!DOCTYPE...
-  ...<!-- at least ... queries issued in ... seconds -->...
+  ...<!--... At least ... queries issued in ... seconds ...-->...
 
 It's available for any page:
 

=== modified file 'lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt'
--- lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt	2009-09-05 06:40:36 +0000
+++ lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt	2009-09-18 18:04:16 +0000
@@ -14,8 +14,11 @@
 
     >>> (page, summary) = browser.contents.split('</html>')
     >>> print summary
-    <!-- at least ... queries issued in ... seconds OOPS-... -->
-    <!-- Launchpad ... -->
+    <!-- ...
+    At least ... queries issued in ... seconds OOPS-...
+    <BLANKLINE>
+    Launchpad ...
+    -->
 
 The ++oops++ can be anywhere in the traversal.
 

=== modified file 'lib/canonical/launchpad/pagetests/basics/xx-copyright.txt'
--- lib/canonical/launchpad/pagetests/basics/xx-copyright.txt	2009-07-09 19:48:42 +0000
+++ lib/canonical/launchpad/pagetests/basics/xx-copyright.txt	2009-09-18 18:04:16 +0000
@@ -10,6 +10,6 @@
 The main template.
 
   >>> browser.open('http://launchpad.dev')
-  >>> print extract_text(find_tag_by_id(browser.contents, 'lp-arcana'))
-  &copy; 2004-2009 Canonical Ltd.
+  >>> print extract_text(find_tag_by_id(browser.contents, 'footer'))
+  &bull; ... &copy; 2004-2009 Canonical Ltd.
   ...

=== modified file 'lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt'
--- lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt	2009-01-28 21:47:33 +0000
+++ lib/canonical/launchpad/pagetests/launchpad-root/front-pages.txt	2009-09-18 18:04:16 +0000
@@ -17,32 +17,46 @@
 
 And links to the important applications and facets:
 
-  >>> people_link = browser.getLink(url='/people')
-  >>> people_link.url
-  'http://launchpad.dev/people/+newteam'
-
-  >>> people_link.text
-  '[IMG]'
-
   >>> code_link = browser.getLink(url='code')
   >>> code_link.url
   'http://code.launchpad.dev/'
 
   >>> code_link.text
-  'Code'
+  '[IMG]'
 
 It also includes a search form...
 
-  >>> '<input type="submit" value="Search Launchpad"' in browser.contents
+  >>> ('<input id="search" type="submit" '+
+  ...  'value="Search Launchpad"') in browser.contents
   True
 
 ...and lists of featured projects and marketing material.
 
-  >>> for tag in find_tags_by_class(browser.contents, 'three column left'):
-  ...     print extract_text(tag.renderContents())
+  >>> featured = find_tag_by_id(browser.contents, 'homepage-featured')
+  >>> print extract_text(featured.renderContents())
   Featured projects
   ...
   Ubuntu
+  ...
+
+The homepage looks different when the use is logged in:
+
+  >>> user_browser = setupBrowser(auth="Basic [e-mail]:test")
+  >>> user_browser.open('http://launchpad.dev/')
+
+Now there are links to create projects and teams:
+
+  >>> project_link = user_browser.getLink(url='/projects')
+  >>> project_link.url
+  'http://launchpad.dev/projects/+new'
+  >>> project_link.text
+  '[IMG]'
+
+  >>> people_link = user_browser.getLink(url='/people')
+  >>> people_link.url
+  'http://launchpad.dev/people/+newteam'
+  >>> people_link.text
+  '[IMG]'
 
 
 The front pages for the other applications, however, do have

=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
--- lib/canonical/launchpad/templates/root-index.pt	2009-08-03 10:00:43 +0000
+++ lib/canonical/launchpad/templates/root-index.pt	2009-09-18 18:04:16 +0000
@@ -3,10 +3,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/search"
+  metal:use-macro="view/macro:page/locationless"
   i18n:domain="launchpad">
   <body>
     <div metal:fill-slot="main">
@@ -35,21 +32,19 @@
       </tal:comment>
       <!-- Is your project registered yet? -->
 
-      <form
+  <div id="homepage">
+    <div class="top-portlet">
+      <img src="/@@/launchpad-logo-and-name.png"
+           alt=""
+           style="margin: 0 9em 1em 0"/>
+      <form id="homepage-searchform"
         xml:lang="en" lang="en" dir="ltr"
         tal:attributes="action string:${rooturl}+search"
-        method="get"
-        accept-charset="UTF-8"
-        style="text-align: center"
-      >
-        <img src="/@@/launchpad-logo-and-name.png"
-             alt=""
-             style="margin: 0 9em 1em 0"/>
-        <br />
-        <input id="text" type="text" name="field.text" size="50" />
-        <input type="submit" value="Search Launchpad" />
+        method="get" accept-charset="UTF-8">
+        <input id="text" type="text" name="field.text" size="45" />
+        <input id="search" type="submit" value="Search Launchpad" />
       </form>
-      <div id="home-stats">
+      <div id="homepage-stats">
         <strong tal:content="view/project_count/fmt:intcomma">123</strong>&nbsp;projects,
         <strong tal:content="view/bug_count/fmt:intcomma">123</strong>&nbsp;bugs,
         <strong tal:content="view/branch_count/fmt:intcomma">123</strong>&nbsp;branches,
@@ -58,25 +53,137 @@
         <strong tal:content="view/blueprint_count/fmt:intcomma">123</strong>&nbsp;blueprints,
         and&nbsp;counting...
       </div>
-      <div id="home-description">
-        Launchpad is a code hosting and software collaboration platform.<br />
-        <span class="smaller">Launchpad is open source -- you can <a href="https://dev.launchpad.net/">join the community</a> of people
-        who help improve it.</span>
-      </div>
-      <div id="home-page" style="width:90%; max-width:80em; margin:auto;">
-        <div class="three column left" id="featured-projects">
+    </div>
+
+      <div class="yui-gc">
+
+        <div class="yui-u first">
+        <div id="homepage-whatslaunchpad" class="homepage-portlet"
+             tal:condition="not:view/is_logged_in">
+          <h2>Launchpad 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>
+          </ul>
+          <div id="homepage-whatslaunchpad-tour">
+            <a href="/+tour"><img src="/@@/tour-icon" alt=""
+                    /></a> <a href="/+tour">Take the tour!</a>
+           </div>
+        </div>
+         <div id="homepage-blogposts" class="homepage-portlet">
+          <h2>Recent Launchpad blog posts</h2>
+          <ul>
+           <li class="news">
+              <a href="http://blog.launchpad.net/?p=1010">
+                  Welcome to Launchpad 3.0</a><span class="blogdate"> &ndash; 23 Sep 2009</span><br />
+                  Find out what's new in the latest version of Launchpad.
+           </li>
+           <li class="news">
+              <a href="http://blog.launchpad.net/?p=1019">
+                Talking about Launchpad's new UI</a><span class="blogdate"> &ndash; 23 Sep 2009</span><br />
+                Martin Albisetti &mdash; Launchpad's design guy &mdash; on the new
+                web interface.
+           </li>
+           <li class="news">
+              <a href="http://blog.launchpad.net/?p=1021">
+                Under the hood</a><span class="blogdate"> &ndash; 23 Sep 2009</span><br />
+                Bj&ouml;rn Tillenius &mdash; Launchpad technical architect &mdash; talks
+                about the inner workings of Launchpad.
+           </li>
+           <li class="news">
+              <a href="http://blog.launchpad.net/general/launchpad-is-now-open-source">
+                Launchpad now open source!</a><span class="blogdate"> &ndash; 21 Jul 2009</span><br />
+                  Translate a phrase once, have it show up in all your releases.
+           </li>
+           <li class="news">
+              <a href="http://blog.launchpad.net/?p=551">
+                Launchpad for commercial projects</a><span class="blogdate"> &ndash; 25 Feb 2009</span><br />
+                Find out more about Launchpad's privacy features for your commercial projects.
+           </li>
+          </ul>
+          <div id="homepage-blogposts-older">
+            <a href="http://blog.launchpad.net">&gt; Read the blog</a>
+          </div>
+          </div>
+        </div>
+
+        <div class="yui-u">
+          <div id="homepage-getstarted" class="homepage-portlet">
+              <h2>Get started</h2>
+                <tal:logged_out condition="not:view/is_logged_in" omit-tag="">
+                <a href="/+login">Creating an account</a> allows you to start
+                working within Launchpad.<br />
+                </tal:logged_out>You can test Launchpad's functionality
+                in our sandbox environment.
+                (<a href="https://help.launchpad.net/StagingServer">What's this?</a>)<br />
+                
+                <tal:logged_in condition="view/is_logged_in" omit-tag="">
+                If you're ready, you can:
+                <ul tal:define="apphomes view/apphomes">
+                  <li><a href="https://help.launchpad.net/">
+                    <img src="/@@/info" alt="" /></a>
+                    <a href="https://help.launchpad.net/"> Read the user guide</a></li>
+                  <li><a href="/projects/+new"><img src="/@@/add" /></a>
+                    <a href="/projects/+new">Create a new project</a></li>
+                  <li><a href="/people/+newteam"><img src="/@@/add" /></a>
+                    <a href="/people/+newteam">Create a new team</a></li>
+                  <li><a tal:attributes="href apphomes/bugs">
+                    <img src="/@@/bug" /></a>
+                    <a tal:attributes="href apphomes/bugs">Browse bugs</a></li>
+                  <li><a tal:attributes="href apphomes/translations">
+                    <img src="/@@/translation" /></a>
+                    <a tal:attributes="href apphomes/translations">Help translate</a></li>
+                  <li><a tal:attributes="href apphomes/answers">
+                    <img src="/@@/question" alt="" /></a>
+                    <a tal:attributes="href apphomes/answers">Find answers</a></li>
+                  <li><a href="/+tour"><img src="/@@/tour-icon" /></a>
+                     <a href="/+tour">Take the tour</a></li>
+                </ul>
+                </tal:logged_in>
+          </div>
+         <div id="homepage-featured" class="homepage-portlet">
           <h2>Featured projects</h2>
-          <div style="margin:auto;">
-            <ul>
+          <div id="homepage-featured-top"
+               tal:define="topproject view/featured_projects_top">
+            <a tal:attributes="href topproject/fmt:url">
+              <img tal:replace="structure topproject/image:logo" />
+              <div id="homepage-featured-top-title">
+                <span tal:content="topproject/displayname">Foo project</span>
+              </div>
+            </a>
+          <div id="homepage-featured-top-text"
+               tal:content="structure view/featured_projects_top_summary">
+               Foo project is great... </div>
+          </div>
+            <ul id="homepage-featured-left">
               <li tal:repeat="project view/featured_projects_col_a">
                 <a tal:replace="structure project/fmt:link" />
               </li>
             </ul>
-            <ul>
+            <ul id="homepage-featured-right">
               <li tal:repeat="project view/featured_projects_col_b">
                 <a tal:replace="structure project/fmt:link" />
               </li>
             </ul>
+            <div id="homepage-featured-more">
+              <a href="/projects">Browse all <strong
+                tal:content="view/project_count">42</strong> projects</a>!
+            </div>
             <div tal:condition="context/required:launchpad.Admin"
                  style="margin:auto; clear:both; text-align: center; padding-top: 1em;">
               <a href="+featuredprojects">&raquo; Manage featured project list</a>
@@ -84,69 +191,8 @@
           </div>
         </div>
 
-        <div class="three column middle">
-          <h2>What&#8217;s new?</h2>
-          <ul style="padding: 0; margin: auto;">
-           <li class="news">
-              <a href="http://blog.launchpad.net/general/launchpad-is-now-open-source">
-                <strong>Launchpad now open source!</strong><br />
-           		  Get the code to Launchpad and join our development community.
-              </a>
-           </li>
-           <li class="news">
-              <a href="http://blog.launchpad.net/general/exporting-translations-to-a-bazaar-branch">
-                <strong>Export translations to Bazaar branches</strong><br />
-           		  Have Launchpad automatically commit your project's translations to a branch of code.
-              </a>
-           </li>
-           <li class="news">
-              <a href="http://blog.launchpad.net/cool-new-stuff/automatically-import-files-to-launchpad-using-product-release-finder">
-                <strong>Automatic release file imports</strong><br />
-           		  Launchpad will find and automatically import your project's release files.
-              </a>
-           </li>
-           <li class="news">
-              <a href="http://blog.launchpad.net/translations/sharing-translations">
-                <strong>Share translations between releases</strong><br />
-           		  Translate a phrase once, have it show up in all your releases.
-              </a>
-           </li>
-           <li class="news">
-              <a href="http://blog.launchpad.net/?p=551">
-                <strong>Launchpad for commercial projects</strong><br />
-                Find out more about Launchpad's privacy features for your commercial projects.
-              </a>
-           </li>
-          </ul>
-          <div class="discreet" style="text-align: right">
-            Updated 2009-08-03.
-            <a href="http://blog.launchpad.net">Read our blog!</a>
-          </div>
-        </div>
-        <div class="three column right">
-          <div style="margin:auto; width:230px;">
-            <h2>Get started</h2>
-              <div class="home-banners">
-                <a href="/projects/+new"><img src="/@@/add"
-                /></a> <a href="/projects/+new">Create a new project</a><br/>
-                <a href="/people/+newteam"><img src="/@@/add"
-                /></a> <a href="/people/+newteam">Create a new team</a>
-              </div>
-              <div class="home-banners">
-                <a href="/projects"><img src="/@@/project" alt=""
-                /></a> <a href="/projects">Browse projects</a><br/>
-                <a href="/people"><img src="/@@/crowd" alt=""
-                /></a> <a href="/people">Browse people &amp; teams</a>
-              </div>
-              <div class="home-banners">
-                <a href="/+tour"><img src="/@@/tour-icon" alt=""
-                /></a> <a href="/+tour">Take the tour</a><br/>
-                <a href="https://help.launchpad.net/"><img src="/@@/maybe" alt=""
-                /></a> <a href="https://help.launchpad.net/">Read the guide</a>
-              </div>
-          </div>
-        </div>
-      </div><!-- 3 cols -->
+      </div><!-- yui-g -->
+      </div><!-- homepage -->
     </div><!--main-->
   </body>
 </html>

=== modified file 'lib/canonical/testing/ftests/test_layers.py'
--- lib/canonical/testing/ftests/test_layers.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/testing/ftests/test_layers.py	2009-09-18 18:04:16 +0000
@@ -343,7 +343,7 @@
         mainsite = LayerProcessController.appserver_config.vhost.mainsite
         home_page = urlopen(mainsite.rooturl).read()
         self.failUnless(
-            'What is Launchpad?' in home_page,
+            'Is your project registered yet?' in home_page,
             "Home page couldn't be retrieved:\n%s" % home_page)
 
     def testSMTPServerIsAvailable(self):

=== modified file 'lib/lp/registry/browser/root.py'
--- lib/lp/registry/browser/root.py	2009-09-16 08:08:56 +0000
+++ lib/lp/registry/browser/root.py	2009-09-18 18:04:16 +0000
@@ -18,11 +18,14 @@
 from zope.schema.interfaces import TooLong
 from zope.schema.vocabulary import getVocabularyRegistry
 
+
 from canonical.config import config
 from canonical.cachedproperty import cachedproperty
 from lp.registry.browser.announcement import HasAnnouncementsView
 from canonical.launchpad.interfaces.launchpadstatistic import (
     ILaunchpadStatisticSet)
+from canonical.launchpad.utilities.celebrities import ILaunchpadCelebrities
+from canonical.launchpad.webapp.publisher import canonical_url
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.bugs.interfaces.bug import IBugSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadSearch
@@ -52,7 +55,9 @@
 
     # The homepage has two columns to hold featured projects. This
     # determines the number of projects we display in each column.
-    FEATURED_PROJECT_ROWS = 10
+    FEATURED_PROJECT_ROWS = 5
+    MAX_FEATURED_PROJECTS = FEATURED_PROJECT_ROWS*2+1
+    MAX_SUMMARY_LENGTH = 200
 
     def canRedirect(self):
         """Return True if the beta server is available to the user."""
@@ -60,20 +65,69 @@
             config.launchpad.beta_testers_redirection_host is not None and
             self.isBetaUser)
 
+    @property
+    def is_logged_in(self):
+        return self.user is not None
+
+    @cachedproperty
+    def apphomes(self):
+        return {
+            'answers': canonical_url(self.context, rootsite='answers'),
+            'blueprints': canonical_url(self.context, rootsite='blueprints'),
+            'bugs': canonical_url(self.context, rootsite='bugs'),
+            'code': canonical_url(self.context, rootsite='code'),
+            'translations': canonical_url(self.context,
+                                          rootsite='translations'),
+            'ubuntu': canonical_url(
+                getUtility(ILaunchpadCelebrities).ubuntu),
+            }
+
     @cachedproperty
     def featured_projects(self):
         """Return a list of featured projects."""
         return getUtility(IPillarNameSet).featured_projects
 
     @property
+    def featured_projects_top(self):
+        """Return the topmost featured project."""
+        return self.featured_projects[0]
+
+    @property
+    def featured_projects_top_summary(self):
+        """Return the summary of the topmost featured project.
+
+        If the summary is too long (MAX_SUMMARY_LENGTH) it is truncated and
+        a horizontal ellipsis is appended.
+        """
+        summary = self.featured_projects_top.summary
+        if len(summary) > self.MAX_SUMMARY_LENGTH:
+            return summary[:self.MAX_SUMMARY_LENGTH]+"&hellip;"
+        else:
+            return summary
+
+    @property
     def featured_projects_col_a(self):
         """Return a list of featured projects."""
-        return self.featured_projects[:self.FEATURED_PROJECT_ROWS]
+        return self.featured_projects[1:self.FEATURED_PROJECT_ROWS+1]
 
     @property
     def featured_projects_col_b(self):
         """The list of featured projects."""
-        return self.featured_projects[self.FEATURED_PROJECT_ROWS:]
+        index_from = self.FEATURED_PROJECT_ROWS+1
+        index_to = self.MAX_FEATURED_PROJECTS
+        return self.featured_projects[index_from:index_to]
+
+    @property
+    def project_count_not_featured(self):
+        """The number of not-featured projects.
+
+        The total number of projects minus the number of displayed
+        featured projects.
+        """
+        project_count_featured = len(self.featured_projects)
+        if project_count_featured > self.MAX_FEATURED_PROJECTS:
+            project_count_featured = self.MAX_FEATURED_PROJECTS
+        return self.project_count - project_count_featured
 
     @property
     def branch_count(self):

=== modified file 'lib/lp/registry/stories/launchpad-root/xx-featuredprojects.txt'
--- lib/lp/registry/stories/launchpad-root/xx-featuredprojects.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/registry/stories/launchpad-root/xx-featuredprojects.txt	2009-09-18 18:04:16 +0000
@@ -12,7 +12,7 @@
 Featured projects are visible to everyone on the home page:
 
     >>> anon_browser.open('http://launchpad.dev/')
-    >>> featured = find_tag_by_id(anon_browser.contents, 'featured-projects')
+    >>> featured = find_tag_by_id(anon_browser.contents, 'homepage-featured')
     >>> print extract_text(featured.h2)
     Featured projects
 
@@ -29,7 +29,7 @@
     the Mozilla Project
     Mozilla Thunderbird
     Ubuntu
-
+    Browse all ... projects
 
 == Adding a featured project ==
 
@@ -69,7 +69,7 @@
     >>> admin_browser.getControl('Update').click()
     >>> admin_browser.url
     'http://launchpad.dev/'
-    >>> featured = find_tag_by_id(admin_browser.contents, 'featured-projects')
+    >>> featured = find_tag_by_id(admin_browser.contents, 'homepage-featured')
     >>> 'Apache' in extract_text(featured)
     True
 
@@ -77,7 +77,7 @@
 that Apache has been added:
 
     >>> anon_browser.open('http://launchpad.dev/')
-    >>> featured = find_tag_by_id(anon_browser.contents, 'featured-projects')
+    >>> featured = find_tag_by_id(anon_browser.contents, 'homepage-featured')
     >>> for link in featured.findAll('a'):
     ...     print extract_text(link)
     Apache
@@ -90,6 +90,7 @@
     the Mozilla Project
     Mozilla Thunderbird
     Ubuntu
+    Browse all ... projects
 
 
 == Removing a project ==
@@ -99,7 +100,7 @@
     >>> admin_browser.getControl('Update').click()
     >>> admin_browser.url
     'http://launchpad.dev/'
-    >>> featured = find_tag_by_id(admin_browser.contents, 'featured-projects')
+    >>> featured = find_tag_by_id(admin_browser.contents, 'homepage-featured')
     >>> 'Apache' in extract_text(featured)
     False
 
@@ -107,7 +108,7 @@
 that Apache has been removed:
 
     >>> anon_browser.open('http://launchpad.dev/')
-    >>> featured = find_tag_by_id(anon_browser.contents, 'featured-projects')
+    >>> featured = find_tag_by_id(anon_browser.contents, 'homepage-featured')
     >>> for link in featured.findAll('a'):
     ...     print extract_text(link)
     Gnome Applets
@@ -119,5 +120,6 @@
     the Mozilla Project
     Mozilla Thunderbird
     Ubuntu
+    Browse all ... projects