Merge lp:~thumper/launchpad/branch-breadcrumbs into lp:launchpad

[Tim Penhey]

[Tim Penhey (thumper)]

Adds breadcrumbs for anything that IHasBranches, and also breadcrumbs for IBranch and IBranchMergeProposal.

Fixed the Hierarchy so it is more flexible for other objects that use it.

Many story fixes for things that look at the titles.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/canonical/launchpad/webapp/breadcrumb.py'
--- lib/canonical/launchpad/webapp/breadcrumb.py	2009-09-03 15:04:13 +0000
+++ lib/canonical/launchpad/webapp/breadcrumb.py	2009-09-17 02:17:15 +0000
@@ -8,6 +8,7 @@
 __all__ = [
     'Breadcrumb',
     'DisplaynameBreadcrumb',
+    'NameBreadcrumb',
     'TitleBreadcrumb',
     ]
 
@@ -71,6 +72,14 @@
             self.__class__.__name__, self.url, self.text, icon_repr)
 
 
+class NameBreadcrumb(Breadcrumb):
+    """An `IBreadcrumb` that uses the context's name as its text."""
+
+    @property
+    def text(self):
+        return self.context.name
+
+
 class DisplaynameBreadcrumb(Breadcrumb):
     """An `IBreadcrumb` that uses the context's displayname as its text."""
 

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2009-09-16 04:28:40 +0000
+++ lib/lp/code/browser/branch.py	2009-09-17 03:25:05 +0000
@@ -86,7 +86,6 @@
     CodeImportJobState, ICodeImportJobWorkflow)
 from lp.code.interfaces.codereviewcomment import ICodeReviewComment
 from lp.code.interfaces.branchnamespace import IBranchNamespacePolicy
-from lp.code.interfaces.branchtarget import IHasBranchTarget
 from lp.code.interfaces.codereviewvote import ICodeReviewVoteReference
 from lp.registry.interfaces.person import IPerson, IPersonSet
 from lp.registry.interfaces.productseries import IProductSeries
@@ -123,7 +122,21 @@
     @property
     def objects(self):
         """See `Hierarchy`."""
-        return IHasBranchTarget(self.context).target.components
+        traversed = list(self.request.traversed_objects)
+        # Pass back the root object.
+        yield traversed.pop(0)
+        # Now pop until we find the branch.
+        branch = traversed.pop(0)
+        while not IBranch.providedBy(branch):
+            branch = traversed.pop(0)
+        # Now pass back the branch components.
+        for component in branch.target.components:
+            yield component
+        # Now the branch.
+        yield branch
+        # Now whatever is left.
+        for obj in traversed:
+            yield obj
 
 
 class BranchNavigation(Navigation):

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2009-09-09 05:07:24 +0000
+++ lib/lp/code/browser/branchlisting.py	2009-09-17 01:48:50 +0000
@@ -12,6 +12,7 @@
     'DistributionSourcePackageBranchesView',
     'DistroSeriesBranchListingView',
     'GroupedDistributionSourcePackageBranchesView',
+    'HasBranchesBreadcrumb',
     'PersonBranchesMenu',
     'PersonCodeSummaryView',
     'PersonOwnedBranchesView',
@@ -63,6 +64,7 @@
     check_permission, precache_permission_for_objects)
 from canonical.launchpad.webapp.badge import Badge, HasBadgeBase
 from canonical.launchpad.webapp.batching import TableBatchNavigator
+from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.publisher import LaunchpadView
 from canonical.widgets import LaunchpadDropdownWidget
 
@@ -86,10 +88,10 @@
 from lp.registry.interfaces.distroseries import DistroSeriesStatus
 from lp.registry.interfaces.person import IPerson, IPersonSet
 from lp.registry.interfaces.product import IProduct
-from lp.registry.interfaces.productseries import IProductSeriesSet
 from lp.registry.interfaces.sourcepackage import ISourcePackageFactory
 from lp.registry.model.sourcepackage import SourcePackage
 
+
 def get_plural_text(count, singular, plural):
     """Return 'singular' if 'count' is 1, 'plural' otherwise."""
     if count == 1:
