Merge lp:~sinzui/launchpad/team-titles into lp:launchpad

[Curtis Hovey]

Use standard page titles, bread crumbs, and headings for teams and bugs.

    Pre-implementation: No one. I largely followed the advise of mpt in
    the bug reports.

Bugs Bug #244558 Not obvious that teams can't have their own bug reports
    Page does not clearly state you are looking at a team. The
    page title, heading, and bread crumbs do not conform to Lp rules.
    Many users mistake the team for a project :(

Bug #516485 No User Name in the Title of Related Bugs Page Users/team
    The bug vhost breadcrumb adapter is not registered for IPerson. The
    adaption fails during traversal every time. When a view is careful
    to provide page_title, a few crumbs appear.

Bug #928234 Team application pages aren't obviously about a team
    Application page headings do not state you are looking at a team.
    mpt suggests that we smartquote the team and append 'team' as is
    done in the bread crumbs.

--------------------------------------------------------------------

RULES

    * All four bugs are are caused by developer confusion about how
      Lp page titles, bread crumbs and headings work. In some
      cases the views intentionally deviate from Lp rules.
    * Remove support for override_title_breadcrumbs
      * Instead check for an instances SystemErrorView.
      * Removing override_title_breadcrumbs will restore the page title
        and breadcrumbs to several bug pages and specifically team bug
        pages.
      * This partially addresses the concern that bug titles can leak
        confidential information when the user has limited view.
    * Every traversed object must have a breadcrumb adapter.
      * Register BugsVHostBreadcrumb for IPerson
    * The Person bug views must provide:
      * A terse page_title to create a proper page title and breadcrumb.
      * An informative label that explains the purpose the page as the <h1>

QA

    * Visit https://bugs.qastaging.launchpad.net/launchpad/+subscribe
    * Verify the breascrumbs read
      Launchpad itself >> Bugs >> Subscribe
    * Verify the page title is
      Subscribe : Bugs : Launchpad itself

    * Visit https://bugs.qastaging.launchpad.net/launchpad/+bug/533044
    * Verify that the page title is
      Bug #533044 <title> : Bugs : Launchpad itself

    * Visit https://bugs.qastaging.launchpad.net/launchpad/+bug/a77
    * Verify that the page title is
      Error: Page not found

    * Visit https://bugs.qastaging.launchpad.net/~launchpad
    * Verify the page title is
      Bugs : "Canonical Launchpad Engineering" team
    * Verify the breadcrumbs are
      "Canonical Launchpad Engineering" team >> Bugs
    * Verify the first heading is
      "Canonical Launchpad Engineering" team

    * Visit https://bugs.qastaging.launchpad.net/~launchpad/+assignedbugs
    * Verify the page title is
      Assigned bugs : Bugs : "Canonical Launchpad Engineering" team
    * Verify the breadcrumbs are
      "Canonical Launchpad Engineering" team >> Bugs >> Assigned bugs

    * Visit https://qastaging.launchpad.net/~launchpad
    * Verify the heading is "Canonical Launchpad Engineering" team

    * Visit https://answers.qastaging.launchpad.net/~launchpad
    * Verify the first heading is "Canonical Launchpad Engineering" team

    * Visit https://code.qastaging.launchpad.net/~launchpad
    * Verify the first heading is "Canonical Launchpad Engineering" team

    * Visit https://blueprints.qastaging.launchpad.net/~launchpad
    * Verify the first heading is "Canonical Launchpad Engineering" team

    * Visit https://translations.qastaging.launchpad.net/~launchpad
    * Verify the first heading is "Canonical Launchpad Engineering" team

LINT

    lib/lp/app/browser/tales.py
    lib/lp/bugs/browser/bugtask.py
    lib/lp/bugs/browser/structuralsubscription.py
    lib/lp/bugs/stories/bug-also-affects/xx-also-affects-new-upstream.txt
    lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt
    lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt
    lib/lp/bugs/stories/bugs/xx-bug-create-question.txt
    lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt
    lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt
    lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt
    lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt
    lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt
    lib/lp/services/webapp/error.py
    lib/lp/bugs/browser/configure.zcml
    lib/lp/bugs/browser/tests/test_breadcrumbs.py
    ^ Lint is not happy with some of the stories. I can fix these after the
      review.

TEST

    ./bin/test -vvc -t xx-also-affects-new-upstream \
        -t xx-attachments-to-bug-report -t xx-bug-comments-truncated \
        -t xx-bug-create-question -t xx-bug-obfuscation \
        -t xx-advanced-upstream-pending-bugwatch \
        -t xx-filebug-attachments -t xx-product-guided-filebug \
        -t xx-project-guided-filebug lp.bugs.tests.test_doc
    ./bin/test -vvc lp.bugs.browser.tests.test_breadcrumbs
    ./bin/test -vvc -t test_title lp.registry.tests.test_person

IMPLEMENTATION

I replaced the check for override_title_breadcrumb in ObjectFormatterAPI
to instead check if the view is an instance of SystemErrorView. I
removed all override_title_breadcrumb attributes from the error views
and the two offending bugs views. I updated many tests, and it is clear
that the ellipsis in the stories was hiding the title insanity.
    lib/lp/app/browser/tales.py
    lib/lp/bugs/browser/bugtask.py
    lib/lp/bugs/browser/structuralsubscription.py
    lib/lp/bugs/stories/bug-also-affects/xx-also-affects-new-upstream.txt
    lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt
    lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt
    lib/lp/bugs/stories/bugs/xx-bug-create-question.txt
    lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt
    lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt
    lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt
    lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt
    lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt
    lib/lp/services/webapp/error.py

Bug #516485 is caused by a broken breadcrumb adaption.
BugsVHostBreadcrumb was not registered for IPerson. Adding it made
user/team page titles and breadcrumbs behave like projects and distros.
I added a test to verify the breadcrumb adapter makes the expected crumb.
    lib/lp/bugs/browser/configure.zcml
    lib/lp/bugs/browser/tests/test_breadcrumbs.py

Bug 928234 is solved by ensuring that team.title returns the smartquoted
displayname with team appended to it. I added a test, but I believe there
will be some test failures that I will need to follow up on. I may also
be able to remove numerous calls to smartquote in views now that .title
provides the definitive formatting.
    lib/lp/registry/model/person.py
    lib/lp/registry/tests/test_person.py

[Robert Collins (lifeless)]

On Sun, Feb 19, 2012 at 3:41 AM, Curtis Hovey
<email address hidden> wrote:
> Bug #533044 Resummarizing bug report doesn't change page title
>     Changing the bug title does not update the page title...
>     but the bug title should not be in the page title.

This bit does not make sense to me. Open a few bugs. Hit ctrl-shift-E
to get a list of tabs; having the title in the page title is extremely
useful.

[Curtis Hovey (sinzui)]

Bug titles are not terse. We may want them to be a one line summary, but users place between 0 and 50k characters in it. Each browser engine implements it own rules for handling pathological titles on top the native rule that further restrict the length of text in a menu (or completion). So while we know the practical limit of the code is 64k of title, the UI rules place the limit closer to 128 characters. The W3c weighed in on the issue and recommends 64 characters.

Launchpad UI rule forbid us from doing something stupid like duplicating the heading in the bread crumbs beneath the heading so that the user can read it twice.

We could change bug titles to be what we mean but that is a separate group of bugs. I can put a truncated portion on the bug title into the page title, but that truncation will appear under the untruncated heading. Well that is not exactly true, because the bread crumbs have there own truncation rules at 40 characters.

If you really want part of the bug title in the page title, I think we want modify the BugFormatterAPI.page_title to extend the rules by injecting 40 or 64 characters of the bug title into the page title.

[Robert Collins (lifeless)]

On Mon, Feb 20, 2012 at 5:27 AM, Curtis Hovey
<email address hidden> wrote:
> We could change bug titles to be what we mean but that is a separate group of bugs. I can put a truncated portion on the bug title into the page title, but that truncation will appear under the untruncated heading. Well that is not exactly true, because the bread crumbs have there own truncation rules at 40 characters.
>
> If you really want part of the bug title in the page title, I think we want modify the BugFormatterAPI.page_title to extend the rules by injecting 40 or 64 characters of the bug title into the page title.

I have a clear memory of previous debates around page title and bug
titles; I think we should keep it there unless we do some testing to
see whether users really do value it (I believe they do...).

We could do that testing via A/B routes, or user testing or whatever.

-> how do you feel about doing the 40 or 64 characters in the title
(I'd suggest 64) for now ?

-Rob

[Curtis Hovey (sinzui)]

On 02/19/2012 02:07 PM, Robert Collins wrote:
> -> how do you feel about doing the 40 or 64 characters in the title
> (I'd suggest 64) for now ?

I have a sketch of adding artefact titles to page titles. I will use it for bugs and it can be applied to questions, faqs, and blueprints.

I will update the ObjectFormatterAPI.pagetitle to look add the extra text from page_title_extra which will follow Lp rules while permitting objects to make adjustments as needed. I think I just need one test to verify the rules are called and a test to verify that BugFormatterAPI define page_title_extra.

[William Grant (wgrant)]

There's also the issue of search engine results. They tend to use the page title as the primary link text.

[Curtis Hovey (sinzui)]

I extended Ibreadcrumb to provide .detail which can be used for page titles and link titles that need rich informative text. Breadcrumb.detail will return .text if detail is not defines. The BugTaskBreadcrumb does define detail to provide the bug displayname and title. ObjectFormatterAPI.pagetitle uses .detail of the last breadcrumb to create a rich starting fragment for the beadcrumbs. This is a nice non-crack solution where objects can suggest better text, but cannot say STFU to the Lp rules.

[Steve Kowalik (stevenk)]

This looks like brilliant work.

Bug titles are now missing a colon, please correct before that landing.

My nitpicks are your import additions to lib/lp/registry/model/person.py and lib/lp/registry/tests/test_person.py -- pytz, storm and lazr.* should be in the second paragraph of imports, like so:

<base Python imports>

<Things we pull in, such as LAZR, Storm and pytz>

<lp.*>

review: Approve (code)

=== modified file 'lib/lp/app/browser/tales.py'
--- lib/lp/app/browser/tales.py	2012-02-15 03:59:49 +0000
+++ lib/lp/app/browser/tales.py	2012-02-23 16:31:19 +0000
@@ -78,6 +78,7 @@
     )
 from lp.services.webapp.authorization import check_permission
 from lp.services.webapp.canonicalurl import nearest_adapter
+from lp.services.webapp.error import SystemErrorView
 from lp.services.webapp.interfaces import (
     IApplicationMenu,
     IContextMenu,
@@ -666,22 +667,24 @@
         else:
             return 'public'
 
+    def _getSaneBreadcrumbDetail(self, breadcrumb):
+        text = breadcrumb.detail
+        if len(text) > 64:
+            return '%s...' % text[0:64]
+        return text
+
     def pagetitle(self):
         """The page title to be used.
 
         By default, reverse breadcrumbs are always used if they are available.
         If not available, then the view's .page_title attribut is used.
-        If breadcrumbs are available, then a view can still choose to
-        override them by setting the attribute .override_title_breadcrumbs
-        to True.
         """
         ROOT_TITLE = 'Launchpad'
         view = self._context
         request = get_current_browser_request()
         hierarchy_view = getMultiAdapter(
             (view.context, request), name='+hierarchy')
-        override = getattr(view, 'override_title_breadcrumbs', False)
-        if (override or
+        if (isinstance(view, SystemErrorView) or
             hierarchy_view is None or
             not hierarchy_view.display_breadcrumbs):
             # The breadcrumbs are either not available or are overridden.  If
@@ -697,9 +700,15 @@
                 if template is None:
                     return ROOT_TITLE
         # Use the reverse breadcrumbs.
-        return SEPARATOR.join(
-            breadcrumb.text for breadcrumb
-            in reversed(hierarchy_view.items))
+        breadcrumbs = list(reversed(hierarchy_view.items))
+        if len(breadcrumbs) == 0:
+            # This implies there are no breadcrumbs, but this more often
+            # is caused when an Unauthorized error is being raised.
+            return ''
+        detail_breadcrumb = self._getSaneBreadcrumbDetail(breadcrumbs[0])
+        title_breadcrumbs = [breadcrumb.text for breadcrumb in breadcrumbs[1:]]
+        title_text = SEPARATOR.join([detail_breadcrumb] + title_breadcrumbs)
+        return FormattersAPI(title_text).obfuscate_email()
 
 
 class ObjectImageDisplayAPI:

=== modified file 'lib/lp/app/browser/tests/test_base_layout.py'
--- lib/lp/app/browser/tests/test_base_layout.py	2012-01-01 02:58:52 +0000
+++ lib/lp/app/browser/tests/test_base_layout.py	2012-02-23 16:31:19 +0000
@@ -108,9 +108,10 @@
         self.assertEqual('watermark-apps-portlet', watermark['class'])
         if self.context.is_team:
             self.assertEqual('/@@/team-logo', watermark.img['src'])
+            self.assertEqual(u'\u201cWaffles\u201d team', watermark.h2.string)
         else:
             self.assertEqual('/@@/person-logo', watermark.img['src'])
-        self.assertEqual('Waffles', watermark.h2.string)
+            self.assertEqual('Waffles', watermark.h2.string)
         self.assertEqual('facetmenu', watermark.ul['class'])
 
     def test_main_side(self):

=== modified file 'lib/lp/app/browser/tests/test_formatters.py'
--- lib/lp/app/browser/tests/test_formatters.py	2012-01-01 02:58:52 +0000
+++ lib/lp/app/browser/tests/test_formatters.py	2012-02-23 16:31:19 +0000
@@ -5,10 +5,82 @@
 
 __metaclass__ = type
 
-from lp.app.browser.tales import PillarFormatterAPI
-from lp.services.webapp import canonical_url
-from lp.testing import TestCaseWithFactory
+from lp.app.browser.tales import (
+    ObjectFormatterAPI,
+    PillarFormatterAPI,
+    )
+from lp.services.webapp.publisher import canonical_url
+from lp.testing import (
+    FakeAdapterMixin,
+    TestCaseWithFactory,
+    )
 from lp.testing.layers import DatabaseFunctionalLayer
+from lp.testing.views import create_view
+
+
+class ObjectFormatterAPITestCase(TestCaseWithFactory, FakeAdapterMixin):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_pagetitle_top_level(self):
+        project = self.factory.makeProduct(name='fnord')
+        view = create_view(project, name='+index', current_request=True)
+        view.request.traversed_objects = [project, view]
+        formatter = ObjectFormatterAPI(view)
+        self.assertEqual('Fnord in Launchpad', formatter.pagetitle())
+
+    def test_pagetitle_vhost(self):
+        project = self.factory.makeProduct(name='fnord')
+        view = create_view(project, name='+bugs', rootsite='bugs',
+            current_request=True, server_url='https://bugs.launchpad.dev/')
+        view.request.traversed_objects = [project, view]
+        formatter = ObjectFormatterAPI(view)
+        self.assertEqual('Bugs : Fnord', formatter.pagetitle())
+
+    def test_pagetitle_lower_level_default_view(self):
+        project = self.factory.makeProduct(name='fnord')
+        view = create_view(
+            project.development_focus, name='+index', current_request=True)
+        view.request.traversed_objects = [
+            project, project.development_focus, view]
+        formatter = ObjectFormatterAPI(view)
+        self.assertEqual('Series trunk : Fnord', formatter.pagetitle())
+
+    def test_pagetitle_lower_level_named_view(self):
+        project = self.factory.makeProduct(name='fnord')
+        view = create_view(
+            project.development_focus, name='+edit', current_request=True)
+        view.request.traversed_objects = [
+            project, project.development_focus, view]
+        formatter = ObjectFormatterAPI(view)
+        self.assertEqual(
+            'Edit Fnord trunk series : Series trunk : Fnord',
+            formatter.pagetitle())
+
+    def test_pagetitle_last_breadcrumb_detail(self):
+        project = self.factory.makeProduct(name='fnord')
+        bug = self.factory.makeBug(product=project, title='bang')
+        view = create_view(
+            bug.bugtasks[0], name='+index', rootsite='bugs',
+            current_request=True, server_url='https://bugs.launchpad.dev/')
+        view.request.traversed_objects = [project, bug.bugtasks[0], view]
+        formatter = ObjectFormatterAPI(view)
+        self.assertEqual(
+            u'%s \u201cbang\u201d : Bugs : Fnord' % bug.displayname,
+            formatter.pagetitle())
+
+    def test_pagetitle_last_breadcrumb_detail_too_long(self):
+        project = self.factory.makeProduct(name='fnord')
+        title = 'Bang out go the lights ' * 4
+        bug = self.factory.makeBug(product=project, title=title)
+        view = create_view(
+            bug.bugtasks[0], name='+index', rootsite='bugs',
+            current_request=True, server_url='https://bugs.launchpad.dev/')
+        view.request.traversed_objects = [project, bug.bugtasks[0], view]
+        formatter = ObjectFormatterAPI(view)
+        detail = u'%s \u201c%s\u201d' % (bug.displayname, title)
+        expected_title = u'%s... : Bugs : Fnord' % detail[0:64]
+        self.assertEqual(expected_title, formatter.pagetitle())
 
 
 class TestPillarFormatterAPI(TestCaseWithFactory):
@@ -34,7 +106,7 @@
             'summary': self.product.displayname,
             'css_class': self.FORMATTER_CSS_CLASS,
             }
-        self.assertEquals(link, template % mapping)
+        self.assertEqual(link, template % mapping)
 
     def test_link_with_displayname(self):
         # Calling PillarFormatterAPI.link_with_displayname() will return
@@ -52,4 +124,4 @@
             'name': self.product.name,
             'css_class': self.FORMATTER_CSS_CLASS,
             }
-        self.assertEquals(link, template % mapping)
+        self.assertEqual(link, template % mapping)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2012-02-22 05:22:13 +0000
+++ lib/lp/bugs/browser/bugtask.py	2012-02-23 16:31:19 +0000
@@ -638,8 +638,6 @@
 class BugTaskView(LaunchpadView, BugViewMixin, FeedsMixin):
     """View class for presenting information about an `IBugTask`."""
 
-    override_title_breadcrumbs = True
-
     def __init__(self, context, request):
         LaunchpadView.__init__(self, context, request)
 
@@ -655,6 +653,10 @@
 
     @property
     def page_title(self):
+        return self.context.bug.id
+
+    @property
+    def label(self):
         heading = 'Bug #%s in %s' % (
             self.context.bug.id, self.context.bugtargetdisplayname)
         title = FormattersAPI(self.context.bug.title).obfuscate_email()
@@ -4508,3 +4510,9 @@
     @property
     def text(self):
         return self.context.bug.displayname
+
+    @property
+    def detail(self):
+        bug = self.context.bug
+        title = smartquote('"%s"' % bug.title)
+        return '%s %s' % (bug.displayname, title)

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2012-02-20 05:12:41 +0000
+++ lib/lp/bugs/browser/configure.zcml	2012-02-23 16:31:19 +0000
@@ -271,6 +271,12 @@
         class="lp.bugs.browser.bug.DeprecatedAssignedBugsView"
         attribute="__call__"
         permission="launchpad.AnyPerson"/>
+    <adapter
+        name="bugs"
+        provides="lp.services.webapp.interfaces.IBreadcrumb"
+        for="lp.registry.interfaces.person.IPerson"
+        factory="lp.bugs.browser.bugtarget.BugsVHostBreadcrumb"
+        permission="zope.Public"/>
     <browser:page
         for="lp.registry.interfaces.person.IPerson"
         name="+team-bugs-macro"

=== modified file 'lib/lp/bugs/browser/structuralsubscription.py'
--- lib/lp/bugs/browser/structuralsubscription.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/browser/structuralsubscription.py	2012-02-23 16:31:19 +0000
@@ -95,17 +95,13 @@
     custom_widget('subscriptions_team', LabeledMultiCheckBoxWidget)
     custom_widget('remove_other_subscriptions', LabeledMultiCheckBoxWidget)
 
-    override_title_breadcrumbs = True
+    page_title = 'Subscribe'
 
     @property
-    def page_title(self):
+    def label(self):
         return 'Subscribe to Bugs in %s' % self.context.title
 
     @property
-    def label(self):
-        return self.page_title
-
-    @property
     def next_url(self):
         return canonical_url(self.context)
 

=== modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
--- lib/lp/bugs/browser/tests/test_breadcrumbs.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/browser/tests/test_breadcrumbs.py	2012-02-23 16:31:19 +0000
@@ -17,7 +17,7 @@
         super(TestBugTaskBreadcrumb, self).setUp()
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
-        self.bug = self.factory.makeBug(product=product)
+        self.bug = self.factory.makeBug(product=product, title='borked')
         self.bugtask = self.bug.default_bugtask
         self.bugtask_url = canonical_url(self.bugtask, rootsite='bugs')
 
@@ -26,6 +26,8 @@
         last_crumb = crumbs[-1]
         self.assertEquals(self.bugtask_url, last_crumb.url)
         self.assertEquals("Bug #%d" % self.bug.id, last_crumb.text)
+        self.assertEquals(
+            u"Bug #%d \u201cborked\u201d" % self.bug.id, last_crumb.detail)
 
     def test_bugtask_child(self):
         crumbs = self.getBreadcrumbsForObject(
@@ -77,3 +79,22 @@
             (self.bug_tracker.title, self.bug_tracker_url),
             ]
         self.assertBreadcrumbs(expected_breadcrumbs, self.bug_tracker)
+
+
+class BugsVHostBreadcrumbTestCase(BaseBreadcrumbTestCase):
+
+    def test_person(self):
+        person = self.factory.makePerson(name='snarf')
+        person_bugs_url = canonical_url(person, rootsite='bugs')
+        crumbs = self.getBreadcrumbsForObject(person, rootsite='bugs')
+        last_crumb = crumbs[-1]
+        self.assertEquals(person_bugs_url, last_crumb.url)
+        self.assertEquals("Bugs", last_crumb.text)
+
+    def test_bugtarget(self):
+        project = self.factory.makeProduct(name='fnord')
+        project_bugs_url = canonical_url(project, rootsite='bugs')
+        crumbs = self.getBreadcrumbsForObject(project, rootsite='bugs')
+        last_crumb = crumbs[-1]
+        self.assertEquals(project_bugs_url, last_crumb.url)
+        self.assertEquals("Bugs", last_crumb.text)

=== modified file 'lib/lp/bugs/browser/tests/test_expose.py'
--- lib/lp/bugs/browser/tests/test_expose.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/browser/tests/test_expose.py	2012-02-23 16:31:19 +0000
@@ -132,9 +132,12 @@
         expose_user_administered_teams_to_js(self.request, self.user, context,
             absoluteURL=fake_absoluteURL)
         team_info = self._sort(self.request.objects['administratedTeams'])
-        self.assertThat(team_info[0]['title'], Equals(u'Team 1'))
+        self.assertThat(
+            team_info[0]['title'], Equals(u'\u201cTeam 1\u201d team'))
         self.assertThat(team_info[0]['has_preferredemail'], Equals(False))
-        self.assertThat(team_info[1]['title'], Equals(u'Team 2'))
+        self.assertThat(
+            team_info[1]['title'],
+            Equals(u'\u201cTeam 2\u201d team'))
         self.assertThat(team_info[1]['has_preferredemail'], Equals(True))
 
     def test_teams_for_non_distro(self):
@@ -162,14 +165,16 @@
                 KeysEqual('has_preferredemail', 'link', 'title', 'url'))
         # The link is the title of the team.
         self.assertThat(
-            team_info[0]['title'], Equals(u'Bug Supervisor Sub Team'))
-        self.assertThat(
-            team_info[1]['title'], Equals(u'Bug Supervisor Team'))
-        self.assertThat(
-            team_info[2]['title'], Equals(u'Unrelated Team'))
+            team_info[0]['title'],
+            Equals(u'\u201cBug Supervisor Sub Team\u201d team'))
+        self.assertThat(
+            team_info[1]['title'],
+            Equals(u'\u201cBug Supervisor Team\u201d team'))
+        self.assertThat(
+            team_info[2]['title'], Equals(u'\u201cUnrelated Team\u201d team'))
         # The link is the API link to the team.
         self.assertThat(team_info[0]['link'],
-            Equals('http://example.com/BugSupervisorSubTeam'))
+            Equals(u'http://example.com/\u201cBugSupervisorSubTeam\u201dteam'))
 
     def test_expose_user_administered_teams_to_js__uses_cached_teams(self):
         # The function expose_user_administered_teams_to_js uses a
