Merge lp:~sinzui/launchpad/launchpad-header-0 into lp:launchpad

[Curtis Hovey]

This is my branch to fix the launchpad header so for the title edit widget.
This branch fixes a number of visual issues in the header, but in doing so,
it call attention to the registered slot. Michael and I decided that the
registration slot is out of scope for this branch and the probable solution
is to move it, which requires a reexamination of all its uses.

    lp:~sinzui/launchpad/owner-driver-supervisor
    Diff size: 643
    Launchpad bug: https://bugs.launchpad.net/bugs/538028
    Test command: ./bin/test -vv -t test_base_layout -t base-layout
    Pre-implementation: noodles
    Target release: 10.08

Fix the launchpad header so for the title edit widget
-----------------------------------------------------

The floated left and right instructions in the launchpad header break
the layout of the title edit widget; The widget disassembles itself trying
to avoid the floated content.

Rules
-----

    * Consider using inline-block CSS and relative positioning to fix the
      issue.

    Michael suggested:
    * ADDENDUM: Fix the leading white space before the watermark.
    * ADDENDUM: Align the apps with the bottom of the icon so that there is
      no extra white space between the context, apps, heading and bead crumbs.

    Curtis:
    * Michael's suggestions are very good. They make other problems in the
      header more obvious. The registration slot is taking advantage of the
      unwanted white space. It will be obvious that it was an after thought
      when it creates an extra line. If it is clear that the apps are the
      second part of the header, it may be clear to some users they appear
      in the wrong place in the bread crumbs.

    * ADDENDUM: Move the check for bread crumbs to the list element so that
      no part of the block is rendered when there is no bread crumbs.

QA
--

    * Visit https://edge.launchpad.net/launchpad
    * Choose the edit the title
    * Verify the widget stays together and remains adjacent to the logo.
    * Visit https://bugs.edge.launchpad.net/launchpad-web/+bug/538028
    * Verify the context, apps, title, and bread crumbs are together...
      the reported by line does not interrupt.
    * Visit https://bugs.edge.launchpad.net/launchpad-web
    * Verify the context, apps, title, and bread crumbs are together

Lint
----

Linting changed files:
  lib/canonical/launchpad/icing/style-3-0.css.in
  lib/lp/app/browser/tests/base-layout.txt
  lib/lp/app/browser/tests/test_base_layout.py
  lib/lp/app/templates/base-layout-macros.pt
  lib/lp/app/templates/base-layout.pt
  lib/lp/app/templates/launchpad-hierarchy.pt

Test
----

    * lib/lp/app/browser/tests/base-layout.txt
      * Removed big chunks of a very brittle test that broke from the minor
        markup changes. The diff shows the tests for common parts were
        different, but they where/should be the same. I decided to move
        the testing to a unittest. Note that the diff /before/ my decision to
        to replace the tests was long and hard to read.
    * lib/lp/app/browser/tests/test_base_layout.py
      * Moved the tests for the parts that base-layout provides to unittests.
        I should now be obvious when parts each layout provides.

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

    * lib/canonical/launchpad/icing/style-3-0.css.in
      * Added .flowed-block which allows us to layout horizontal chunks
        of block content like we image it in our heads.
      * Replaced #locationbar with.login-logout which accidentally solved
        Michaels concern about the leading space :)
      * Updated watermark-apps-portlet rules to not wrap and clear any floated
        content so that the title edit widget does not need to avoid other
        parts of the header.
      * Removed the excess whitespace from .registering and #logincontrol
    * lib/lp/app/templates/base-layout-macros.pt
      * Added an id to make the content easy to test.
    * lib/lp/app/templates/base-layout.pt
      * Wrapped the problem code in flowed-block divs.
      * Moved the registration slot below the logo so that there was no
        floated content near the heading that the title edit widget wraps.
      * Added ids to make content testable.
    * lib/lp/app/templates/launchpad-hierarchy.pt
      * Moved the bread crumb test condition to the block element...the page
        was always rendering space for the bread crumbs.

[Robert Collins (lifeless)]

This sounds nice, but I'm not comfortable enough with this part of the system yet to be your reviewer - sorry!

review: Abstain

[Curtis Hovey (sinzui)]

These are the three headers Michael and I looked at. They represent the best and worst of how the header works. In all cases the space before the logo and the space without bread crumbs is fixed \o/. The title edit widget hold together since it does not need to dodge the left and right content. By aligning the primary context title and apps with the bottom of the logo, view.png shows what we wanted users to see. But the two context images have a registration line that inserts a blank line. Registration always did this, it was not as obvious.

http://people.canonical.com/~curtis/primary-context.png
http://people.canonical.com/~curtis/title-edit-widget.png
http://people.canonical.com/~curtis/view.png
http://people.canonical.com/~curtis/secondary-context.png

I ponder moving the registation before or after the bread crumbs. We want the registration to be adjacent to the title of the context. This was/is not possible for primary contexts. We rely on the sparceness of the header to imply that the context is the only thing the registration text can pertain to. Placing the registration before the breadcrumbs, a, returns to the orginal design for 3.0, and b, puts the information closer to the primary context logo, and the secondary context title when it exists.

/me hacks to make screen caps.

[Curtis Hovey (sinzui)]

I moved the registration slot into context-location area, it it between the context title and bread crumbs. I made the text the same size as the bread crumbs.

http://people.canonical.com/~curtis/better-primary-context.png
http://people.canonical.com/~curtis/better-title-edit.png
http://people.canonical.com/~curtis/better-view.png
http://people.canonical.com/~curtis/better-secondary-context.png

These changes did not inflate the diff. I updated a test to verify the content moved.

The bug page did look bad, and that is because it violates the registration slot rules...the
data is immutable; it is not a status. I moved the heat inline and updated the one affected
test. Another was robust. I removed the redundant bug number too (no tests broke).
./bin/test -vvc -t bug-heat-view -t xx-bug-heat-on-bug-page

[Brad Crittenden (bac)]

Robert, if you claim a review from the team and then abstain the review disappears from the view of other reviewers. To remedy, select 'Request another review' and assign it to the Launchpad Reviewers team. (Sorry for cluttering the MP with these instructions but it makes sense since it provides context.)

[Brad Crittenden (bac)]

Curtis I think these changes really clean up the top of the page. The code looks good. Another round of UI review will be beneficial.

This docstring needs a final period:
"""Test for the ILaunchpadRoot permission"""

review: Approve (code)

[Curtis Hovey (sinzui)]

Hi Paul.

In summary. The start of the review says I did not want to fix the registration slot issue, and you can see pictures of how fixing the white space made the problem very obvious. The more recent comments with the better-* set of images shows I decided to move the registration slot anyway. I think this is an improvement, though I would not ever claim it is perfect.