@@ -98,6 +100,14 @@
         return plural
 
 
+class HasBranchesBreadcrumb(Breadcrumb):
+    rootsite = 'code'
+
+    @property
+    def text(self):
+        return 'Branches for %s' % self.context.displayname
+
+
 class BranchBadges(HasBadgeBase):
     badges = "private", "bug", "blueprint", "warning", "mergeproposal"
 
@@ -494,7 +504,7 @@
     # shown in the branch listings.
     show_series_links = False
     extra_columns = []
-    heading_template = 'Bazaar branches for %(displayname)s'
+    label_template = 'Bazaar branches for %(displayname)s'
     # no_sort_by is a sequence of items from the BranchListingSort
     # enumeration to not offer in the sort_by widget.
     no_sort_by = ()
@@ -512,15 +522,14 @@
         )
 
     @property
-    def heading(self):
-        return self.heading_template % {
+    def label(self):
+        return self.label_template % {
             'displayname': self.context.displayname,
             'title': getattr(self.context, 'title', 'no-title')}
 
-    @property
-    def page_title(self):
-        # The page title uses the view heading.
-        return self.heading
+    # Provide a default page_title for distros and other things without
+    # breadcrumbs..
+    page_title = label
 
     @property
     def initial_values(self):
@@ -948,7 +957,8 @@
 class PersonRegisteredBranchesView(PersonBaseBranchListingView):
     """View for branch listing for a person's registered branches."""
 
-    heading_template = 'Bazaar branches registered by %(displayname)s'
+    page_title = _('Registered')
+    label_template = 'Bazaar branches registered by %(displayname)s'
     no_sort_by = (BranchListingSort.DEFAULT, BranchListingSort.OWNER)
 
     def _getCollection(self):
@@ -958,7 +968,8 @@
 class PersonOwnedBranchesView(PersonBaseBranchListingView):
     """View for branch listing for a person's owned branches."""
 
-    heading_template = 'Bazaar branches owned by %(displayname)s'
+    page_title = _('Owned')
+    label_template = 'Bazaar branches owned by %(displayname)s'
     no_sort_by = (BranchListingSort.DEFAULT, BranchListingSort.OWNER)
 
     def _getCollection(self):
@@ -968,7 +979,8 @@
 class PersonSubscribedBranchesView(PersonBaseBranchListingView):
     """View for branch listing for a person's subscribed branches."""
 
-    heading_template = 'Bazaar branches subscribed to by %(displayname)s'
+    page_title = _('Subscribed')
+    label_template = 'Bazaar branches subscribed to by %(displayname)s'
     no_sort_by = (BranchListingSort.DEFAULT,)
 
     def _getCollection(self):
@@ -1092,7 +1104,7 @@
 
     show_series_links = True
     no_sort_by = (BranchListingSort.PRODUCT,)
-    heading_template = 'Bazaar branches of %(displayname)s'
+    label_template = 'Bazaar branches of %(displayname)s'
 
     def _getCollection(self):
         return getUtility(IAllBranches).inProduct(self.context)
@@ -1306,7 +1318,7 @@
 
     no_sort_by = (BranchListingSort.DEFAULT,)
     extra_columns = ('author', 'product')
-    heading_template = 'Bazaar branches of %(displayname)s'
+    label_template = 'Bazaar branches of %(displayname)s'
 
     def _getCollection(self):
         return getUtility(IAllBranches).inProject(self.context)
@@ -1345,7 +1357,7 @@
 class DistributionSourcePackageBranchesView(BaseSourcePackageBranchesView):
     """A general listing of all branches in the distro source package."""
 
-    heading_template = 'Bazaar branches for %(title)s'
+    label_template = 'Bazaar branches for %(title)s'
 
     def _getCollection(self):
         return getUtility(IAllBranches).inDistributionSourcePackage(
@@ -1371,10 +1383,10 @@
     """A view that groups branches into distro series."""
 
     @property
-    def heading(self):
+    def label(self):
         return 'Bazaar branches for %s' % self.context.title
 
-    page_title = heading
+    page_title = label
 
     def __init__(self, context, request):
         LaunchpadView.__init__(self, context, request)
@@ -1529,7 +1541,7 @@
 
 class SourcePackageBranchesView(BranchListingView):
 
-    heading_template = 'Bazaar branches of %(displayname)s'
+    label_template = 'Bazaar branches of %(displayname)s'
 
     # XXX: JonathanLange 2009-03-03 spec=package-branches: This page has no
     # menu yet -- do we need one?
@@ -1594,8 +1606,8 @@
         return self.context.person
 
     @property
-    def heading(self):
-        return self.heading_template % {
+    def label(self):
+        return self.label_template % {
             'person': self.context.person.displayname,
             'product': self.context.product.displayname}
 
@@ -1622,7 +1634,7 @@
                   BranchListingSort.OWNER,
                   BranchListingSort.PRODUCT)
 
-    heading_template = 'Bazaar Branches of %(product)s owned by %(person)s'
+    label_template = 'Bazaar Branches of %(product)s owned by %(person)s'
 
     def _getCollection(self):
         return getUtility(IAllBranches).ownedBy(
@@ -1632,7 +1644,7 @@
 class PersonProductRegisteredBranchesView(PersonProductBaseBranchesView):
     """Branch listing for a person's registered branches of a product."""
 
-    heading_template = (
+    label_template = (
         'Bazaar Branches of %(product)s registered by %(person)s')
 
     def _getCollection(self):
@@ -1643,7 +1655,7 @@
 class PersonProductSubscribedBranchesView(PersonProductBaseBranchesView):
     """Branch listing for a person's subscribed branches of a product."""
 
-    heading_template = (
+    label_template = (
         'Bazaar Branches of %(product)s subscribed to by %(person)s')
 
     def _getCollection(self):

=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
--- lib/lp/code/browser/branchmergeproposal.py	2009-09-08 15:52:12 +0000
+++ lib/lp/code/browser/branchmergeproposal.py	2009-09-17 02:17:15 +0000
@@ -8,6 +8,7 @@
 __metaclass__ = type
 __all__ = [
     'BranchMergeCandidateView',
+    'BranchMergeProposalActionNavigationMenu',
     'BranchMergeProposalAddVoteView',
     'BranchMergeProposalChangeStatusView',
     'BranchMergeProposalCommitMessageEditView',
@@ -44,10 +45,19 @@
 from canonical.config import config
 
 from canonical.launchpad import _
+from canonical.launchpad.fields import Summary, Whiteboard
+from canonical.launchpad.interfaces.message import IMessageSet
+from canonical.launchpad.webapp import (
+    canonical_url, ContextMenu, custom_widget, Link, enabled_with_permission,
+    LaunchpadEditFormView, LaunchpadFormView, LaunchpadView, action,
+    stepthrough, stepto, Navigation)
+from canonical.launchpad.webapp.authorization import check_permission
+from canonical.launchpad.webapp.breadcrumb import Breadcrumb
+from canonical.launchpad.webapp.interfaces import IPrimaryContext
+from canonical.launchpad.webapp.menu import NavigationMenu
+
 from lp.code.adapters.branch import BranchMergeProposalDelta
 from lp.code.browser.codereviewcomment import CodeReviewDisplayComment
-from canonical.launchpad.fields import Summary, Whiteboard
-from canonical.launchpad.interfaces.message import IMessageSet
 from lp.code.enums import (
     BranchMergeProposalStatus, BranchType, CodeReviewNotificationLevel,
     CodeReviewVote)
@@ -58,12 +68,6 @@
     ICodeReviewVoteReference)
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.comments.interfaces.conversation import IConversation
-from canonical.launchpad.webapp import (
-    canonical_url, ContextMenu, custom_widget, Link, enabled_with_permission,
-    LaunchpadEditFormView, LaunchpadFormView, LaunchpadView, action,
-    stepthrough, stepto, Navigation)
-from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.interfaces import IPrimaryContext
 
 from lazr.delegates import delegates
 from lazr.restful.interface import copy_field
@@ -79,6 +83,14 @@
             branch_merge_proposal.source_branch).context
 
 
+class BranchMergeProposalBreadcrumb(Breadcrumb):
+    """An `IBreadcrumb` for a merge proposal."""
+
+    @property
+    def text(self):
+        return 'Merge into %s' % self.context.target_branch.name
+
+
 def notify(func):
     """Decorate a view method to send a notification."""
     def decorator(view, *args, **kwargs):
@@ -119,23 +131,8 @@
         return friendly_texts[self.context.queue_status]
 
 
-class BranchMergeProposalContextMenu(ContextMenu):
-    """Context menu for branches."""
-
-    usedfor = IBranchMergeProposal
-    links = [
-        'edit',
-        'edit_commit_message',
-        'delete',
-        'request_review',
-        'add_comment',
-        'merge',
-        'enqueue',
-        'dequeue',
-        'resubmit',
-        'update_merge_revno',
-        'edit_status',
-        ]
+class BranchMergeProposalMenuMixin:
+    """Mixin class for merge proposal menus."""
 
     @enabled_with_permission('launchpad.AnyPerson')
     def add_comment(self):
@@ -166,18 +163,19 @@
     @enabled_with_permission('launchpad.Edit')
     def delete(self):
         text = 'Delete proposal to merge'
-        return Link('+delete', text, icon='remove')
+        return Link('+delete', text, icon='trash-icon')
 
     def _enabledForStatus(self, next_state):
         """True if the next_state is a valid transition for the current user.
 
         Return False if the current state is next_state.
         """
-        status = self.context.queue_status
+        bmp = self.branch_merge_proposal
+        status = bmp.queue_status
         if status == next_state:
             return False
         else:
-            return self.context.isValidTransition(next_state, self.user)
+            return bmp.isValidTransition(next_state, self.user)
 
     @enabled_with_permission('launchpad.Edit')
     def request_review(self):
@@ -225,6 +223,48 @@
         return Link('+resubmit', text, enabled=enabled, icon='edit')
 
 
+class BranchMergeProposalContextMenu(ContextMenu,
+                                     BranchMergeProposalMenuMixin):
+    """Context menu for merge proposals."""
+
+    usedfor = IBranchMergeProposal
+    links = [
+        'edit',
+        'edit_commit_message',
+        'delete',
+        'request_review',
+        'add_comment',
+        'merge',
+        'enqueue',
+        'dequeue',
+        'resubmit',
+        'update_merge_revno',
+        'edit_status',
+        ]
+
+    @property
+    def branch_merge_proposal(self):
+        return self.context
+
+
+class IBranchMergeProposalActionMenu(Interface):
+    """A marker interface for the global action navigation menu."""
+
+
+class BranchMergeProposalActionNavigationMenu(NavigationMenu,
+                                              BranchMergeProposalMenuMixin):
+    """A sub-menu for acting upon a Product."""
+
+    usedfor = IBranchMergeProposalActionMenu
+    facet = 'branches'
+    links = ('resubmit', 'delete')
+
+    @property
+    def branch_merge_proposal(self):
+        # This context is the view, the view's context is the bmp.
+        return self.context.context
+
+
 class UnmergedRevisionsMixin:
     """Provides the methods needed to show unmerged revisions."""
 
@@ -339,6 +379,7 @@
     def __init__(self, comments):
         self.comments = comments
 
+
 class ClaimButton(Interface):
     """A simple interface to populate the form to enqueue a proposal."""
 
@@ -349,7 +390,9 @@
                               BranchMergeProposalRevisionIdMixin):
     """A basic view used for the index page."""
 
-    label = "Proposal to merge branches"
+    implements(IBranchMergeProposalActionMenu)
+
+    label = "Proposal to merge branch"
     __used_for__ = IBranchMergeProposal
     schema = ClaimButton
 

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2009-09-16 05:18:47 +0000
+++ lib/lp/code/browser/configure.zcml	2009-09-17 03:25:05 +0000
@@ -315,7 +315,8 @@
         template="../templates/branchmergeproposal-macros.pt"/>
     <browser:menus
         classes="
-            BranchMergeProposalContextMenu"
+            BranchMergeProposalContextMenu
+            BranchMergeProposalActionNavigationMenu"
         module="lp.code.browser.branchmergeproposal"/>
     <browser:page
         for="lp.code.interfaces.branchsubscription.IBranchSubscription"
@@ -887,4 +888,23 @@
         name="+activereviews"
         template="../templates/active-reviews.pt"/>
 
+    <adapter
+        name="code"
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.hasbranches.IHasBranches"
+        factory="lp.code.browser.branchlisting.HasBranchesBreadcrumb"
+        permission="zope.Public"/>
+
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.branch.IBranch"
+        factory="canonical.launchpad.webapp.breadcrumb.NameBreadcrumb"
+        permission="zope.Public"/>
+
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        factory="lp.code.browser.branchmergeproposal.BranchMergeProposalBreadcrumb"
+        permission="zope.Public"/>
+
 </configure>

=== modified file 'lib/lp/code/stories/branches/package-branch-merge-proposals.txt'
--- lib/lp/code/stories/branches/package-branch-merge-proposals.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/code/stories/branches/package-branch-merge-proposals.txt	2009-09-17 03:12:08 +0000
@@ -20,6 +20,3 @@
     >>> browser.getControl(
     ...     name="field.target_branch.target_branch").value = b2_name
     >>> browser.getControl('Propose Merge').click()
-
-    >>> browser.title
-    '\xe2\x80\x9cgeneric-string1\xe2\x80\x9d package : 13.0 : generic-string3'

=== modified file 'lib/lp/code/stories/branches/package-branch-merges-with-product-branches.txt'
--- lib/lp/code/stories/branches/package-branch-merges-with-product-branches.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/code/stories/branches/package-branch-merges-with-product-branches.txt	2009-09-17 03:12:08 +0000
@@ -47,6 +47,3 @@
     >>> browser.getControl(
     ...     name="field.target_branch.target_branch").value = b2_name
     >>> browser.getControl('Propose Merge').click()
-
-    >>> browser.title
-    '\xe2\x80\x9cgeneric-string1\xe2\x80\x9d package : 13.0 : generic-string3'

=== modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt'
--- lib/lp/code/stories/branches/xx-branch-deletion.txt	2009-09-04 07:29:56 +0000
+++ lib/lp/code/stories/branches/xx-branch-deletion.txt	2009-09-17 03:12:08 +0000
@@ -10,8 +10,8 @@
     >>> browser.getControl('Branch URL').value = 'http://foo.bar.com/oops'
     >>> browser.getControl('Name').value = 'to-delete'
     >>> browser.getControl('Register Branch').click()
-    >>> browser.title
-    '...~name12/firefox/to-delete... branch in Launchpad'
+    >>> print browser.title
+    to-delete : Branches for Mozilla Firefox : Mozilla Firefox
 
 The newly created branch has an action 'Delete branch'.
 

=== modified file 'lib/lp/code/stories/branches/xx-branch-index.txt'
--- lib/lp/code/stories/branches/xx-branch-index.txt	2009-09-02 18:03:30 +0000
+++ lib/lp/code/stories/branches/xx-branch-index.txt	2009-09-17 03:12:08 +0000
@@ -408,7 +408,7 @@
     >>> browser.open(
     ...     'http://code.launchpad.dev/~name12/gnome-terminal/scanned')
     >>> print_location(browser.contents)
-    Hierarchy: None displayed
+    Hierarchy: GNOME Terminal > Branches for GNOME Terminal > scanned
     Tabs:
     * Overview - http://launchpad.dev/gnome-terminal
     * Code (selected) - http://code.launchpad.dev/gnome-terminal
@@ -420,7 +420,7 @@
 
     >>> browser.open('http://code.launchpad.dev/~name12/+junk/junk.dev')
     >>> print_location(browser.contents)
-    Hierarchy: None displayed
+    Hierarchy: Sample Person > Branches for Sample Person > junk.dev
     Tabs:
     * Overview - http://launchpad.dev/~name12
     * Code (selected) - http://code.launchpad.dev/~name12

=== modified file 'lib/lp/code/stories/branches/xx-branch-merge-proposals.txt'
--- lib/lp/code/stories/branches/xx-branch-merge-proposals.txt	2009-09-16 23:02:43 +0000
+++ lib/lp/code/stories/branches/xx-branch-merge-proposals.txt	2009-09-17 03:44:41 +0000
@@ -324,9 +324,6 @@
 
 This takes the user to the resubmission page.
 
-    >>> print eric_browser.title
-    +resubmit : Fooix
-
     >>> eric_browser.getControl('Resubmit').click()
 
 The new merge proposal is created as needs review, and there is

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt	2009-09-09 06:37:22 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt	2009-09-17 03:12:08 +0000
@@ -69,7 +69,7 @@
 
     >>> browser.getLink('active reviews or unmerged proposals').click()
     >>> print browser.title
-    +activereviews : Fooix
+    +activereviews : Branches for Fooix : Fooix
 
 The proposals are listed in a table that shows the source and target branches,
 who requested the merge, the date the review was requested, and the vote

=== modified file 'lib/lp/code/stories/branches/xx-bug-branch-links.txt'
--- lib/lp/code/stories/branches/xx-bug-branch-links.txt	2009-09-09 06:37:22 +0000
+++ lib/lp/code/stories/branches/xx-bug-branch-links.txt	2009-09-17 03:12:08 +0000
@@ -45,7 +45,7 @@
 
     >>> browser.getLink('Link to a bug report').click()
     >>> print browser.title
-    +linkbug : GNOME Terminal
+    +linkbug : klingon : Branches for GNOME Terminal : GNOME Terminal
 
 When linking from a branch to a bug, the bug widget is used.  This
 requires the user to enter a bug number.

=== modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt'
--- lib/lp/code/stories/branches/xx-creating-branches.txt	2009-09-02 18:03:30 +0000
+++ lib/lp/code/stories/branches/xx-creating-branches.txt	2009-09-17 03:12:08 +0000
@@ -144,6 +144,7 @@
     >>> print extract_text(find_tag_by_id(user_browser.contents, 'privacy'))
     This branch is public
     >>> print extract_text(find_main_content(user_browser.contents))
+    Gnome Applets ...
     lp://dev/~no-priv/applets/main ...
     ...http://example.com/applets/main...
 

=== modified file 'lib/lp/code/stories/branches/xx-person-branches.txt'
--- lib/lp/code/stories/branches/xx-person-branches.txt	2009-09-16 21:22:12 +0000
+++ lib/lp/code/stories/branches/xx-person-branches.txt	2009-09-17 03:12:08 +0000
@@ -9,7 +9,7 @@
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open('http://code.launchpad.dev/~name12')
     >>> print browser.title
-    Bazaar branches owned by Sample Person
+    Branches for Sample Person : Sample Person
 
 The heading in the main content is the same as the page title text.
 
@@ -39,8 +39,6 @@
 A person's owned branches are shown on their code application overview page.
 
     >>> browser.open('http://code.launchpad.dev/~name12')
-    >>> print browser.title
-    Bazaar branches owned by Sample Person
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)
@@ -56,7 +54,7 @@
     >>> browser.open('http://code.launchpad.dev/~name12')
     >>> browser.getLink('registered').click()
     >>> print browser.title
-    +registeredbranches : Sample Person
+    +registeredbranches : Branches for Sample Person : Sample Person
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)
@@ -73,7 +71,7 @@
     >>> browser.open('http://code.launchpad.dev/~name12')
     >>> browser.getLink('subscribed').click()
     >>> print browser.title
-    +subscribedbranches : Sample Person
+    +subscribedbranches : Branches for Sample Person : Sample Person
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)