@@ -236,12 +241,14 @@
                 KeysEqual('has_preferredemail', 'link', 'title', 'url'))
         # The link is the title of the team.
         self.assertThat(
-            team_info[0]['title'], Equals(u'Bug Supervisor Sub Team'))
+            team_info[0]['title'],
+            Equals(u'\u201cBug Supervisor Sub Team\u201d team'))
         self.assertThat(
-            team_info[1]['title'], Equals(u'Bug Supervisor Team'))
+            team_info[1]['title'],
+            Equals(u'\u201cBug Supervisor Team\u201d team'))
         # The link is the API link to the team.
         self.assertThat(team_info[0]['link'],
-            Equals('http://example.com/BugSupervisorSubTeam'))
+            Equals(u'http://example.com/\u201cBugSupervisorSubTeam\u201dteam'))
 
     def test_teams_for_distro_with_no_bug_super(self):
         self._setup_teams(self.user)
@@ -266,14 +273,16 @@
                 KeysEqual('has_preferredemail', 'link', 'title', 'url'))
         # The link is the title of the team.
         self.assertThat(
-            team_info[0]['title'], Equals(u'Bug Supervisor Sub Team'))
-        self.assertThat(
-            team_info[1]['title'], Equals(u'Bug Supervisor Team'))
-        self.assertThat(
-            team_info[2]['title'], Equals(u'Unrelated Team'))
+            team_info[0]['title'],
+            Equals(u'\u201cBug Supervisor Sub Team\u201d team'))
+        self.assertThat(
+            team_info[1]['title'],
+            Equals(u'\u201cBug Supervisor Team\u201d team'))
+        self.assertThat(
+            team_info[2]['title'], Equals(u'\u201cUnrelated Team\u201d team'))
         # The link is the API link to the team.
         self.assertThat(team_info[0]['link'],
-            Equals('http://example.com/BugSupervisorSubTeam'))
+            Equals(u'http://example.com/\u201cBugSupervisorSubTeam\u201dteam'))
 
 
 class TestStructuralSubscriptionHelpers(TestCase):