[Paul Hummer (rockstar)]

This looks REALLY good. Thanks for dealing with it. The header can sometimes be an eyesore, so anything we can do to make it better is something I'm onboard with.

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/doc/hierarchical-menu.txt'
--- lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-01-22 17:28:32 +0000
+++ lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-07-26 13:34:58 +0000
@@ -1,15 +1,16 @@
-= Hierarchical menus =
+Hierarchical menus
+==================
 
 The location bar aids users in navigating the depths of Launchpad.  It
 is built from a list of Breadcrumb objects collected during Zope's
 object-traversal step.
 
-== A simple object hierarchy ==
+A simple object hierarchy
+-------------------------
 
 First, we need a hierarchy of objects to build upon:
 
-    >>> from zope.component import (getMultiAdapter, provideAdapter,
-    ...     queryAdapter)
+    >>> from zope.component import getMultiAdapter, provideAdapter
     >>> from zope.interface import Interface, implements
 
     >>> class ICookbook(Interface):
@@ -56,7 +57,8 @@
     >>> recipe = Recipe('spam', cookbook)
 
 
-== Discovering breadcrumbs ==
+Discovering breadcrumbs
+-----------------------
 
 The Hierarchy class builds the breadcrumbs by looking at each object in
 the request.traversed_objects attribute.  If a traversed object can be
@@ -124,10 +126,11 @@
     >>> cooker_hierarchy = getMultiAdapter(
     ...     (cooker, cooker_request), name='+hierarchy')
     >>> cooker_hierarchy.items
-    [<TextualBreadcrumb url='http://launchpad.dev/+cooker/jamie' text='Jamie'>]
-
-
-== Displaying breadcrumbs ==
+    [<TextualBreadcrumb url='.../+cooker/jamie' text='Jamie'>]
+
+
+Displaying breadcrumbs
+----------------------
 
 Breadcrumbs are only displayed if there is more than one breadcrumb, as
 otherwise the breadcrumb will simply replicate the context.title heading
@@ -163,7 +166,8 @@
     False
 
 
-== Building IBreadcrumb objects ==
+Building IBreadcrumb objects
+----------------------------
 
 The construction of breadcrumb objects is handled by an IBreadcrumb adapter,
 which adapts a context object and produces an IBreadcrumb object for that
@@ -195,7 +199,8 @@
         text='Joy of cooking'>
 
 
-== Customizing the hierarchy ==
+Customizing the hierarchy
+-------------------------
 
 We can customize the hierarchy itself by changing the list of objects
 and URLs that it uses to construct the breadcrumbs list.
@@ -216,7 +221,8 @@
         text='Spam'>]
 
 
-== Rendering the list ==
+Rendering the list
+------------------
 
 The Hierarchy object is responsible for rendering the HTML for the
 location bar.
@@ -261,5 +267,5 @@
     >>> homepage_hierarchy.items
     []
 
-    >>> print_hierarchy(homepage_hierarchy.render())
-    Location:
+    >>> homepage_hierarchy.render().strip()
+    ''

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-07-22 16:27:12 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-07-26 13:34:58 +0000
@@ -709,6 +709,13 @@
 .batch-navigation-links .next {
     margin-right: 0.25em;
     }
+.flowed-block {
+    display: table-cell;
+    display: inline-table;
+    display: inline-block;
+    text-align: left;
+    vertical-align: top;
+    }
 
 
 /* =========================
@@ -1111,18 +1118,22 @@
 .demo {
     background-color: #fee;
     }
-#locationbar {
-    /* 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 ... ;-).*/
-    height: 1em;
+.login-logout {
+    position: absolute;
+    top: .5em;
+    right: 1.5em;
     }
 div.watermark-apps-portlet {
-    padding-bottom:1em;
+    clear: both;
+    margin-bottom: .5em;
+    white-space: no-wrap;
+    }
+div.watermark-apps-portlet .wide {
+    width: 75%;
+    vertical-align: bottom;
+    margin-bottom: 0.3em;
     }
 div.watermark-apps-portlet img {
-    float: left;
     margin: 0 1.5em 0 0;
     }
 div.watermark-apps-portlet h1, div.watermark-apps-portlet h2 {
@@ -1176,19 +1187,20 @@
     width: 100%;
     white-space: nowrap;
     }
+.context-publication {
+    margin-bottom: 1em;
+    }
 .registering {
     /* Registered slot */
-    float: right;
-    font-size: 85%;
+    margin: 0 0 0.2em 0;
+    font-style: italic;
+    font-size: 77%;
     color: #666;
-    position: relative;
-    top: 2em;
     }
 .breadcrumbs {
     margin-left: 0;
     list-style-type: none;
     clear: both;
-    margin-bottom: 2em;
     font-size: 77%;
     }
 .breadcrumbs li {
@@ -1217,6 +1229,9 @@
     /* align the image with the text */
     margin-bottom: -2px;
     }
+#logincontrol form {
+    margin: 0;
+    }
 #logincontrol input[type='submit'] {
     /* The button lacks the right margin that buttons usually have: */
     font-size: 77%;

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2010-07-08 15:26:09 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2010-07-26 13:34:58 +0000
@@ -35,101 +35,12 @@
 main and side content are positioned using the "yui-t4", "yui-main",
 "yui-b", and "yui-b side" classes.
 
-Header.
+    >>> from canonical.launchpad.testing.pages import find_tag_by_id
 
     >>> view = MainSideView(user, request)
     >>> html = view.render()
     >>> print html
     <!DOCTYPE html ...
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-          lang="en" dir="ltr">
-      <head>
-        <title>Test base-layout: main_side</title>
-        <link rel="shortcut icon" href="/@@/launchpad.png" />
-    ...
-
-Standard Javascript functions.
-
-    >>> print html
-    <!DOCTYPE html ...
-    ...
-            sortables_init();
-            initInlineHelp();
-            Y.lp.activate_collapsibles();
-            activateFoldables();
-            activateConstrainBugExpiration();
-    ...
-
-Body preamble.
-
-    >>> from canonical.launchpad.testing.pages import find_tag_by_id
-
-    >>> body_tag = find_tag_by_id(html, 'document')
-    >>> body = str(body_tag)
-    >>> print body
-    <body id="document"
-            class="tab-overview
-          main_side
-          public
-          yui-skin-sam">
-        <div class="yui-d0">
-    <BLANKLINE>
-          <div id="locationbar">
-    ...
-
-Watermark and breadcrumbs.
-
-    >>> print body
-    <body ...
-    ...
-          <div class="watermark-apps-portlet top-portlet">
-            <img alt="" width="64" height="64" src="/@@/person-logo" />
-            <h2>Waffles</h2>
-    ...
-      <!-- Application Menu -->
-      <ul class="facetmenu">
-    <BLANKLINE>
-          <li class="overview active"
-              title="General information about Waffles"><a
-        href="http://launchpad.dev/~waffles">Overview</a></li>
-    ...
-              <div class="yui-b" dir="ltr">
-                <div>
-                  <h2>Heading</h2>
-                  <ol class="breadcrumbs">
-    ...
-
-Top portlet.
-
-    >>> print body
-    <body ...
-          <div class="top-portlet">
-            <p class="registered">
-              Registered on 2005-09-16
-              by <a class="sprite team" href="#">Illuminati team</a>
-            </p>
-            <p>
-              Main content of the page.
-            </p>
-          </div>
-    ...
-
-Help pane.
-
-    >>> print str(find_tag_by_id(body_tag, 'help-pane'))
-    <div id="help-pane" class="invisible">
-          <div id="help-body">
-            <iframe id="help-pane-content" class="invisible" ...
-            </div>
-          <div id="help-footer">
-            <span id="help-close"></span>
-          </div>
-        </div>
-
-Footer.
-
-    >>> print html
-    <!DOCTYPE html ...
       <!--
         Facet name: overview
         Page type: main_side