=== modified file 'lib/lp/code/stories/branches/xx-product-branches.txt'
--- lib/lp/code/stories/branches/xx-product-branches.txt	2009-09-01 22:48:24 +0000
+++ lib/lp/code/stories/branches/xx-product-branches.txt	2009-09-17 03:12:08 +0000
@@ -29,7 +29,7 @@
 
     >>> browser.open('http://code.launchpad.dev/applets')
     >>> print browser.title
-    Bazaar branches of Gnome Applets
+    Branches for Gnome Applets : Gnome Applets
 
 If there are not any branches, a helpful message is shown.
 

=== modified file 'lib/lp/code/stories/branches/xx-project-branches.txt'
--- lib/lp/code/stories/branches/xx-project-branches.txt	2009-08-17 12:00:46 +0000
+++ lib/lp/code/stories/branches/xx-project-branches.txt	2009-09-17 03:12:08 +0000
@@ -10,7 +10,7 @@
     >>> browser.open('http://launchpad.dev/mozilla')
     >>> browser.getLink('Code').click()
     >>> print browser.title
-    Bazaar branches of the Mozilla Project
+    Branches for the Mozilla Project : the Mozilla Project
 
 
 == Default page for code site ==
@@ -35,7 +35,7 @@
 
     >>> browser.open('http://code.launchpad.dev/aaa')
     >>> print browser.title