=== modified file 'lib/lp/bugs/stories/bug-also-affects/xx-also-affects-new-upstream.txt'
--- lib/lp/bugs/stories/bug-also-affects/xx-also-affects-new-upstream.txt	2011-12-22 05:09:10 +0000
+++ lib/lp/bugs/stories/bug-also-affects/xx-also-affects-new-upstream.txt	2012-02-23 16:31:19 +0000
@@ -19,7 +19,7 @@
 We're now redirected to the newly created bugtask page.
 
     >>> user_browser.title
-    'Bug #1 in The Foo Project...'
+    'Bug #1 ... : Bugs : The Foo Project'
 
 When creating a new upstream through this page we'll check if there's any
 upstream already registered in Launchpad which uses the same bugtracker as
@@ -61,7 +61,7 @@
 
     >>> user_browser.getControl('Use Existing Project').click()
     >>> user_browser.title
-    'Bug #2 in The Foo Project...'
+    'Bug #2 (blackhole) ... : Bugs : The Foo Project'
 
     >>> from lp.bugs.tests.bug import print_remote_bugtasks
     >>> print_remote_bugtasks(user_browser.contents)
@@ -86,7 +86,7 @@
     ...     'http://bugs.foo.org/bugs/show_bug.cgi?id=123')
     >>> user_browser.getControl('Continue').click()
     >>> user_browser.title