@@ -151,72 +62,6 @@
 
     >>> view = MainOnlyView(user, request)
     >>> html = view.render()
-
-Heading.
-
-    >>> print html
-    <!DOCTYPE html ...
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-          lang="en" dir="ltr">
-      <head>
-        <title>Test base-layout: main_only</title>
-        <link rel="shortcut icon" href="/@@/launchpad.png" />
-    ...
-
-Watermark.
-
-    >>> body_tag = find_tag_by_id(html, 'document')
-    >>> body = str(body_tag)
-    >>> print body
-    <body ...
-          <div class="watermark-apps-portlet top-portlet">
-            <img alt="" width="64" height="64" src="/@@/person-logo" />
-            <h2>Waffles</h2>
-    ...
-
-Main content.
-
-    >>> print str(find_tag_by_id(body_tag, 'maincontent'))
-    <div id="maincontent" class="yui-main">
-              <div class="yui-b" dir="ltr">
-                <div>
-    <BLANKLINE>
-                  <ol class="breadcrumbs">
-    <BLANKLINE>
-    </ol>
-    <BLANKLINE>
-                </div>
-    <BLANKLINE>
-    <BLANKLINE>
-    <BLANKLINE>
-          <div class="top-portlet">
-            <h1>Heading</h1>
-            <p class="registered">
-              Registered on 2005-09-16
-              by <a class="sprite team" href="#">Illuminati team</a>
-            </p>
-            <p>
-              Main content of the page.
-            </p>
-          </div>
-        </div><!-- yui-b -->
-    </div>
-
-Global search.
-
-    >>> print body
-    <body ...
-      <form id="globalsearch" method="get"
-            accept-charset="UTF-8"
-            action="http://launchpad.dev/+search">
-        <input type="search" id="search-text" name="field.text" />
-        <input type="submit" value="" class="icon-only sprite search-icon" />
-      </form>
-    </div>
-    ...
-
-Footer.
-
     >>> print html
     <!DOCTYPE html ...
     ...
@@ -240,83 +85,6 @@
 
     >>> view = SearchlessView(user, request)
     >>> html = view.render()
-
-Heading.
-
-    >>> print html
-    <!DOCTYPE html ...
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-          lang="en" dir="ltr">
-      <head>
-        <title>Test base-layout: searchless</title>
-        <link rel="shortcut icon" href="/@@/launchpad.png" />
-    ...
-
-Body class.
-
-    >>> body_tag = find_tag_by_id(html, 'document')
-    >>> body = str(body_tag)
-    >>> print body
-    <body id="document"
-            class="tab-overview
-          searchless
-          public
-          yui-skin-sam">
-        <div class="yui-d0">
-    ...
-
-Watermarks.
-
-    >>> print body
-    <body ...
-          <div class="watermark-apps-portlet top-portlet">
-            <img alt="" width="64" height="64" src="/@@/person-logo" />
-            <h2>Waffles</h2>
-            <div id="registration" class="registering">
-            </div>
-    <BLANKLINE>
-      <!-- Application Menu -->
-      <ul class="facetmenu">
-    <BLANKLINE>
-          <li class="overview active"
-              title="General information about Waffles"><a
-        href="http://launchpad.dev/~waffles">Overview</a></li>
-    ...
-
-Main content.
-
-    >>> print str(find_tag_by_id(body_tag, 'maincontent'))
-    <div id="maincontent" class="yui-main">
-              <div class="yui-b" dir="ltr">
-                <div>
-    <BLANKLINE>
-                  <ol class="breadcrumbs">
-    <BLANKLINE>
-    </ol>
-    ...
-
-Top portlet.
-
-    >>> print body
-    <body ...
-          <div class="top-portlet">
-            <h1>Heading</h1>
-            <p class="registered">
-              Registered on 2005-09-16
-              by <a class="sprite team" href="#">Illuminati team</a>
-            </p>
-            <p>
-              Main content of the page.
-            </p>
-          </div>
-          </div><!-- yui-b -->
-          </div><!-- yui-main -->
-          <!-- yui-b side -->
-          <!-- yui-t4 -->
-    ...
-
-Footer.
-
     >>> print html
     <!DOCTYPE html ...
     ...
@@ -342,51 +110,6 @@
 
     >>> view = LocationlessView(user, request)
     >>> html = view.render()
-
-Heading.
-
-    >>> print html
-    <!DOCTYPE html ...
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-          lang="en" dir="ltr">
-      <head>
-        <title>Test base-layout: locationless</title>
-        <link rel="shortcut icon" href="/@@/launchpad.png" />
-    ...
-
-Body.
-
-    >>> body_tag = find_tag_by_id(html, 'document')
-    >>> body = str(body_tag)
-    >>> print body
-    <body id="document"
-            class="tab-overview
-          locationless
-          public
-          yui-skin-sam">
-        <div class="yui-d0">
-    ...
-
-Main content.
-
-    >>> print str(find_tag_by_id(body_tag, 'maincontent'))
-    <div id="maincontent" class="yui-main">
-        <div class="yui-b" dir="ltr">
-          <div class="top-portlet">
-            <h1>Heading</h1>
-            <p class="registered">
-              Registered on 2005-09-16
-              by <a class="sprite team" href="#">Illuminati team</a>
-            </p>
-            <p>
-              Main content of the page.
-            </p>
-          </div>
-        </div><!-- yui-b -->
-    </div>
-
-Footer.
-
     >>> print html
     <!DOCTYPE html ...
     ...