-    Bazaar branches of the Test Project
+    Branches for the Test Project : the Test Project
     >>> message = find_tag_by_id(browser.contents, 'no-branch-message')
     >>> print extract_text(message)
     There are no branches registered for the Test Project in Launchpad...

=== modified file 'lib/lp/code/stories/branches/xx-register-a-branch.txt'
--- lib/lp/code/stories/branches/xx-register-a-branch.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/code/stories/branches/xx-register-a-branch.txt	2009-09-17 03:12:08 +0000
@@ -7,7 +7,7 @@
     >>> browser.open('http://code.launchpad.dev/')
     >>> browser.getLink('Register a branch').click()
     >>> print browser.title
-    +addbranch : Sample Person
+    +addbranch : Branches for Sample Person : Sample Person
 
 Clicking the link as an anonymous user should take you to a login page. Once
 you've logged in, you should be redirected to the registration page.
@@ -22,4 +22,4 @@
     >>> anon_browser.getControl('Password').value = 'test'
     >>> anon_browser.getControl('Log In').click()
     >>> print anon_browser.title
-    +addbranch : Sample Person
+    +addbranch : Branches for Sample Person : Sample Person

=== modified file 'lib/lp/code/stories/branches/xx-source-package-branches-empty.txt'
--- lib/lp/code/stories/branches/xx-source-package-branches-empty.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/code/stories/branches/xx-source-package-branches-empty.txt	2009-09-17 03:44:41 +0000
@@ -22,8 +22,6 @@
 This takes us to the branch listing for that source package
 
     >>> browser.open(source_package_url)