-    'Bug #2 in The Bar Project:...
+    'Bug #2 (blackhole) ... : Bugs : The Bar Project'
     >>> print_remote_bugtasks(user_browser.contents)
     The Bar Project ...   auto-bugs.foo.org #123
     The Bar Project ...   auto-bugs.foo.org #421

=== modified file 'lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt'
--- lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2011-12-24 17:49:30 +0000
+++ lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2012-02-23 16:31:19 +0000
@@ -72,7 +72,7 @@
     >>> logout()
     >>> browser.open("http://bugs.launchpad.dev/redfish/+bug/11")
     >>> print extract_text(browser.contents)
-    Bug #11 in Jokosher...
+    Bug #11 ...
     ...Patches...
     ...a patch...
     ...Bug attachments...

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt	2012-02-01 15:26:32 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt	2012-02-23 16:31:19 +0000
@@ -87,7 +87,7 @@
 
     >>> user_browser.open('http://bugs.launchpad.dev/tomcat/+bug/2')
     >>> user_browser.title.decode('utf-8')
-    u'Bug #2 in Tomcat: ...Blackhole Trash folder...'
+    u'Bug #2 (blackhole) ... : Bugs : Tomcat'
     >>> user_browser.getControl(name='field.comment').value = (
     ...     "-----BEGIN PGP SIGNED MESSAGE-----\n"
     ...     "Hash: SHA1\n"
@@ -120,7 +120,7 @@
 email addresses in messages.
 
     >>> user_browser.title.decode('utf-8')
-    u'Bug #2 in Tomcat: ...Blackhole Trash folder...'
+    u'Bug #2 (blackhole) ... : Bugs : Tomcat'
     >>> text = find_tags_by_class(
     ...     user_browser.contents, 'boardCommentBody')[-1]
     >>> print extract_text(text.findAll('p')[-2])
@@ -135,7 +135,7 @@
 
     >>> anon_browser.open('http://bugs.launchpad.dev/tomcat/+bug/2')
     >>> anon_browser.title.decode('utf-8')
-    u'Bug #2 in Tomcat: ...Blackhole Trash folder...'
+    u'Bug #2 (blackhole) ... : Bugs : Tomcat'
     >>> text = find_tags_by_class(
     ...     anon_browser.contents, 'boardCommentBody')[-1]
     >>> print extract_text(text.findAll('p')[-2])

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-create-question.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2011-12-04 03:58:11 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2012-02-23 16:31:19 +0000
@@ -14,7 +14,7 @@
     ...     'http://bugs.launchpad.dev'
     ...     '/ubuntu/+source/linux-source-2.6.15/+bug/10')
     >>> anon_browser.title