@@ -517,8 +240,6 @@
     >>> body_tag = find_tag_by_id(view.render(), 'maincontent')
     >>> print str(body_tag)
     <div id="maincontent" ...
-      <ol class="breadcrumbs">
-      </ol>
       ...
       <div class="informational message">I cannot do that Dave.</div>
       <div class="top-portlet">

=== added file 'lib/lp/app/browser/tests/test_base_layout.py'
--- lib/lp/app/browser/tests/test_base_layout.py	1970-01-01 00:00:00 +0000
+++ lib/lp/app/browser/tests/test_base_layout.py	2010-07-26 13:34:58 +0000
@@ -0,0 +1,163 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for base-layout.pt and its macros.
+
+The base-layout master template defines macros that control the layout
+of the page. Any page can use these layout options by including
+
+    metal:use-macro='view/macro:page/<layout>"
+
+in the root element. The template provides common layout to Launchpad.
+"""
+
+__metaclass__ = type
+
+from BeautifulSoup import BeautifulSoup
+
+from z3c.ptcompat import ViewPageTemplateFile
+
+from canonical.launchpad.webapp.publisher import LaunchpadView
+from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+from canonical.testing.layers import DatabaseFunctionalLayer
+from canonical.launchpad.testing.pages import find_tag_by_id
+
+from lp.testing import TestCaseWithFactory
+
+
+class TestBaseLayout(TestCaseWithFactory):
+    """Test the page parts provided by the base-layout.pt."""
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestBaseLayout, self).setUp()
+        self.user = self.factory.makePerson(name='waffles')
+        self.request = LaunchpadTestRequest(
+            SERVER_URL='http://launchpad.dev',
+            PATH_INFO='/~waffles/+layout')
+        self.request.setPrincipal(self.user)
+
+    def makeTemplateView(self, layout):
+        """Return a view that uses the specified layout."""
+
+        class TemplateView(LaunchpadView):
+            """A simple view to test base-layout."""
+            __launchpad_facetname__ = 'overview'
+            template = ViewPageTemplateFile(
+                'testfiles/%s.pt' % layout.replace('_', '-'))
+            page_title = 'Test base-layout: %s' % layout
+
+        return TemplateView(self.user, self.request)
+
+    def test_base_layout_doctype(self):
+        # Verify that the document is a html DOCTYPE.
+        view = self.makeTemplateView('main_side')
+        markup = view()
+        self.assertTrue(markup.startswith('<!DOCTYPE html'))
+
+    def verify_base_layout_html_element(self, content):
+        # The html element states the namespace and language information.
+        self.assertEqual(
+            'http://www.w3.org/1999/xhtml', content.html['xmlns'])
+        html_tag = content.html
+        self.assertEqual('en', html_tag['xml:lang'])
+        self.assertEqual('en', html_tag['lang'])
+        self.assertEqual('ltr', html_tag['dir'])
+
+    def verify_base_layout_head_parts(self, view, content):
+        # Verify the common head parts of every layout.
+        head = content.head
+        # The page's title starts with the view's page_title.
+        self.assertTrue(head.title.string.startswith(view.page_title))
+        # The shortcut icon for the browser chrome is provided.
+        link_tag = head.link
+        self.assertEqual('shortcut icon', link_tag['rel'])
+        self.assertEqual('/@@/launchpad.png', link_tag['href'])
+        # The template loads the common scripts.
+        load_script = find_tag_by_id(head, 'base-layout-load-scripts').name
+        self.assertEqual('script', load_script)
+
+    def verify_base_layout_body_parts(self, document):
+        # Verify the common body parts of every layout.
+        self.assertEqual('body', document.name)
+        yui_layout = document.find('div', 'yui-d0')
+        self.assertTrue(yui_layout is not None)
+        self.assertEqual(
+            'login-logout', yui_layout.find(True, id='locationbar')['class'])
+        self.assertEqual(
+            'yui-main', yui_layout.find(True, id='maincontent')['class'])
+        self.assertEqual(
+            'invisible', document.find(True, id='help-pane')['class'])
+        self.assertEqual(
+            'footer', yui_layout.find(True, id='footer')['class'])
+
+    def verify_watermark(self, document):
+        # Verify the parts of a watermark.
+        yui_layout = document.find('div', 'yui-d0')
+        watermark = yui_layout.find(True, id='watermark')
+        self.assertEqual('watermark-apps-portlet', watermark['class'])
+        self.assertEqual('/@@/person-logo', watermark.img['src'])
+        self.assertEqual('Waffles', watermark.h2.string)
+        self.assertEqual('facetmenu', watermark.ul['class'])
+
+    def test_main_side(self):
+        # The main_side layout has everything.
+        view = self.makeTemplateView('main_side')
+        content = BeautifulSoup(view())
+        self.verify_base_layout_html_element(content)
+        self.verify_base_layout_head_parts(view, content)
+        document = find_tag_by_id(content, 'document')
+        self.verify_base_layout_body_parts(document)
+        classes = 'tab-overview main_side public yui-skin-sam'.split()
+        self.assertEqual(classes, document['class'].split())
+        self.verify_watermark(document)
+        self.assertEqual(
+            'yui-b side', document.find(True, id='side-portlets')['class'])
+        self.assertEqual('form', document.find(True, id='globalsearch').name)
+
+    def test_main_only(self):
+        # The main_only layout has everything except side portlets.
+        view = self.makeTemplateView('main_only')
+        content = BeautifulSoup(view())
+        self.verify_base_layout_html_element(content)
+        self.verify_base_layout_head_parts(view, content)
+        document = find_tag_by_id(content, 'document')
+        self.verify_base_layout_body_parts(document)
+        classes = 'tab-overview main_only public yui-skin-sam'.split()
+        self.assertEqual(classes, document['class'].split())
+        self.verify_watermark(document)
+        self.assertEqual(
+            'registering', document.find(True, id='registration')['class'])
+        self.assertEqual(None, document.find(True, id='side-portlets'))
+        self.assertEqual('form', document.find(True, id='globalsearch').name)
+
+    def test_searchless(self):
+        # The searchless layout is missing side portlets and search.
+        view = self.makeTemplateView('searchless')
+        content = BeautifulSoup(view())
+        self.verify_base_layout_html_element(content)
+        self.verify_base_layout_head_parts(view, content)
+        document = find_tag_by_id(content, 'document')
+        self.verify_base_layout_body_parts(document)
+        self.verify_watermark(document)
+        classes = 'tab-overview searchless public yui-skin-sam'.split()
+        self.assertEqual(classes, document['class'].split())
+        self.assertEqual(
+            'registering', document.find(True, id='registration')['class'])
+        self.assertEqual(None, document.find(True, id='side-portlets'))
+        self.assertEqual(None, document.find(True, id='globalsearch'))
+
+    def test_locationless(self):
+        # The locationless layout has no optional content.
+        view = self.makeTemplateView('locationless')
+        content = BeautifulSoup(view())
+        self.verify_base_layout_html_element(content)
+        self.verify_base_layout_head_parts(view, content)
+        document = find_tag_by_id(content, 'document')
+        self.verify_base_layout_body_parts(document)
+        classes = 'tab-overview locationless public yui-skin-sam'.split()
+        self.assertEqual(classes, document['class'].split())
+        self.assertEqual(None, document.find(True, id='registration'))
+        self.assertEqual(None, document.find(True, id='watermark'))
+        self.assertEqual(None, document.find(True, id='side-portlets'))
+        self.assertEqual(None, document.find(True, id='globalsearch'))

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-07-14 14:38:07 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-07-26 13:34:58 +0000
@@ -288,7 +288,7 @@
 
   <metal:load-lavascript use-macro="context/@@+base-layout-macros/load-javascript" />
 
-  <script type="text/javascript">
+  <script id="base-layout-load-scripts" type="text/javascript">
     LPS.use('node', 'lp', function(Y) {
         Y.on('load', function(e) {
             sortables_init();

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2010-07-02 18:35:03 +0000
+++ lib/lp/app/templates/base-layout.pt	2010-07-26 13:34:58 +0000
@@ -83,21 +83,22 @@
           })();
         </script>
     <div class="yui-d0">
-      <div id="locationbar">
+      <div id="locationbar" class="login-logout">
         <tal:login replace="structure context/@@login_status" />
       </div><!--id="locationbar"-->
 
-      <div class="watermark-apps-portlet top-portlet"
+      <div id="watermark" class="watermark-apps-portlet"
            tal:condition="view/macro:pagehas/applicationtabs">
-        <span tal:replace="structure view/watermark:logo"></span>
-        <h2 tal:replace="structure view/watermark:heading">
-          Celso Providelo
-        </h2>
-        <div id="registration" class="registering">
-          <metal:registering define-slot="registering" />
-        </div>
-        <metal:heading_nav
-          use-macro="context/@@+base-layout-macros/application-buttons"/>
+        <div class="flowed-block">
+          <span tal:replace="structure view/watermark:logo"></span>
+        </div>
+        <div class="flowed-block wide">
+          <h2 tal:replace="structure view/watermark:heading">
+            Celso Providelo
+          </h2>
+          <metal:heading_nav
+            use-macro="context/@@+base-layout-macros/application-buttons"/>
+        </div>
       </div>
 
       <div class="yui-t4"
@@ -108,13 +109,17 @@
               lang view/lang|default_language|default;
               xml:lang view/lang|default_language|default;
               dir view/dir|string:ltr">
-            <div tal:condition="view/macro:pagehas/applicationtabs">
+            <div class="context-publication"
+              tal:condition="view/macro:pagehas/applicationtabs">
               <h1
                 tal:condition="view/label|nothing"
                 tal:content="view/label"
                 metal:define-slot="heading"
                 >Page Label
               </h1>
+              <div id="registration" class="registering">
+                <metal:registering define-slot="registering" />
+              </div>
               <tal:breadcrumbs replace="structure context/@@+hierarchy">
                 ProjectName > Branches > Merge Proposals > fix-for-navigation
               </tal:breadcrumbs>
@@ -132,7 +137,7 @@
           </div><!-- yui-b -->
         </div><!-- yui-main -->
 
-        <div class="yui-b side"
+        <div id="side-portlets" class="yui-b side"
           tal:condition="view/macro:pagehas/portlets">
           <metal:portlets define-slot="side" />
         </div><!-- yui-b side -->

=== modified file 'lib/lp/app/templates/launchpad-hierarchy.pt'
--- lib/lp/app/templates/launchpad-hierarchy.pt	2010-01-22 17:28:32 +0000
+++ lib/lp/app/templates/launchpad-hierarchy.pt	2010-07-26 13:34:58 +0000
@@ -3,13 +3,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  i18n:domain="launchpad">
+  i18n:domain="launchpad"
+  tal:condition="view/display_breadcrumbs">
 
-<tal:breadcrumbs repeat="breadcrumb view/items"
-                 condition="view/display_breadcrumbs">
+<tal:breadcrumbs repeat="breadcrumb view/items">
   <li>
     <a tal:attributes="href breadcrumb/url"
-      tal:omit-tag="repeat/breadcrumb/end"><tal:text 
+      tal:omit-tag="repeat/breadcrumb/end"><tal:text
         condition="not: repeat/breadcrumb/end"
         replace="breadcrumb/text">
           Bugs on redfish</tal:text><tal:text

=== modified file 'lib/lp/blueprints/stories/sprints/05-sprint-creation.txt'
--- lib/lp/blueprints/stories/sprints/05-sprint-creation.txt	2009-11-08 20:09:26 +0000
+++ lib/lp/blueprints/stories/sprints/05-sprint-creation.txt	2010-07-26 13:34:58 +0000
@@ -1,137 +1,119 @@
-= Creating new sprints =
-
-We should also be able to create a new sprint. We do this off the Sprints
-+new page.
-
-  >>> user_browser.open('http://launchpad.dev/sprints')
-  >>> user_browser.getLink('Register a meeting').click()
-
-  >>> print user_browser.title
-  Register a meeting...
+Creating new sprints
+====================
+
+We should also be able to create a new sprint. We do this off the
+Sprints +new page.
+
+    >>> user_browser.open('http://launchpad.dev/sprints')
+    >>> user_browser.getLink('Register a meeting').click()
+
+    >>> print user_browser.title
+    Register a meeting...
 
 First we'll test the name field validator.
 
-  >>> user_browser.getControl('Name').value = 'ltsp_on_steroids!'
-  >>> user_browser.getControl('Title').value = 'LTSP On Steroids'
-  >>> summary = 'This is a sprint summary. Some words about the sprint'
-  >>> user_browser.getControl('Summary').value = summary
-  >>> user_browser.getControl('Driver').value = 'kamion'
-  >>> user_browser.getControl('Home Page').value = 'http://www.willy.net'
-  >>> user_browser.getControl('Timezone').value = ['UTC']
-  >>> user_browser.getControl(
-  ...     'Starting Date and Time').value = '10 Oct 2006 09:15'
-  >>> user_browser.getControl(
-  ...     'Finishing Date and Time').value = '13 Oct 2006 16:00'
-  >>> user_browser.getControl('Add Sprint').click()
-
-  >>> for tag in find_tags_by_class(user_browser.contents, 'message'):
-  ...     print tag.renderContents()
-  There is 1 error.
-  <BLANKLINE>
-  Invalid name 'ltsp_on_steroids!'. Names must be at least two characters ...
-
-Register a sprint with the same name of a existing one also returns a nice
-error message
-
-  >>> user_browser.getControl('Name').value = 'ubz'
-  >>> user_browser.getControl('Add Sprint').click()
-
-  >>> for tag in find_tags_by_class(user_browser.contents, 'message'):
-  ...     print tag.renderContents()
-  There is 1 error.
-  <BLANKLINE>
-  ubz is already in use by another sprint.
+    >>> user_browser.getControl('Name').value = 'ltsp_on_steroids!'
+    >>> user_browser.getControl('Title').value = 'LTSP On Steroids'
+    >>> summary = 'This is a sprint summary. Some words about the sprint'
+    >>> user_browser.getControl('Summary').value = summary
+    >>> user_browser.getControl('Driver').value = 'kamion'
+    >>> user_browser.getControl('Home Page').value = 'http://www.willy.net'
+    >>> user_browser.getControl('Timezone').value = ['UTC']
+    >>> user_browser.getControl(
+    ...     'Starting Date and Time').value = '10 Oct 2006 09:15'
+    >>> user_browser.getControl(
+    ...     'Finishing Date and Time').value = '13 Oct 2006 16:00'
+    >>> user_browser.getControl('Add Sprint').click()
+
+    >>> for tag in find_tags_by_class(user_browser.contents, 'message'):
+    ...     print tag.renderContents()
+    There is 1 error.
+    <BLANKLINE>
+    Invalid name 'ltsp_on_steroids!'. Names must be at least two characte...
+
+Register a sprint with the same name of a existing one also returns a
+nice error message
+
+    >>> user_browser.getControl('Name').value = 'ubz'
+    >>> user_browser.getControl('Add Sprint').click()
+
+    >>> for tag in find_tags_by_class(user_browser.contents, 'message'):
+    ...     print tag.renderContents()
+    There is 1 error.
+    <BLANKLINE>
+    ubz is already in use by another sprint.
 
 Create a new sprint with a finish date before the starting date returns
 a error message.
 
-  >>> user_browser.getControl('Name').value = 'ltsponsteroids'
-  >>> user_browser.getControl(
-  ...     'Starting Date and Time').value = '13 Oct 2006 09:15 '
-  >>> user_browser.getControl(
-  ...     'Finishing Date and Time').value = '10 Oct 2006 16:00'
-  >>> user_browser.getControl('Add Sprint').click()
+    >>> user_browser.getControl('Name').value = 'ltsponsteroids'
+    >>> user_browser.getControl(
+    ...     'Starting Date and Time').value = '13 Oct 2006 09:15 '
+    >>> user_browser.getControl(
+    ...     'Finishing Date and Time').value = '10 Oct 2006 16:00'
+    >>> user_browser.getControl('Add Sprint').click()
 
-  >>> for tag in find_tags_by_class(user_browser.contents, 'message'):
-  ...     print tag.renderContents()
-  There is 1 error.
-  <BLANKLINE>
-  This event can't start after it ends
+    >>> for tag in find_tags_by_class(user_browser.contents, 'message'):
+    ...     print tag.renderContents()
+    There is 1 error.
+    <BLANKLINE>
+    This event can't start after it ends
 
 Also, the date is now presented in a canonicalised format, with time in
 minutes rather than second-level accuracy:
 
-  >>> user_browser.getControl('Starting Date and Time').value
-  '2006-10-13 09:15'
-  >>> user_browser.getControl('Finishing Date and Time').value
-  '2006-10-10 16:00'
-
-Fix the date and try again. We're redirected to the sprint home page
-for the new sprint.
-
-  >>> user_browser.getControl(
-  ...     'Starting Date and Time').value = '10 Oct 2006 09:15 '
-  >>> user_browser.getControl(
-  ...     'Finishing Date and Time').value = '13 Oct 2006 16:00'
-  >>> user_browser.getControl('Add Sprint').click()
-
-  >>> user_browser.url
-  'http://launchpad.dev/sprints/ltsponsteroids'
-
-Because sprints are root contexts, an h1 heading is used to display
-the main heading above the application buttons) and the breadcrumbs
-are not displayed.
-
-  >>> print_location(user_browser.contents)
-  Hierarchy: None displayed
-  Tabs:
-  * Overview (selected) - not linked
-  ...
-  * Bugs - not linked
-  * Blueprints - http://blueprints.launchpad.dev/sprints/ltsponsteroids
-  * Translations - not linked
-  * Answers - not linked
-  Main heading: LTSP On Steroids
-
-There is no h1 heading in the main content.
-
-  >>> print find_main_content(user_browser.contents).find('h1')
-  None
+    >>> user_browser.getControl('Starting Date and Time').value
+    '2006-10-13 09:15'
+
+    >>> user_browser.getControl('Finishing Date and Time').value
+    '2006-10-10 16:00'
+
+Fix the date and try again. We're redirected to the sprint home page for
+the new sprint.
+
+    >>> user_browser.getControl(
+    ...     'Starting Date and Time').value = '10 Oct 2006 09:15 '
+    >>> user_browser.getControl(
+    ...     'Finishing Date and Time').value = '13 Oct 2006 16:00'
+    >>> user_browser.getControl('Add Sprint').click()
+
+    >>> user_browser.url
+    'http://launchpad.dev/sprints/ltsponsteroids'
 
 Since the sprint's time zone was set to UTC, the dates are displayed in
 that time zone:
 
-  >>> print extract_text(find_tag_by_id(user_browser.contents, 'start-end'))
-  Starts: 09:15 UTC on Tuesday, 2006-10-10
-  Ends: 16:00 UTC on Friday, 2006-10-13
-
-Because this is a brand new sprint, it will have no specs, and we should see
-a warning to that effect on the page.
-
-  >>> message = 'Nobody has yet proposed any blueprints for discussion'
-  >>> message in user_browser.contents
-  True
-
+    >>> print extract_text(find_tag_by_id(user_browser.contents, 'start-end'))
+    Starts: 09:15 UTC on Tuesday, 2006-10-10
+    Ends: 16:00 UTC on Friday, 2006-10-13
+
+Because this is a brand new sprint, it will have no specs, and we should
+see a warning to that effect on the page.
+
+    >>> message = 'Nobody has yet proposed any blueprints for discussion'
+    >>> message in user_browser.contents
+    True
 
 Add a new sprint with a different time zone is also handled correctly.
 
-  >>> user_browser.open('http://launchpad.dev/sprints/+new')
-  >>> user_browser.getControl('Name').value = 'africa-sprint'
-  >>> user_browser.getControl('Title').value = 'Africa Sprint'
-  >>> summary = 'This is a sprint summary. Some words about the sprint'
-  >>> user_browser.getControl('Summary').value = summary
-  >>> user_browser.getControl('Home Page').value = 'http://www.ubuntu.com'
-  >>> user_browser.getControl('Timezone').value = ['Africa/Johannesburg']
-  >>> user_browser.getControl(
-  ...     'Starting Date and Time').value = '10 Jul 2006 09:15'
-  >>> user_browser.getControl(
-  ...     'Finishing Date and Time').value = '13 Jul 2006 16:00'
-  >>> user_browser.getControl('Add Sprint').click()
-
-  >>> user_browser.url
-  'http://launchpad.dev/sprints/africa-sprint'
-
-  >>> print extract_text(find_tag_by_id(user_browser.contents, 'start-end'))
-  Starts: 09:15 SAST on Monday, 2006-07-10
-  Ends: 16:00 SAST on Thursday, 2006-07-13
+    >>> user_browser.open('http://launchpad.dev/sprints/+new')
+    >>> user_browser.getControl('Name').value = 'africa-sprint'
+    >>> user_browser.getControl('Title').value = 'Africa Sprint'
+    >>> summary = 'This is a sprint summary. Some words about the sprint'
+    >>> user_browser.getControl('Summary').value = summary
+    >>> user_browser.getControl('Home Page').value = 'http://www.ubuntu.com'
+    >>> user_browser.getControl('Timezone').value = ['Africa/Johannesburg']
+    >>> user_browser.getControl(
+    ...     'Starting Date and Time').value = '10 Jul 2006 09:15'
+    >>> user_browser.getControl(
+    ...     'Finishing Date and Time').value = '13 Jul 2006 16:00'
+    >>> user_browser.getControl('Add Sprint').click()
+
+    >>> user_browser.url
+    'http://launchpad.dev/sprints/africa-sprint'
+
+    >>> print extract_text(find_tag_by_id(user_browser.contents, 'start-end'))
+    Starts: 09:15 SAST on Monday, 2006-07-10
+    Ends: 16:00 SAST on Thursday, 2006-07-13
+
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-heat-on-bug-page.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-heat-on-bug-page.txt	2010-03-15 13:22:02 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-heat-on-bug-page.txt	2010-07-26 13:34:58 +0000
@@ -3,8 +3,8 @@
 The bug heat appears on the bug index page as four flames.
 
     >>> anon_browser.open('http://bugs.launchpad.dev/firefox/+bug/1')
-    >>> print find_tag_by_id(
-    ...     anon_browser.contents, 'registration').fetch('img')[0]
+    >>> print find_main_content(
+    ...     anon_browser.contents).find('img', src='/@@/bug-heat-0.png')
     <img src="/@@/bug-heat-0.png" alt="0 out of 4 heat flames" title="Heat: 0" />
 
 Packages use their distribution as context when generating flame icons
@@ -30,6 +30,6 @@
     >>> logout()
 
     >>> anon_browser.open(canonical_url(dsp_bug))
-    >>> print find_tag_by_id(
-    ...     anon_browser.contents, 'registration').fetch('img')[0]
+    >>> print find_main_content(
+    ...     anon_browser.contents).find('img', src='/@@/bug-heat-0.png')
     <img src="/@@/bug-heat-0.png" alt="0 out of 4 heat flames" title="Heat: 1250" />

=== modified file 'lib/lp/bugs/stories/bugs/xx-malone-homepage.txt'
--- lib/lp/bugs/stories/bugs/xx-malone-homepage.txt	2010-05-19 05:47:50 +0000
+++ lib/lp/bugs/stories/bugs/xx-malone-homepage.txt	2010-07-26 13:34:58 +0000
@@ -1,26 +1,18 @@
 Say hello to Bugs. :)
 
-  >>> browser.open('http://bugs.launchpad.dev/')
-  >>> browser.url
-  'http://bugs.launchpad.dev/'
+    >>> browser.open('http://bugs.launchpad.dev/')
+    >>> browser.url
+    'http://bugs.launchpad.dev/'
 
-  >>> print_location(browser.contents)
-  Hierarchy: None displayed
-  Tabs:
-  * Launchpad Home - http://launchpad.dev/
-  * Code - http://code.launchpad.dev/
-  * Bugs (selected) - http://bugs.launchpad.dev/
-  * Blueprints - http://blueprints.launchpad.dev/
-  * Translations - http://translations.launchpad.dev/
-  * Answers - http://answers.launchpad.dev/
-  Main heading: Bug tracking
+    >>> print browser.title
+    Bug tracking
 
 There are a few related pages linked in a portlet:
 
-  >>> related_pages = find_portlet(browser.contents, 'Related pages')
-  >>> for link in related_pages.findAll('a'):
-  ...     print "%s\n  --> %s" % (extract_text(link), link.get('href'))
-  Bug trackers
+    >>> related_pages = find_portlet(browser.contents, 'Related pages')
+    >>> for link in related_pages.findAll('a'):
+    ...     print "%s\n  --> %s" % (extract_text(link), link.get('href'))
+    Bug trackers
     --> http://bugs.launchpad.dev/bugs/bugtrackers
-  CVE tracker
+    CVE tracker
     --> http://bugs.launchpad.dev/bugs/cve

=== modified file 'lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt'
--- lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt	2010-06-16 15:28:35 +0000
+++ lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt	2010-07-26 13:34:58 +0000
@@ -1,19 +1,12 @@
-= Bug trackers in Launchpad =
+Bug trackers in Launchpad
+=========================
 
 The bug trackers index page has the same navigation as the main Bugs
 page, with the addition of a breadcrumb itself.
 
     >>> user_browser.open('http://launchpad.dev/bugs/bugtrackers')
-    >>> print_location(user_browser.contents)
-    Hierarchy: None displayed
-    Tabs:
-    * Launchpad Home - http://launchpad.dev/
-    * Code - http://code.launchpad.dev/
-    * Bugs (selected) - http://bugs.launchpad.dev/
-    * Blueprints - http://blueprints.launchpad.dev/
-    * Translations - http://translations.launchpad.dev/
-    * Answers - http://answers.launchpad.dev/
-    Main heading: Bug trackers registered in Launchpad
+    >>> print user_browser.title
+    Bug trackers registered in Launchpad
 
 The page presents a table with all bugtrackers currently registered:
 

=== modified file 'lib/lp/bugs/stories/cve/cve-pages.txt'
--- lib/lp/bugs/stories/cve/cve-pages.txt	2010-05-21 13:49:36 +0000
+++ lib/lp/bugs/stories/cve/cve-pages.txt	2010-07-26 13:34:58 +0000
@@ -1,4 +1,5 @@
-= CVE tracking =
+CVE tracking
+============
 
 Launchpad supports the CVE database system.
 
@@ -17,16 +18,8 @@
     >>> browser.getLink('CVE entries').click()
     >>> print browser.url
     http://bugs.launchpad.dev/bugs/cve
-    >>> print_location(browser.contents)
-    Hierarchy: None displayed
-    Tabs:
-    * Launchpad Home - http://launchpad.dev/
-    * Code - http://code.launchpad.dev/
-    * Bugs (selected) - http://bugs.launchpad.dev/
-    * Blueprints - http://blueprints.launchpad.dev/
-    * Translations - http://translations.launchpad.dev/
-    * Answers - http://answers.launchpad.dev/
-    Main heading: Launchpad CVE tracker
+    >>> print browser.title
+    Launchpad CVE tracker
     >>> print browser.contents
     <...
     ...CVE-2005-2737 (Candidate)...
@@ -37,76 +30,58 @@
     >>> browser.getLink('Show all registered CVEs').click()
     >>> print browser.url
     http://bugs.launchpad.dev/bugs/cve/+all
-    >>> print_location(browser.contents)
-    Hierarchy: None displayed
-    Tabs:
-    * Launchpad Home - http://launchpad.dev/
-    * Code - http://code.launchpad.dev/
-    * Bugs (selected) - http://bugs.launchpad.dev/
-    * Blueprints - http://blueprints.launchpad.dev/
-    * Translations - http://translations.launchpad.dev/
-    * Answers - http://answers.launchpad.dev/
-    Main heading: Launchpad CVE tracker
+    >>> print browser.title
+    Launchpad CVE tracker
 
 Now, we will test the search functionality of the CVE tracker. First we
 will search for the word "loss" in the database and see how many show
 up. We expect to see CVE-1999-2345.
 
-  >>> print http(r"""
-  ... POST /bugs/cve/ HTTP/1.1
-  ... Content-Length: 9
-  ... Content-Type: application/x-www-form-urlencoded
-  ...
-  ... text=loss""")
-  HTTP/1.1 200 Ok
-  ...Matches: 1...
-  ...CVE-1999-2345 (Candidate)...
+    >>> print http(r"""
+    ... POST /bugs/cve/ HTTP/1.1
+    ... Content-Length: 9
+    ... Content-Type: application/x-www-form-urlencoded
+    ...
+    ... text=loss""")
+    HTTP/1.1 200 Ok
+    ...Matches: 1...
+    ...CVE-1999-2345 (Candidate)...
 
 
 Finally, let's put a CVE number in there. We expect to jump straight to that
 CVE.
 
-  >>> print http(r"""
-  ... POST /bugs/cve/ HTTP/1.1
-  ... Content-Length: 14
-  ... Content-Type: application/x-www-form-urlencoded
-  ...
-  ... text=2005-2737""")
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://.../bugs/cve/2005-2737
-  ...
+    >>> print http(r"""
+    ... POST /bugs/cve/ HTTP/1.1
+    ... Content-Length: 14
+    ... Content-Type: application/x-www-form-urlencoded
+    ...
+    ... text=2005-2737""")
+    HTTP/1.1 303 See Other
+    ...
+    Location: http://.../bugs/cve/2005-2737
+    ...
 
-A CVE page has the same navigation as the Bugs front page (because CVEs
-don't have their own blueprints, translations, etc), and also includes
-a link back to the main CVE page.
+A CVE page includes a link back to the main CVE page.
 
     >>> anon_browser.open('http://launchpad.dev/bugs/cve/2005-2737')
-    >>> print_location(anon_browser.contents)
-    Hierarchy: None displayed
-    Tabs:
-    * Launchpad Home - http://launchpad.dev/
-    * Code - http://code.launchpad.dev/
-    * Bugs (selected) - http://bugs.launchpad.dev/
-    * Blueprints - http://blueprints.launchpad.dev/
-    * Translations - http://translations.launchpad.dev/
-    * Answers - http://answers.launchpad.dev/
-    Main heading: CVE 2005-2737
+    >>> print anon_browser.title
+    CVE 2005-2737 : ...
     >>> back_link = anon_browser.getLink('Launchpad CVE tracker')
     >>> print back_link.url
     http://launchpad.dev/bugs/cve
 
 The CVE page links to the related bugs.
 
-  >>> "Cross-site scripting (XSS) vulnerability" in anon_browser.contents
-  True
-  >>> 'No related bugs' in anon_browser.contents
-  True
-  >>> for tag in find_tags_by_class(
-  ...     anon_browser.contents, 'menu-link-linkbug'):
-  ...     print tag
-  <a href="+linkbug" class="menu-link-linkbug sprite add">Link to bug</a>
-  >>> 'Candidate' in anon_browser.contents
-  True
-  >>> 'http://marc.theaimsgroup.com/?l=bugtraq&amp;m=112511025414488&amp;w=2">20050826 Multiple PHP' in anon_browser.contents
-  True
+    >>> "Cross-site scripting (XSS) vulnerability" in anon_browser.contents
+    True
+    >>> 'No related bugs' in anon_browser.contents
+    True
+    >>> for tag in find_tags_by_class(
+    ...     anon_browser.contents, 'menu-link-linkbug'):
+    ...     print tag
+    <a href="+linkbug" class="menu-link-linkbug sprite add">Link to bug</a>
+    >>> 'Candidate' in anon_browser.contents
+    True
+    >>> '20050826 Multiple PHP' in anon_browser.contents
+    True

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2010-07-16 16:14:39 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2010-07-26 13:34:58 +0000
@@ -43,12 +43,11 @@
     </metal:side>
 
     <tal:registering metal:fill-slot="registering">
-      Bug #<tal:block content="context/bug/id"/> reported by
+      Reported by
       <tal:reporter replace="structure context/bug/owner/fmt:link" />
       <span
         tal:attributes="title context/bug/datecreated/fmt:datetime"
         tal:content="context/bug/datecreated/fmt:displaydate" />
-      <tal:heat replace="structure view/bug_heat_html" />
     </tal:registering>
 
     <metal:heading fill-slot="heading" tal:define="context_menu context/menu:context">
@@ -92,6 +91,10 @@
         </tal:XXX>
       </p>
 
+      <div style="float: right;">
+        <tal:heat replace="structure view/bug_heat_html" />
+      </div>
+
       <div tal:replace="structure context/bug/@@+bugtasks-and-nominations-table" />
 
       <div id="maincontentsub">