-    >>> browser.title
-    '\xe2\x80\x9cfoo\xe2\x80\x9d package : 9.0 : distro'
 
 Since there are no branches, there is no branch listing table:
 
@@ -36,8 +34,6 @@
 Listings of distribution source packages also just show a message.
 
     >>> browser.open("http://code.launchpad.dev/distro/+source/foo")
-    >>> browser.title
-    '\xe2\x80\x9cfoo\xe2\x80\x9d package : distro'
 
 Since there are no branches, there is no branch listing table:
 

=== modified file 'lib/lp/code/stories/branches/xx-source-package-branches-listing.txt'
--- lib/lp/code/stories/branches/xx-source-package-branches-listing.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/code/stories/branches/xx-source-package-branches-listing.txt	2009-09-17 03:44:41 +0000
@@ -27,8 +27,6 @@
 This takes us to the branch listing for that source package
 
     >>> browser.open(source_package_url)
-    >>> browser.title
-    '\xe2\x80\x9cfoo\xe2\x80\x9d package : 9.0 : distro'
 
 Both of the branches we made appear in the listing.
 

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2009-09-04 15:51:56 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2009-09-17 02:17:15 +0000
@@ -23,26 +23,15 @@
 </metal:block>
 
 
-<metal:side fill-slot="side">
-  <div class="portlet" tal:define="link context/menu:context/resubmit"
-       tal:condition="link/enabled"
-       tal:content="structure link/render">
-       Resubmit proposal
-  </div>
+<metal:side fill-slot="side"
+            tal:define="context_menu context/menu:context">
+
+  <tal:menu replace="structure view/@@+global-actions" />
   <div tal:replace="structure context/@@+pagelet-subscribers" />
 </metal:side>
 
 