-    'Bug #10 in linux-source-2.6.15 (Ubuntu): ...another test bug...'
+    'Bug #10 ... : Bugs : ...linux-source-2.6.15... package : Ubuntu'
 
     >>> anon_browser.getLink('Convert to a question').click()
     Traceback (most recent call last):
@@ -28,7 +28,7 @@
     ...     'http://bugs.launchpad.dev'
     ...     '/ubuntu/+source/linux-source-2.6.15/+bug/10')
     >>> user_browser.title
-    'Bug #10 in linux-source-2.6.15 (Ubuntu): ...another test bug...'
+    'Bug #10 ... : Bugs : ...linux-source-2.6.15... package : Ubuntu'
 
     >>> user_browser.getLink('Convert to a question').click()
     >>> user_browser.title
@@ -50,7 +50,7 @@
 informational message stating that a question was created from the bug.
 
     >>> user_browser.title
-    'Bug #10 in linux-source-2.6.15 (Ubuntu): ...another test bug...'
+    'Bug #10 ... : Bugs : ...linux-source-2.6.15... package : Ubuntu'
 
     >>> content = find_main_content(user_browser.contents)
     >>> content.find(id="bug-is-question")
@@ -114,7 +114,7 @@
 
     >>> user_browser.getLink('#10: another test bug').click()
     >>> user_browser.title
-    'Bug #10 in linux-source-2.6.15 (Ubuntu): ...another test bug...'
+    'Bug #10 ... : Bugs : ...linux-source-2.6.15... package : Ubuntu'
 
 
 When a question cannot be created from a bug
@@ -127,8 +127,7 @@
 
     >>> user_browser.open('http://bugs.launchpad.dev/thunderbird/+bug/9')
     >>> user_browser.title
-    'Bug #9 in Mozilla Thunderbird: \xe2\x80\x9cThunderbird
-    crashes\xe2\x80\x9d'
+    'Bug #9 ...'
 
     >>> user_browser.getLink('Convert to a question').click()
     >>> print user_browser.title
@@ -191,13 +190,13 @@
     >>> user_browser.open(
     ...     'http://bugs.launchpad.dev/jokosher/+bug/12')
     >>> user_browser.title
-    'Bug #12 in Jokosher: ...Copy, Cut and Delete operations should work...'
+    'Bug #12 ...'
 
     >>> user_browser.getLink('Convert to a question').click()
     >>> user_browser.getControl('Comment').value = 'This will succeed.'
     >>> user_browser.getControl('Convert this Bug into a Question').click()
     >>> user_browser.title
-    'Bug #12 in Jokosher: ...Copy, Cut and Delete operations should work...'
+    'Bug #12 ...'
 
     >>> print "\n".join(get_feedback_messages(user_browser.contents))
     This bug report was converted into a question:...question #16...
@@ -219,8 +218,7 @@
 reactivate a bug report.
 
     >>> user_browser.title
-    'Bug #12 in Jokosher: \xe2\x80\x9cCopy, Cut and Delete operations should
-    work on selections\xe2\x80\x9d'
+    'Bug #12 ... : Bugs : Jokosher'
 
     >>> user_browser.getLink('Convert back to a bug').click()
     >>> print user_browser.title
@@ -244,7 +242,7 @@
 the Open status.
 
     >>> user_browser.title
-    'Bug #12 in Jokosher: ...Copy, Cut and Delete operations should work...'
+    'Bug #12 ... : Bugs : Jokosher'
 
     >>> print "\n".join(get_feedback_messages(user_browser.contents))
     Removed Question #...: Copy, Cut and Delete operations should work...

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt	2011-10-16 08:16:47 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt	2012-02-23 16:31:19 +0000
@@ -13,7 +13,7 @@
     ...     'http://bugs.launchpad.dev'
     ...     '/debian/sarge/+source/mozilla-firefox/+bug/3')
     >>> user_browser.title
-    'Bug #3 in mozilla-firefox (Debian Sarge): ...Bug Title Test...'
+    'Bug #3 ...'
 
     >>> description = find_tag_by_id(
     ...     user_browser.contents, 'edit-description')
@@ -26,7 +26,7 @@
     ...     'http://bugs.launchpad.dev'
     ...     '/debian/sarge/+source/mozilla-firefox/+bug/3')
     >>> print anon_browser.title
-    Bug #3 in mozilla-firefox (Debian Sarge): ...
+    Bug #3 ...
 
     >>> '[e-mail]' in anon_browser.contents
     False

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt	2012-02-08 00:47:42 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt	2012-02-23 16:31:19 +0000
@@ -31,7 +31,7 @@
     ...     'I just want to register that it is upstream').selected = True
     >>> browser.getControl('Add to Bug Report').click()
     >>> browser.title
-    'Bug #... in alsa-utils: ...Test Bug 1...'
+    'Bug #... : Bugs : alsa-utils'
 
 Sample Person visits the advanced search page for alsa-utils, and
 chooses to search for all bugs that need to be forwarded upstream.

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-person-bugs.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-person-bugs.txt	2012-02-17 21:00:21 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-person-bugs.txt	2012-02-23 16:31:19 +0000
@@ -7,7 +7,7 @@
     >>> anon_browser.open('http://launchpad.dev/~name12')
     >>> anon_browser.getLink('Bugs').click()
     >>> print anon_browser.title