-<div metal:fill-slot="main"
-     tal:define="context_menu context/menu:context">
-
-  <h1>Proposal to merge branch
-    <a tal:define="link context_menu/delete"
-       tal:condition="link/enabled"
-       tal:attributes="href link/url"
-       ><img src="/@@/trash-icon" tal:attributes="title link/text; alt link/text" />
-    </a>
-</h1>
+<div metal:fill-slot="main">
 
   <div id="nonportlets">
 

=== modified file 'lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt'
--- lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt	2009-08-13 04:08:38 +0000
+++ lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt	2009-09-17 02:17:15 +0000
@@ -8,9 +8,6 @@
 
 <body>
 
-  <h1 metal:fill-slot="heading"
-      tal:content="view/heading">Bazaar branches</h1>
-
 <div metal:fill-slot="main">
 
   <tal:no-branches condition="not: view/branch_count">

=== modified file 'lib/lp/code/templates/generic-branch-listing.pt'
--- lib/lp/code/templates/generic-branch-listing.pt	2009-08-13 04:08:38 +0000
+++ lib/lp/code/templates/generic-branch-listing.pt	2009-09-17 00:27:40 +0000
@@ -8,9 +8,6 @@
 
 <body>
 
-  <h1 metal:fill-slot="heading"
-      tal:content="view/heading">Bazaar branches</h1>
-
   <div metal:fill-slot="main">
 
     <tal:no-branches condition="not: view/branch_count">