-    Related bugs
+    Bugs : Sample Person
 
     >>> print anon_browser.url
     http://bugs.launchpad.dev/~name12
@@ -49,7 +49,7 @@
 
     >>> anon_browser.open('http://bugs.launchpad.dev/~name12')
     >>> print anon_browser.title
-    Related bugs
+    Bugs : Sample Person
 
 
 More specific listings
@@ -64,7 +64,7 @@
 
     >>> anon_browser.getLink('Assigned bugs').click()
     >>> print anon_browser.title
-    Assigned bugs : Sample Person
+    Assigned bugs : Bugs : Sample Person
 
     >>> print anon_browser.url
     http://bugs.launchpad.dev/~name12/+assignedbugs
@@ -83,7 +83,7 @@
 
     >>> anon_browser.getLink('Commented bugs').click()
     >>> print anon_browser.title
-    Commented bugs : Sample Person
+    Commented bugs : Bugs : Sample Person
 
     >>> print anon_browser.url
     http://bugs.launchpad.dev/~name12/+commentedbugs
@@ -106,7 +106,7 @@
 
     >>> anon_browser.getLink('Reported bugs').click()
     >>> print anon_browser.title
-    Reported bugs : Sample Person
+    Reported bugs : Bugs : Sample Person
 
     >>> print anon_browser.url
     http://bugs.launchpad.dev/~name12/+reportedbugs
@@ -137,7 +137,7 @@
 
     >>> anon_browser.getLink('Subscribed bugs').click()
     >>> print anon_browser.title
-    Subscribed bugs : Sample Person
+    Subscribed bugs : Bugs : Sample Person
 
     >>> print anon_browser.url
     http://bugs.launchpad.dev/~name12/+subscribedbugs

=== modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt'
--- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2011-11-28 00:35:15 +0000
+++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2012-02-23 16:31:19 +0000
@@ -424,8 +424,8 @@
     Please note, this bug tracker cannot be deleted because:
       This is the bug tracker for The GNOME Project and The GNOME Terminal
       Emulator.
-      There are linked bug watches and only members of Launchpad
-        Administrators and Registry Administrators can delete them en masse.
+      There are linked bug watches and only members of ...Launchpad
+        Administrators...
 
     >>> user_browser.getControl('Delete')
     Traceback (most recent call last):
@@ -448,10 +448,8 @@
     >>> print extract_text(find_tag_by_id(
     ...     user_browser.contents, 'bugtracker-delete-not-possible-reasons'))
     Please note, this bug tracker cannot be deleted because:
-      There are linked bug watches and only members of Launchpad
-        Administrators and Registry Administrators can delete them en masse.
-      Bug comments have been imported via this bug tracker.
-      This bug tracker is protected from deletion.
+      There are linked bug watches and only members of ...Launchpad
+        Administrators...
 
     >>> user_browser.getControl('Delete')
     Traceback (most recent call last):

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt	2011-04-20 14:56:23 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt	2012-02-23 16:31:19 +0000
@@ -30,7 +30,7 @@
     ...     "of the attachment")
     >>> user_browser.getControl('Submit Bug Report').click()
     >>> user_browser.title
-    'Bug #... in Mozilla Firefox...'
+    'Bug #... : Bugs : Mozilla Firefox'
 
 No Privileges Person sees a notice on the bug page stating that the file
 was attached.

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt	2011-05-16 01:53:42 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt	2012-02-23 16:31:19 +0000
@@ -165,7 +165,5 @@
     >>> user_browser.url
     'http://bugs.launchpad.dev/firefox/+bug/...'
 
-    >>> user_browser.title
-    "Bug #... in Mozilla Firefox: ...Frankenzombulon reanimated..."
-
-
+    >>> print user_browser.title
+    Bug #...Frankenzombulon reanimated... : Bugs : Mozilla Firefox

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt	2011-05-27 19:53:20 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt	2012-02-23 16:31:19 +0000
@@ -37,7 +37,7 @@
     'http://bugs.launchpad.dev/evolution/+bug/...'
 
     >>> user_browser.title
-    'Bug #... in Evolution: ...Evolution crashes...'
+    'Bug #...Evolution crashes... : Bugs : Evolution'
 
 
 Subscribing to a similar bug
@@ -109,7 +109,7 @@
     'http://bugs.launchpad.dev/evolution/+bug/...'
 
     >>> user_browser.title
-    'Bug #... in Evolution: ...Faznambutron dumps core...'
+    'Bug #...Faznambutron dumps core... : Bugs : Evolution'
 
 
 Empty ProjectGroups
@@ -281,5 +281,3 @@
     >>> user_browser.getLink('File a bug here').click()
     >>> user_browser.url
     'http://launchpad.dev/ubuntu/+source/thunderbird/+filebug'
-
-

=== modified file 'lib/lp/code/stories/branches/xx-branch-index.txt'
--- lib/lp/code/stories/branches/xx-branch-index.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/code/stories/branches/xx-branch-index.txt	2012-02-23 16:31:19 +0000
@@ -112,7 +112,7 @@
 
     >>> browser.getLink('bug 1').click()
     >>> print browser.title
-    Bug #1 in Mozilla Firefox...
+    Bug #1 ...
 
 
 Unscanned branches

=== modified file 'lib/lp/hardwaredb/stories/hwdb/xx-hwdb.txt'
--- lib/lp/hardwaredb/stories/hwdb/xx-hwdb.txt	2012-01-15 11:06:57 +0000
+++ lib/lp/hardwaredb/stories/hwdb/xx-hwdb.txt	2012-02-23 16:31:19 +0000
@@ -350,7 +350,7 @@
     >>> anon_browser.open(
     ...     'http://launchpad.dev/~ubuntu-team/+hwdb-submissions')
     >>> print extract_text(find_main_content(anon_browser.contents))
-    Hardware submissions for Ubuntu Team...
+    Hardware submissions for ...Ubuntu Team...
     Ubuntu Team has posted no submissions.
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2012-02-21 22:46:28 +0000
+++ lib/lp/registry/model/person.py	2012-02-23 16:31:19 +0000
@@ -40,7 +40,11 @@
 import weakref
 
 from lazr.delegates import delegates
-from lazr.restful.utils import get_current_browser_request
+from lazr.restful.utils import (
+    get_current_browser_request,
+    smartquote,
+    )
+
 import pytz
 from sqlobject import (
     BoolCol,
@@ -1777,6 +1781,8 @@
     @property
     def title(self):
         """See `IPerson`."""
+        if self.is_team:
+            return smartquote('"%s" team') % self.displayname
         return self.displayname
 
     @property

=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2011-08-16 15:24:16 +0000
+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2012-02-23 16:31:19 +0000
@@ -125,7 +125,7 @@
     http://launchpad.dev/ubuntu/warty/+subscribe
 
     >>> print admin_browser.title
-    Subscribe to Bugs in The Warty Warthog Release
+    Subscribe : Warty (4.10) : Ubuntu
 
 
 Upstream packaging portlet

=== modified file 'lib/lp/registry/stories/milestone/object-milestones.txt'
--- lib/lp/registry/stories/milestone/object-milestones.txt	2012-02-21 22:46:28 +0000
+++ lib/lp/registry/stories/milestone/object-milestones.txt	2012-02-23 16:31:19 +0000
@@ -191,14 +191,11 @@
     Main heading: Debian 3.1
 
 
-Duplicate bugs
-..............
-
-Milestone bug listings do not show bugs that are marked as duplicates of
-other bugs.
-
-To demonstrate this, we'll begin by filing a couple of bugs for the
-Mozilla Firefox product:
+
+Bugs targeted to multiple series
+................................
+
+Setup this embarrasing story.
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open('http://bugs.launchpad.dev/firefox/')
@@ -247,81 +244,6 @@
     >>> browser.getControl('Milestone').value = [milestone_id]
     >>> browser.getControl('Save Changes').click()
 
-Observe that both bugs are listed in the 1.0 milestone listing:
-
-    >>> browser.open('http://launchpad.dev/firefox/trunk')
-    >>> browser.getLink('View milestones').click()
-    >>> browser.getLink("Mozilla Firefox 1.0", index=1).click()
-    >>> print browser.title
-    1.0 : Mozilla Firefox
-
-    >>> milestone_url = browser.url
-
-    >>> browser.getLink('Test Bug 1').click()
-    >>> browser.url == bug_1_url
-    True
-
-    >>> browser.open(milestone_url)
-    >>> browser.getLink('Test Bug 2').click()
-    >>> browser.url == bug_2_url
-    True
-
-Now we'll mark the second bug as a duplicate of the first:
-
-    >>> browser.open(bug_2_url)
-    >>> browser.getLink('Mark as duplicate').click()
-    >>> browser.getControl('Duplicate').value = bug_1_id
-    >>> browser.getControl('Change').click()
-    >>> print extract_text(browser.contents)
-    Bug #20 in Mozilla Firefox...
-    Duplicate of bug #19...
-
-Since duplicate bugs are not listed in milestone listings, only our
-first bug is listed in the 1.0 milestone listing:
-
-    >>> from lp.testing.layers import MemcachedLayer
-
-    >>> MemcachedLayer.purge()
-
-    >>> browser.open(milestone_url)
-    >>> browser.getLink('Test Bug 1').click()
-    >>> browser.url == bug_1_url
-    True
-
-    >>> browser.open(milestone_url)
-    >>> print browser.getLink('Test Bug 2')
-    Traceback (most recent call last):
-        ...
-    LinkNotFoundError
-
-However, it's also possible to clear the duplicate status of our second
-bug:
-
-    >>> browser.open(bug_2_url)
-    >>> browser.getLink(id='change_duplicate_bug').click()
-    >>> browser.getControl('Duplicate').value = ''
-    >>> browser.getControl('Change').click()
-    >>> 'This report is a duplicate' in find_main_content(browser.contents)
-    False
-
-Now both bugs are listed in the 1.0 milestone listing once again:
-
-    >>> MemcachedLayer.purge()
-
-    >>> browser.open(milestone_url)
-    >>> browser.getLink('Test Bug 1').click()
-    >>> browser.url == bug_1_url
-    True
-
-    >>> browser.open(milestone_url)
-    >>> browser.getLink('Test Bug 2').click()
-    >>> browser.url == bug_2_url
-    True
-
-
-Bugs targeted to multiple series
-................................
-
 Bugs targeted to the same milestone across more than one series will
 result in duplicate entries in the milestone listing (one for each
 series target).
@@ -357,6 +279,7 @@
     >>> print browser.title
     Series trunk : Mozilla Firefox
 
+    >>> from lp.testing.layers import MemcachedLayer
     >>> MemcachedLayer.purge()
     >>> browser.open('http://launchpad.dev/firefox/trunk')
 
@@ -377,11 +300,11 @@
     >>> from lp.services.helpers import backslashreplace
     >>> browser.open(bug_1_url)
     >>> print backslashreplace(browser.title)
-    Bug...in Mozilla Firefox...
+    Bug #...Test Bug 1... : Bugs : Mozilla Firefox
 
     >>> browser.getLink('Target to series').click()
     >>> print browser.title
-    Target bug #19 to series...
+    Target bug #... to series...
 
     >>> browser.getControl('1.0').selected = True
     >>> browser.getControl('2.0').selected = True

=== modified file 'lib/lp/registry/stories/milestone/xx-milestone-add-and-edit.txt'
--- lib/lp/registry/stories/milestone/xx-milestone-add-and-edit.txt	2011-12-28 17:03:06 +0000
+++ lib/lp/registry/stories/milestone/xx-milestone-add-and-edit.txt	2012-02-23 16:31:19 +0000
@@ -73,7 +73,7 @@
     >>> print user_browser.url
     http://launchpad.dev/firefox/+milestone/1.0/+subscribe
     >>> print user_browser.title
-    Subscribe to Bugs in Mozilla Firefox 1.0
+    Subscribe : 1.0 : Mozilla Firefox
 
 But we can't subscribe to project milestones, since they are not real objects.
 

=== modified file 'lib/lp/registry/stories/person/xx-person-subscriptions.txt'
--- lib/lp/registry/stories/person/xx-person-subscriptions.txt	2012-01-15 13:32:27 +0000
+++ lib/lp/registry/stories/person/xx-person-subscriptions.txt	2012-02-23 16:31:19 +0000
@@ -77,7 +77,7 @@
     >>> cancel_link = subscriber_browser.getLink('Cancel')
     >>> cancel_link.click()
     >>> print subscriber_browser.title
-    Subscriptions : Webster
+    Subscriptions : Bugs : Webster
 
 He chooses to unsubscribe from the bug about Affluenza.
 
@@ -87,7 +87,7 @@
     ...     "unsubscribe me from this bug").selected = True
     >>> subscriber_browser.getControl("Continue").click()
     >>> print subscriber_browser.title
-    Subscriptions : Webster
+    Subscriptions : Bugs : Webster
 
 Webster can see that the bug about Affluenza is no longer listed in his direct
 bug subscriptions.
@@ -118,7 +118,7 @@
     >>> subscriber_browser.open(
     ...     'https://bugs.launchpad.dev/~america/+subscriptions')
     >>> print subscriber_browser.title
-    Subscriptions : “America” team
+    Subscriptions : Bugs ...
 
     >>> print extract_text(find_tag_by_id(
     ...     subscriber_browser.contents, 'bug_subscriptions'))

=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-add-and-edit.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-add-and-edit.txt	2009-09-17 22:27:18 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-add-and-edit.txt	2012-02-23 16:31:19 +0000
@@ -126,4 +126,4 @@
     >>> print browser.url
     http://launchpad.dev/firefox/unstable/+subscribe
     >>> print browser.title
-    Subscribe to Bugs in Mozilla Firefox unstable series
+    Subscribe : Series unstable : Mozilla Firefox

=== modified file 'lib/lp/registry/stories/project/xx-project-index.txt'
--- lib/lp/registry/stories/project/xx-project-index.txt	2012-01-04 12:11:44 +0000
+++ lib/lp/registry/stories/project/xx-project-index.txt	2012-02-23 16:31:19 +0000
@@ -184,4 +184,4 @@
     >>> print user_browser.url
     http://launchpad.dev/mozilla/+subscribe
     >>> print user_browser.title