=== modified file 'lib/lp/code/templates/person-branches.pt'
--- lib/lp/code/templates/person-branches.pt	2009-08-27 05:42:10 +0000
+++ lib/lp/code/templates/person-branches.pt	2009-09-17 00:27:40 +0000
@@ -9,9 +9,6 @@
 <body>
 
 
-<h1 metal:fill-slot="heading"
-    tal:content="view/heading">Bazaar branches</h1>
-
 <div metal:fill-slot="main"
      tal:define="branches view/branches">
 

=== modified file 'lib/lp/code/templates/personproduct-branches.pt'
--- lib/lp/code/templates/personproduct-branches.pt	2009-08-27 05:42:10 +0000
+++ lib/lp/code/templates/personproduct-branches.pt	2009-09-17 00:27:40 +0000
@@ -8,9 +8,6 @@
 
 <body>
 
-<h1 metal:fill-slot="heading"
-    tal:content="view/heading">Bazaar branches</h1>
-
 <div metal:fill-slot="main"
      tal:define="branches view/branches">
 

=== modified file 'lib/lp/code/templates/product-branches.pt'
--- lib/lp/code/templates/product-branches.pt	2009-08-13 03:27:47 +0000
+++ lib/lp/code/templates/product-branches.pt	2009-09-17 00:27:40 +0000
@@ -9,9 +9,6 @@
 
 <body>
 
-<h1 metal:fill-slot="heading"
-    tal:content="view/heading">Bazaar branches</h1>
-
 <div metal:fill-slot="main">
 
   <div style="float:right" id="floating-links"

=== modified file 'lib/lp/code/templates/project-branches.pt'
--- lib/lp/code/templates/project-branches.pt	2009-08-16 02:37:06 +0000
+++ lib/lp/code/templates/project-branches.pt	2009-09-17 00:27:40 +0000
@@ -8,9 +8,6 @@
 
   <body>
 
-    <h1 metal:fill-slot="heading"
-        tal:content="view/heading">Bazaar branches</h1>
-
     <div metal:fill-slot="main"
          tal:define="branches view/branches">
 

=== modified file 'lib/lp/code/templates/sourcepackage-branches.pt'
--- lib/lp/code/templates/sourcepackage-branches.pt	2009-08-13 04:08:38 +0000
+++ lib/lp/code/templates/sourcepackage-branches.pt	2009-09-17 00:27:40 +0000
@@ -8,9 +8,6 @@
 
 <body>
 
-  <h1 metal:fill-slot="heading"
-      tal:content="view/heading">Bazaar branches</h1>
-
 <div metal:fill-slot="main">
 
   <tal:branchlisting