-    Subscribe to Bugs in The Mozilla Project
+    Subscribe : The Mozilla Project

=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2012-02-19 14:44:47 +0000
+++ lib/lp/registry/tests/test_person.py	2012-02-23 16:31:19 +0000
@@ -6,6 +6,8 @@
 from datetime import datetime
 
 from lazr.lifecycle.snapshot import Snapshot
+from lazr.restful.utils import smartquote
+
 import pytz
 from storm.store import Store
 from testtools.matchers import (
@@ -261,6 +263,16 @@
 
     layer = DatabaseFunctionalLayer
 
+    def test_title_user(self):
+        user = self.factory.makePerson(name='snarf')
+        self.assertEqual('Snarf', user.title)
+        self.assertEqual(user.displayname, user.title)
+
+    def test_title_team(self):
+        team = self.factory.makeTeam(name='pting')
+        title = smartquote('"%s" team') % team.displayname
+        self.assertEqual(title, team.title)
+
     def test_getOwnedOrDrivenPillars(self):
         user = self.factory.makePerson()
         active_project = self.factory.makeProject(owner=user)

=== modified file 'lib/lp/services/webapp/breadcrumb.py'
--- lib/lp/services/webapp/breadcrumb.py	2011-12-24 17:49:30 +0000
+++ lib/lp/services/webapp/breadcrumb.py	2012-02-23 16:31:19 +0000
@@ -30,6 +30,7 @@
     implements(IBreadcrumb)
 
     text = None
+    _detail = None
     _url = None
 
     def __init__(self, context):
@@ -55,9 +56,18 @@
         else:
             return self._url
 
+    @property
+    def detail(self):
+        """See `IBreadcrumb`.
+
+        Subclasses may choose to provide detail text that will be used
+        to make the page title for the last item traversed.
+        """
+        return self._detail or self.text
+
     def __repr__(self):
         # XXX: salgado, 2009-10-14, http://bugs.python.org/issue5876: In
-        # python 2.5, the return value of __repr__() may be forced into a
+        # python 2.5-2.7, the return value of __repr__() may be forced into a
         # type(str), so we can't include unicode here.
         text = self.text.encode('raw-unicode-escape')
         return "<%s url='%s' text='%s'>" % (

=== modified file 'lib/lp/services/webapp/error.py'
--- lib/lp/services/webapp/error.py	2012-01-23 21:23:24 +0000
+++ lib/lp/services/webapp/error.py	2012-02-23 16:31:19 +0000
@@ -41,7 +41,6 @@
     implements(ISystemErrorView)
 
     page_title = 'Error: Launchpad system error'
-    override_title_breadcrumbs = True
 
     plain_oops_template = ViewPageTemplateFile(
         'templates/oops-veryplain.pt')
@@ -185,7 +184,6 @@
 class NotFoundView(SystemErrorView):
 
     page_title = 'Error: Page not found'
-    override_title_breadcrumbs = True
 
     response_code = httplib.NOT_FOUND
 
@@ -224,7 +222,6 @@
 class RequestExpiredView(SystemErrorView):
 
     page_title = 'Error: Timeout'
-    override_title_breadcrumbs = True
 
     response_code = httplib.SERVICE_UNAVAILABLE
 
@@ -240,7 +237,6 @@
     """View rendered when an InvalidBatchSizeError is raised."""
 
     page_title = "Error: Invalid Batch Size"
-    override_title_breadcrumbs = True
 
     response_code = httplib.BAD_REQUEST
 
@@ -259,7 +255,6 @@
 class TranslationUnavailableView(SystemErrorView):
 
     page_title = 'Error: Translation page is not available'
-    override_title_breadcrumbs = True
 
     response_code = httplib.SERVICE_UNAVAILABLE
 
@@ -271,7 +266,6 @@
     """View rendered when an InvalidBatchSizeError is raised."""
 
     page_title = "Error: you can't do this right now"
-    override_title_breadcrumbs = True
 
     response_code = httplib.SERVICE_UNAVAILABLE
 

=== modified file 'lib/lp/services/webapp/interfaces.py'
--- lib/lp/services/webapp/interfaces.py	2012-02-21 22:46:28 +0000
+++ lib/lp/services/webapp/interfaces.py	2012-02-23 16:31:19 +0000
@@ -234,6 +234,8 @@
 
     text = Attribute('Text of this breadcrumb.')
 
+    detail = Attribute('Detailed text of this breadcrumb.')
+
 
 #
 # Canonical URLs

=== modified file 'lib/lp/services/webapp/tests/test_breadcrumbs.py'
--- lib/lp/services/webapp/tests/test_breadcrumbs.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/webapp/tests/test_breadcrumbs.py	2012-02-23 16:31:19 +0000
@@ -21,10 +21,39 @@
 class Cookbook:
     implements(ICanonicalUrlData)
     rootsite = None
+    path = 'cookbook'
+    inside = None
 
 
 class TestBreadcrumb(TestCase):
 
+    def test_init(self):
+        # The attributes are None by default.
+        cookbook = Cookbook()
+        breadcrumb = Breadcrumb(cookbook)
+        self.assertIs(None, breadcrumb.text)
+        self.assertIs(None, breadcrumb._detail)
+        self.assertIs(None, breadcrumb._url)
+
+    def test_detail(self):
+        # The detail properted is the _detail attribute or the text attribute.
+        cookbook = Cookbook()
+        breadcrumb = Breadcrumb(cookbook)
+        breadcrumb._detail = 'hello'
+        breadcrumb.text = 'goodbye'
+        self.assertEqual('hello', breadcrumb.detail)
+        breadcrumb._detail = None
+        self.assertEqual('goodbye', breadcrumb.detail)
+
+    def test_url(self):
+        # The detail properted is the _detail attribute or the text attribute.
+        cookbook = Cookbook()
+        breadcrumb = Breadcrumb(cookbook)
+        breadcrumb._url = '/hello'
+        self.assertEqual('/hello', breadcrumb.url)
+        breadcrumb._url = None
+        self.assertEqual('http://launchpad.dev/cookbook', breadcrumb.url)
+
     def test_rootsite_defaults_to_mainsite(self):
         # When a class' ICanonicalUrlData doesn't define a rootsite, our
         # Breadcrumb adapter will use 'mainsite' as the rootsite.
@@ -123,7 +152,8 @@
 
     def test_product_bugtask(self):
         self.assertBreadcrumbUrls(
-            [self.product_url, self.product_bugs_url, self.product_bugtask_url],
+            [self.product_url, self.product_bugs_url,
+            self.product_bugtask_url],
             self.product_bugtask)
 
     def test_package_bugtask(self):

=== modified file 'lib/lp/translations/stories/standalone/xx-person-activity.txt'
--- lib/lp/translations/stories/standalone/xx-person-activity.txt	2010-12-10 12:14:52 +0000
+++ lib/lp/translations/stories/standalone/xx-person-activity.txt	2012-02-23 16:31:19 +0000
@@ -45,7 +45,7 @@
     ...     'Spanish (es) translation of alsa-utils in alsa-utils trunk')
     >>> anon_browser.getLink(alsa_utils_link).click()
     >>> print anon_browser.title
-    Translations by ... in...Spanish (es) translation...
+    Translations by ...Spanish (es)...
 
 
 URL-escaped user names