Merge lp:~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155 into lp:launchpad

[Gavin Panella]

[Gavin Panella (allenap)]

This branch begins the conversion of all the templates relating to
external bug trackers.

Test: ./bin/test -vvt bug-?tracker

Lint free.

lib/lp/bugs/browser/bugtracker.py

  Removed BugTrackerContextMenu; unused.

  Added a cancel link to the +newbugtracker form view.

  New breadcrumb for the bug trackers index page (the one that shows a
  list of bug trackers). Previously this has only ever been available
  by URL manipulation or going back to the bugs front page.

  New navigation menu for bug tracker overview pages. Only contains an
  edit link for now (and is basically a copy of the old context menu).

lib/lp/bugs/browser/configure.zcml

  Set up menus and force the rootsite of bug trackers and the bug
  tracker set to "bugs".

lib/lp/bugs/browser/tests/test_breadcrumbs.py

  Tests for the new IBugTrackerSet breadcrumb and the existing
  IBugTracker breadcrumb.

lib/lp/bugs/configure.zcml

  Register the new breadcrumb.

lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt
lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt

  Fix up for the new breadcrumb and rootsite settings.

lib/lp/bugs/templates/bugtracker-index.pt

  Pretty simple conversion to the 3.0 layout. Put the portlets into
  the new "side" slot and render the new navigation menu. The diff is
  big because I reindented and tidied things up.

  Learnt about the "bogus" slot hack to make macros work. Ugly, but
  better than copy and pasting.

lib/lp/bugs/templates/bugtrackers-add.pt

  Trivial template conversion.

lib/lp/bugs/templates/bugtrackers-index.pt

  Pretty simple conversion. Used the "bogus" slot macro hack because
  the tables were nearly identical.

[Gavin Panella (allenap)]

To have a play, try:

 * Go to the bug trackers page (for IBugTrackerSet) at
   <https://bugs.launchpad.dev/bugs/bugtrackers>,

 * Clicking on a bug tracker to see its overview page,

 * Admire the "Change details" link on the right hand side; this is
   the new navigation menu,

 * Use the "Bug trackers" breadcrumb to go back,

 * Click "Register a new bug tracker" to go to the +newbugtracker
   form,

 * Use the "Cancel" link to go back to the first page you were at.

[Brad Crittenden (bac)]

Hi Gavin,

* Have you scheduled a UI review for this branch yet?
* Why to (+) Register links on https://bugs.launchpad.dev/bugs/bugtrackers ?
* If there are no inactive bug trackers, I think a message would be
  better than showing an empty table.
* Hey, that's cool. I didn't know our <H1> colors were tied to the
  facet. Neat. Well, they are more or less. I wonder why we don't
  peg them to the exact color in the Launchpad logo? (Yeah, I know
  that has nothing to do with your branch.)
* I noticed that removing a bug watch and then reloading the page does
  not remove the bug watch from the list at:
  https://bugs.launchpad.dev/bugs/bugtrackers/debbugs
* At https://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugzilla the
  informational sprites for Related Projects are messed up. (Verfied
  in Safari 4 and FF 3.0 in Jaunty.) If it is not your issue could
  you file a bug?

In addition to those broad questions I've made some suggestions below. Overall a nice branch. Thanks for knocking out another...

I'm marking the code review 'Needs Fixing' just b/c I want to see the diff but the changes should be pretty straightforward.

--Brad

> === modified file 'lib/lp/bugs/browser/bugtracker.py'
> --- lib/lp/bugs/browser/bugtracker.py 2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/browser/bugtracker.py 2009-08-25 15:36:35 +0000
> @@ -379,8 +370,21 @@
> return RemoteBug(self.context, remotebug, bugs)
>
>
> +class BugTrackerSetBreadcrumbBuilder(BreadcrumbBuilder):
> + """Builds a breadcrumb for the `IBugTrackerSet`."""

This diff is different from the branch. Was BreadcrumbBuilder vs
Breadcrumb the reason for the conflict?

> + rootsite = None
> +
> + @property
> + def text(self):
> + return u"Bug trackers"
> +
> +
> class BugTrackerBreadcrumbBuilder(BreadcrumbBuilder):
> """Builds a breadcrumb for an `IBugTracker`."""
> +
> + rootsite = None
> +
> @property
> def text(self):
> return self.context.title
> @@ -401,3 +405,13 @@
> return 'Remote Bug #%s in %s' % (self.remotebug,
> self.bugtracker.title)
>
> +
> +class BugTrackerNavigationMenu(NavigationMenu):
> +
> + usedfor = BugTrackerView
> + facet = 'bugs'
> + links = ['edit']
> +
> + def edit(self):
> + text = 'Change details'
> + return Link('+edit', text, icon='edit')

> === modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
> --- lib/lp/bugs/browser/tests/test_breadcrumbs.py 2009-08-20 20:18:44 +0000
> +++ lib/lp/bugs/browser/tests/test_breadcrumbs.py 2009-08-25 15:29:48 +0000
> @@ -56,5 +59,42 @@
> self._getBreadcrumbsTexts(url, self.traversed_objects))
>
>
> +class TestBugTrackerBreadcrumbBuilders(BaseBreadcrumbTestCase):
> + def setUp(self):
> + super(TestBugTrackerBreadcrumbBuilders, self).setUp()
> + self.bug_tracker_set = getUtility(IBugTrackerSet)
> + self.bug_tracker_set_url = canonical_url(
> + self.bug_tracker_set, rootsite='bugs')
> + self.bug_tracker = self.factory.makeBugTracker()
> + self.bug_tracker_url = canonical_url(
> + self.bug_tracker, rootsite='...

review: Approve (code)

[Brad Crittenden (bac)]

review: Needs Fixing (code)

[Gavin Panella (allenap)]

Thanks for the review Brad! (Also, thank you for testfixing my branch
late last week after buildbot blamelisted me.)

Sorry for taking so long to reply; I had a double whammy of OCR then
CHR.

On Tue, 25 Aug 2009 18:25:22 -0000
Brad Crittenden <email address hidden> wrote:

> Review: Approve code
> Hi Gavin,
>
> * Have you scheduled a UI review for this branch yet?

No, not yet, I'm going to seek one out right after this.

> * Why to (+) Register links on https://bugs.launchpad.dev/bugs/bugtrackers ?

That's just what was there before, so I left it alone because it'll
probably come up in the UI review. In production the table is very
long (and it isn't batch navigated) so it makes more sense there I
suppose.

> * If there are no inactive bug trackers, I think a message would be
> better than showing an empty table.

You're right! That shouldn't be there! Thanks for spotting that.

> * Hey, that's cool. I didn't know our <H1> colors were tied to the
> facet. Neat. Well, they are more or less. I wonder why we don't
> peg them to the exact color in the Launchpad logo? (Yeah, I know
> that has nothing to do with your branch.)

I would never have noticed the colour difference :) You either have
good eyes, or a strong eyedropper addiction ;)

> * I noticed that removing a bug watch and then reloading the page does
> not remove the bug watch from the list at:
> https://bugs.launchpad.dev/bugs/bugtrackers/debbugs

Did you both set "None, the status of the bug is updated manually." in
the task expander and then delete the bug watch via the "Remote bug
watches" portlet?

BTW, there seems to be a bug deleting the debbugs watch on bug #15
(foreign key violation), so try the debbugs watch on bug #3 instead.

> * At https://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugzilla the
> informational sprites for Related Projects are messed up. (Verfied
> in Safari 4 and FF 3.0 in Jaunty.) If it is not your issue could
> you file a bug?

Ah yes, good point. I'll do these in a later branch for the same bug,
and land them all together.

>
> In addition to those broad questions I've made some suggestions
> below. Overall a nice branch. Thanks for knocking out another...
>
> I'm marking the code review 'Needs Fixing' just b/c I want to see
> the diff but the changes should be pretty straightforward.
>
> --Brad
>
>
> > === modified file 'lib/lp/bugs/browser/bugtracker.py'
> > --- lib/lp/bugs/browser/bugtracker.py 2009-06-25 00:40:31 +0000
> +++ lib/lp/bugs/browser/bugtracker.py 2009-08-25 15:36:35 +0000
> > @@ -379,8 +370,21 @@
> > return RemoteBug(self.context, remotebug, bugs)
> >
> >
> > +class BugTrackerSetBreadcrumbBuilder(BreadcrumbBuilder):
> > + """Builds a breadcrumb for the `IBugTrackerSet`."""
>
> This diff is different from the branch. Was BreadcrumbBuilder vs
> Breadcrumb the reason for the conflict?

Yes :/

>
> > + rootsite = None
> > +
> > + @property
> > + def text(self):
> > + return u"Bug trackers"
> > +
> > +
> > class BugTrackerBreadcrumbBuilder(BreadcrumbBuilder):
> > """Builds a breadcrumb for an `IBugTracker`."""
> > +
> > + rootsite = None
> > +
> > @property
> > def t...

[Michael Nelson (michael.nelson)]

> To have a play, try:
>
> * Go to the bug trackers page (for IBugTrackerSet) at
> <https://bugs.launchpad.dev/bugs/bugtrackers>,

Looks great! The only thing is (as bac pointed out) you've got two "+ Register another bug tracker" links? I'd get rid of the one at the top (assuming that people need to read through the list *before* they can be sure that the one they're about to register isn't already registered).

>
> * Clicking on a bug tracker to see its overview page,

It looks great, but as far as I'm aware, we have been explicitly asked *not* to put the context details in the side bar. We had this issue with many soyuz pages that hadn't been updated since 1.0 and so had side portlets all over the place.

So there are actually two separate-but-related issues here:

1. The main_side layout is meant to be used only if you have notifications, a subscribers list, activity (new download releases), involvement or actions that create objects etc. See

https://dev.launchpad.net/VersionThreeDotO/UI/Conversion#Choose the layout

2. The context details should always be displayed in the main content in portlets as you see fit (see the product page as an example: https://edge.launchpad.net/firefox). I've only seen one exception to this rule approved so far, and that was the builder (singular) index page (builder-index.pt), because the builder status and log is extremely important. To see this page, go to:

https://edge.launchpad.net/builders

and click on an active builder (ie. one that is not idle).

>
> * Admire the "Change details" link on the right hand side; this is
> the new navigation menu,

Note: if you do remove that extra content from the side-bar (context details and related projects), you'll then be left with the same issue that I had with the builder-index.pt above - the only content you'll have for the side bar is an actions menu with a single change details link that is only displayed to a very limited number of people - otherwise it will be empty. For the builder-index.pt I checked with Martin and, since the menu was only displayed to admins (in my case), I decided to always use a main_only template and manually put the action menu on the right-hand side where it normally would be.

>
> * Use the "Bug trackers" breadcrumb to go back,

Great!

>
> * Click "Register a new bug tracker" to go to the +newbugtracker
> form,

Excellent.

>
> * Use the "Cancel" link to go back to the first page you were at.

Excellent.

review: Needs Fixing (ui)

[Gavin Panella (allenap)]

On Tue, 01 Sep 2009 11:26:08 -0000
Michael Nelson <email address hidden> wrote:

> Review: Needs Fixing ui
> > To have a play, try:
> >
> > * Go to the bug trackers page (for IBugTrackerSet) at
> > <https://bugs.launchpad.dev/bugs/bugtrackers>,
>
> Looks great! The only thing is (as bac pointed out) you've got two
> "+ Register another bug tracker" links? I'd get rid of the one at
> the top (assuming that people need to read through the list *before*
> they can be sure that the one they're about to register isn't
> already registered).

Done.

There are a lot of bug trackers registered in production, so this
table gets very long. I haven't added a batch navigator yet, because
one of the purposes of this table is for people to find if their bug
tracker is already registered. Until we have a search function I will
leave it as a very long table.

>
> >
> > * Clicking on a bug tracker to see its overview page,
>
> It looks great, but as far as I'm aware, we have been explicitly
> asked *not* to put the context details in the side bar. We had this
> issue with many soyuz pages that hadn't been updated since 1.0 and
> so had side portlets all over the place.
>
> So there are actually two separate-but-related issues here:
>
> 1. The main_side layout is meant to be used only if you have
> notifications, a subscribers list, activity (new download releases),
> involvement or actions that create objects etc. See
>
> https://dev.launchpad.net/VersionThreeDotO/UI/Conversion#Choose the layout
>
> 2. The context details should always be displayed in the main
> content in portlets as you see fit (see the product page as an
> example: https://edge.launchpad.net/firefox). I've only seen one
> exception to this rule approved so far, and that was the builder
> (singular) index page (builder-index.pt), because the builder status
> and log is extremely important. To see this page, go to:
>
> https://edge.launchpad.net/builders
>
> and click on an active builder (ie. one that is not idle).

I'm starting to take in all of these rules and motivations :)

As we've already discussed, I've moved the summary to across the top,
then a row with two portlets - details and related projects - and then
a row with the watches.

>
> >
> > * Admire the "Change details" link on the right hand side; this is
> > the new navigation menu,
>
> Note: if you do remove that extra content from the side-bar (context
> details and related projects), you'll then be left with the same
> issue that I had with the builder-index.pt above - the only content
> you'll have for the side bar is an actions menu with a single change
> details link that is only displayed to a very limited number of
> people - otherwise it will be empty. For the builder-index.pt I
> checked with Martin and, since the menu was only displayed to admins
> (in my case), I decided to always use a main_only template and
> manually put the action menu on the right-hand side where it
> normally would be.

As discussed, the side bar is always shown because the Change Details
link can be clicked by anyone; if they're not logged-in they'll be
asked to do so.

>
> >
> > * Use the "Bug trackers" breadcrumb to go back...

[Michael Nelson (michael.nelson)]

> On Tue, 01 Sep 2009 11:26:08 -0000
> Michael Nelson <email address hidden> wrote:
>
> > Review: Needs Fixing ui
> > > To have a play, try:
> > >
> > > * Go to the bug trackers page (for IBugTrackerSet) at
> > > <https://bugs.launchpad.dev/bugs/bugtrackers>,
> >
> > Looks great! The only thing is (as bac pointed out) you've got two
> > "+ Register another bug tracker" links? I'd get rid of the one at
> > the top (assuming that people need to read through the list *before*
> > they can be sure that the one they're about to register isn't
> > already registered).
>
> Done.
>
> There are a lot of bug trackers registered in production, so this
> table gets very long. I haven't added a batch navigator yet, because
> one of the purposes of this table is for people to find if their bug
> tracker is already registered. Until we have a search function I will
> leave it as a very long table.

Great, looks good.

>
> >
> > >
> > > * Clicking on a bug tracker to see its overview page,
> >
> > It looks great, but as far as I'm aware, we have been explicitly
> > asked *not* to put the context details in the side bar. We had this
> > issue with many soyuz pages that hadn't been updated since 1.0 and
> > so had side portlets all over the place.
> >
> > So there are actually two separate-but-related issues here:
> >
> > 1. The main_side layout is meant to be used only if you have
> > notifications, a subscribers list, activity (new download releases),
> > involvement or actions that create objects etc. See
> >
> > https://dev.launchpad.net/VersionThreeDotO/UI/Conversion#Choose the layout
> >
> > 2. The context details should always be displayed in the main
> > content in portlets as you see fit (see the product page as an
> > example: https://edge.launchpad.net/firefox). I've only seen one
> > exception to this rule approved so far, and that was the builder
> > (singular) index page (builder-index.pt), because the builder status
> > and log is extremely important. To see this page, go to:
> >
> > https://edge.launchpad.net/builders
> >
> > and click on an active builder (ie. one that is not idle).
>
> I'm starting to take in all of these rules and motivations :)
>
> As we've already discussed, I've moved the summary to across the top,
> then a row with two portlets - details and related projects - and then
> a row with the watches.

Looks good.

One thing that I don't get (but could just be my lack of context), is that in the Related projects portlet, it mentions that I can link a registered bug tracker with a registered project in LP. But I was looking for an "add project link" or something similar - and checked the edit page too. I'm guessing that it's actually only possible from the project? If that's the case, how about "You can link a registered bug tracker when you edit a registered project in Launchpad:"? See what you think.

>
> >
> > >
> > > * Admire the "Change details" link on the right hand side; this is
> > > the new navigation menu,
> >
> > Note: if you do remove that extra content from the side-bar (context
> > details and related projects), you'll then be left with the same
> > issue that I had with the builder-index...

review: Approve (ui)

[Gavin Panella (allenap)]

On Wed, 02 Sep 2009 07:18:45 -0000
Michael Nelson <email address hidden> wrote:

...
> > As we've already discussed, I've moved the summary to across the top,
> > then a row with two portlets - details and related projects - and then
> > a row with the watches.
>
> Looks good.
>
> One thing that I don't get (but could just be my lack of context),
> is that in the Related projects portlet, it mentions that I can link
> a registered bug tracker with a registered project in LP. But I was
> looking for an "add project link" or something similar - and checked
> the edit page too. I'm guessing that it's actually only possible
> from the project? If that's the case, how about "You can link a
> registered bug tracker when you edit a registered project in
> Launchpad:"? See what you think.

How about:

  You can link a <a href="/projects/">registered project</a> to a
  registered bug tracker in the project's &ldquo;Change details&rdquo;
  page.

People do sometimes have issues with this, and a wording change here
might help.

[Michael Nelson (michael.nelson)]

> On Wed, 02 Sep 2009 07:18:45 -0000
> Michael Nelson <email address hidden> wrote:
>
> ...
> > > As we've already discussed, I've moved the summary to across the top,
> > > then a row with two portlets - details and related projects - and then
> > > a row with the watches.
> >
> > Looks good.
> >
> > One thing that I don't get (but could just be my lack of context),
> > is that in the Related projects portlet, it mentions that I can link
> > a registered bug tracker with a registered project in LP. But I was
> > looking for an "add project link" or something similar - and checked
> > the edit page too. I'm guessing that it's actually only possible
> > from the project? If that's the case, how about "You can link a
> > registered bug tracker when you edit a registered project in
> > Launchpad:"? See what you think.
>
> How about:
>
> You can link a <a href="/projects/">registered project</a> to a
> registered bug tracker in the project's &ldquo;Change details&rdquo;
> page.
>
> People do sometimes have issues with this, and a wording change here
> might help.

Perfect.

[Brad Crittenden (bac)]

Gavin your changes look good. I note the informational sprites are still messed up -- not sure if they were meant to be fixed in this revision or not.

review: Approve (code)

[Gavin Panella (allenap)]

On Wed, 02 Sep 2009 16:03:31 -0000
Brad Crittenden <email address hidden> wrote:

> Review: Approve code
> Gavin your changes look good. I note the informational sprites are
> still messed up -- not sure if they were meant to be fixed in this
> revision or not.

Thanks Brad. I've fixed the sprites in a later branch (I just used
fmt:link iirc).

=== modified file 'lib/lp/bugs/browser/bugtracker.py'
--- lib/lp/bugs/browser/bugtracker.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/browser/bugtracker.py	2009-08-25 15:36:35 +0000
@@ -8,9 +8,9 @@
 __all__ = [
     'BugTrackerAddView',
     'BugTrackerBreadcrumbBuilder',
-    'BugTrackerContextMenu',
     'BugTrackerEditView',
     'BugTrackerNavigation',
+    'BugTrackerNavigationMenu',
     'BugTrackerSetContextMenu',
     'BugTrackerSetNavigation',
     'BugTrackerSetView',
@@ -42,6 +42,7 @@
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import BreadcrumbBuilder
+from canonical.launchpad.webapp.menu import NavigationMenu
 from canonical.widgets import DelimitedListWidget, LaunchpadRadioWidget
 
 
@@ -63,17 +64,6 @@
     usedfor = IBugTrackerSet
 
 
-class BugTrackerContextMenu(ContextMenu):
-
-    usedfor = IBugTracker
-
-    links = ['edit']
-
-    def edit(self):
-        text = 'Change details'
-        return Link('+edit', text, icon='edit')
-
-
 class BugTrackerSetContextMenu(ContextMenu):
 
     usedfor = IBugTrackerSet
@@ -125,6 +115,10 @@
             owner=getUtility(ILaunchBag).user)
         self.next_url = canonical_url(bugtracker)
 
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
 
 class BugTrackerSetView(LaunchpadView):
     """View for actions on the bugtracker index pages."""
@@ -194,9 +188,6 @@
 class BugTrackerEditView(LaunchpadEditFormView):
 
     schema = IBugTracker
-    field_names = ['name', 'title', 'bugtrackertype',
-                   'summary', 'baseurl', 'aliases', 'contactdetails',
-                   'active']
 
     custom_widget('summary', TextAreaWidget, width=30, height=5)
     custom_widget('aliases', DelimitedListWidget, height=3)
@@ -379,8 +370,21 @@
             return RemoteBug(self.context, remotebug, bugs)
 
 
+class BugTrackerSetBreadcrumbBuilder(BreadcrumbBuilder):
+    """Builds a breadcrumb for the `IBugTrackerSet`."""
+
+    rootsite = None
+
+    @property
+    def text(self):
+        return u"Bug trackers"
+
+
 class BugTrackerBreadcrumbBuilder(BreadcrumbBuilder):
     """Builds a breadcrumb for an `IBugTracker`."""
+
+    rootsite = None
+
     @property
     def text(self):
         return self.context.title
@@ -401,3 +405,13 @@
         return 'Remote Bug #%s in %s' % (self.remotebug,
                                          self.bugtracker.title)
 
+
+class BugTrackerNavigationMenu(NavigationMenu):
+
+    usedfor = BugTrackerView
+    facet = 'bugs'
+    links = ['edit']
+
+    def edit(self):
+        text = 'Change details'
+        return Link('+edit', text, icon='edit')

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2009-08-21 15:33:18 +0000
+++ lib/lp/bugs/browser/configure.zcml	2009-08-25 15:36:35 +0000
@@ -712,8 +712,8 @@
         <browser:menus
             module="lp.bugs.browser.bugtracker"
             classes="
-                BugTrackerContextMenu
-                BugTrackerSetContextMenu"/>
+                BugTrackerSetContextMenu
+                BugTrackerNavigationMenu"/>
         <browser:navigation
             module="lp.bugs.browser.bugtracker"
             classes="
@@ -725,7 +725,8 @@
         <browser:url
             for="lp.bugs.interfaces.bugtracker.IBugTracker"
             path_expression="string:${name}"
-            parent_utility="lp.bugs.interfaces.bugtracker.IBugTrackerSet"/>
+            parent_utility="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
+            rootsite="bugs"/>
         <browser:pages
             for="lp.bugs.interfaces.bugtracker.IBugTracker"
             class="lp.bugs.browser.bugtracker.BugTrackerView"
@@ -752,7 +753,8 @@
         <browser:url
             for="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
             path_expression="string:bugtrackers"
-            parent_utility="canonical.launchpad.interfaces.IMaloneApplication"/>
+            parent_utility="canonical.launchpad.interfaces.IMaloneApplication"
+            rootsite="bugs"/>
         <browser:pages
             for="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
             class="lp.bugs.browser.bugtracker.BugTrackerSetView"

=== modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
--- lib/lp/bugs/browser/tests/test_breadcrumbs.py	2009-08-20 20:18:44 +0000
+++ lib/lp/bugs/browser/tests/test_breadcrumbs.py	2009-08-25 15:29:48 +0000
@@ -5,9 +5,12 @@
 
 import unittest
 
+from zope.component import getUtility
+
 from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.launchpad.webapp.tests.breadcrumbs import (
     BaseBreadcrumbTestCase)
+from lp.bugs.interfaces.bugtracker import IBugTrackerSet
 from lp.testing import ANONYMOUS, login
 
 
@@ -56,5 +59,42 @@
             self._getBreadcrumbsTexts(url, self.traversed_objects))
 
 
+class TestBugTrackerBreadcrumbBuilders(BaseBreadcrumbTestCase):
+
+    def setUp(self):
+        super(TestBugTrackerBreadcrumbBuilders, self).setUp()
+        self.bug_tracker_set = getUtility(IBugTrackerSet)
+        self.bug_tracker_set_url = canonical_url(
+            self.bug_tracker_set, rootsite='bugs')
+        self.bug_tracker = self.factory.makeBugTracker()
+        self.bug_tracker_url = canonical_url(
+            self.bug_tracker, rootsite='bugs')
+
+    def test_bug_tracker_set(self):
+        # Check TestBugTrackerSetBreadcrumbBuilder.
+        traversed_objects = [
+            self.root, self.bug_tracker_set]
+        urls = self._getBreadcrumbsURLs(
+            self.bug_tracker_set_url, traversed_objects)
+        self.assertEquals(self.bug_tracker_set_url, urls[-1])
+        texts = self._getBreadcrumbsTexts(
+            self.bug_tracker_set_url, traversed_objects)
+        self.assertEquals("Bug trackers", texts[-1])
+
+    def test_bug_tracker(self):
+        # Check TestBugTrackerBreadcrumbBuilder (and
+        # TestBugTrackerSetBreadcrumbBuilder).
+        traversed_objects = [
+            self.root, self.bug_tracker_set, self.bug_tracker]
+        urls = self._getBreadcrumbsURLs(
+            self.bug_tracker_url, traversed_objects)
+        self.assertEquals(self.bug_tracker_url, urls[-1])
+        self.assertEquals(self.bug_tracker_set_url, urls[-2])
+        texts = self._getBreadcrumbsTexts(
+            self.bug_tracker_url, traversed_objects)
+        self.assertEquals(self.bug_tracker.title, texts[-1])
+        self.assertEquals("Bug trackers", texts[-2])
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2009-08-22 16:01:03 +0000
+++ lib/lp/bugs/configure.zcml	2009-08-25 15:29:48 +0000
@@ -398,6 +398,11 @@
             <allow
                 interface="lp.bugs.interfaces.bugtracker.IBugTrackerSet"/>
         </securedutility>
+        <adapter
+            provides="canonical.launchpad.webapp.interfaces.IBreadcrumbBuilder"
+            for="lp.bugs.interfaces.bugtracker.IBugTrackerSet"
+            factory="lp.bugs.browser.bugtracker.BugTrackerSetBreadcrumbBuilder"
+            permission="zope.Public"/>
         
         <!-- BugTrackerAlias -->
         

=== modified file 'lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt'
--- lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt	2009-08-25 15:59:44 +0000
@@ -1,10 +1,11 @@
 = Bug trackers in Launchpad =
 
-The bug trackers index page has the same navigation as the main Bugs page.
+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: Launchpad
+    Hierarchy: Launchpad > Bug trackers
     Tabs:
     * Launchpad Home - http://launchpad.dev/
     * Code - http://code.launchpad.dev/
@@ -145,7 +146,7 @@
 
     >>> user_browser.getLink("Register another bug tracker").click()
     >>> user_browser.url
-    'http://launchpad.dev/bugs/bugtrackers/+newbugtracker'
+    'http://bugs.launchpad.dev/bugs/bugtrackers/+newbugtracker'
 
 In fact, the link is there twice: once at the top of the page, once at
 the bottom.

=== modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt'
--- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2009-07-01 13:16:44 +0000
+++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2009-08-25 15:59:44 +0000
@@ -17,6 +17,12 @@
   >>> user_browser.title
   'Register an external bug tracker'
 
+In case the user gets cold feet, there is always a cancel link that
+takes them back to the bug tracker listing page.
+
+  >>> user_browser.getLink('Cancel').url
+  'http://bugs.launchpad.dev/bugs/bugtrackers'
+
 Supported external bug tracker types include Bugzilla, Debbugs,
 Roundup, SourceForge and Trac. We don't provide all of these as
 options to the user. We don't provide Debbugs because the status
@@ -133,7 +139,7 @@
   >>> user_browser.getControl('Location').value = 'http://bugzilla.example.org/'
   >>> user_browser.getControl('Add').click()
   >>> user_browser.url
-  'http://launchpad.dev/bugs/bugtrackers/test-bugzilla'
+  'http://bugs.launchpad.dev/bugs/bugtrackers/test-bugzilla'
 
   >>> login('[e-mail]')
   >>> bugtrackerset = getUtility(IBugTrackerSet)
@@ -167,7 +173,7 @@
   >>> user_browser.getLink('Change details').click()
 
   >>> user_browser.url
-  'http://launchpad.dev/bugs/bugtrackers/testmantis/+edit'
+  'http://bugs.launchpad.dev/bugs/bugtrackers/testmantis/+edit'
 
   >>> user_browser.title
   'Change details for \xe2\x80\x9cTest Mantis Tracker\xe2\x80\x9d bug tracker'
@@ -186,7 +192,7 @@
   >>> user_browser.getControl('Change').click()
 
   >>> user_browser.url
-  'http://launchpad.dev/bugs/bugtrackers/testmantis/+edit'
+  'http://bugs.launchpad.dev/bugs/bugtrackers/testmantis/+edit'
   >>> for message in get_feedback_messages(user_browser.contents):
   ...     print message
   There is 1 error.
@@ -221,7 +227,7 @@
   >>> user_browser.getControl('Change').click()
 
   >>> user_browser.url
-  'http://launchpad.dev/bugs/bugtrackers/testbugzilla'
+  'http://bugs.launchpad.dev/bugs/bugtrackers/testbugzilla'
 
 And now the test tracker should have been updated:
 
@@ -345,13 +351,13 @@
 deletion yet:
 
   >>> user_browser.url
-  'http://launchpad.dev/bugs/bugtrackers/freddy'
+  'http://bugs.launchpad.dev/bugs/bugtrackers/freddy'
 
   >>> user_browser.getLink('Change details').click()
   >>> user_browser.getControl('Delete').click()
 
   >>> user_browser.url
-  'http://launchpad.dev/bugs/bugtrackers'
+  'http://bugs.launchpad.dev/bugs/bugtrackers'
 
   >>> for message in get_feedback_messages(user_browser.contents):
   ...     print message

=== modified file 'lib/lp/bugs/templates/bugtracker-index.pt'
--- lib/lp/bugs/templates/bugtracker-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtracker-index.pt	2009-08-25 14:47:50 +0000
@@ -1,134 +1,118 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="malone"
->
-  <body>
-    <metal:heading fill-slot="pageheading">
-      <h1>
-        <tal:tracker replace="context/title">Gnome Bugzilla</tal:tracker>
-        overview
-      </h1>
-
-      <p tal:condition="not: context/active" id="inactive-message">
-        <strong>
-          Bug watch updates for <tal:bugtracker content="context/title" />
-          are disabled.
-        </strong>
-      </p>
-    </metal:heading>
-
-<metal:leftportlets fill-slot="portlets_one">
+<bug-tracker-index
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    metal:use-macro="view/macro:page/main_side"
+    i18n:domain="malone">
+
+  <metal:heading fill-slot="heading">
+    <h1>
+      <tal:tracker replace="context/title">Gnome Bugzilla</tal:tracker>
+      overview
+    </h1>
+    <p tal:condition="not: context/active" id="inactive-message">
+      <strong>
+        Bug watch updates for <tal:bugtracker content="context/title" />
+        are disabled.
+      </strong>
+    </p>
+  </metal:heading>
+
+  <metal:side fill-slot="side">
+    <tal:menu replace="structure view/@@+global-actions" />
     <div tal:replace="structure context/@@+portlet-details" />
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
     <div tal:replace="structure context/@@+portlet-projects" />
-</metal:rightportlets>
-
-<metal:macros fill-slot="bogus">
-  <metal:macro define-macro="watchlisting">
-    <table class="sortable listing" id="latestwatches">
-      <thead>
-        <tr>
-          <th>Launchpad bug</th>
-          <th>Remote bug</th>
-          <th>Status</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tal:watches repeat="watch watches">
-          <tr tal:define="hide not:watch/bug/required:launchpad.View">
-            <tal:hide-watch-details condition="hide">
-              <td>
-                <img alt="" src="/@@/bug" />
-                #<span tal:replace="watch/bug/id">34</span>:
-                <em>(Private)</em>
-              </td>
-              <td><em>-</em></td>
-              <td></td>
-            </tal:hide-watch-details>
-            <tal:show-watch-details condition="not:hide">
-              <td>
-                <img alt="" src="/@@/bug" />
-                <a href="#" tal:attributes="href watch/bug/fmt:url">
+  </metal:side>
+
+  <metal:macros fill-slot="bogus">
+    <metal:macro define-macro="watchlisting">
+      <table class="sortable listing" id="latestwatches">
+        <thead>
+          <tr>
+            <th>Launchpad bug</th>
+            <th>Remote bug</th>
+            <th>Status</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tal:watches repeat="watch watches">
+            <tr tal:define="show watch/bug/required:launchpad.View">
+              <tal:hide-watch-details condition="not:show">
+                <td>
+                  <img alt="" src="/@@/bug" />
                   #<span tal:replace="watch/bug/id">34</span>:
-                  <span tal:replace="watch/bug/title">
-                    Launchpad Bug Title
-                  </span>
-                </a>
-              </td>
-              <td>
-                <a tal:replace="structure watch/fmt:external-link-short">
-                  1234
-                </a>
-              </td>
-              <td><tal:status tal:replace="watch/remotestatus"/></td>
-            </tal:show-watch-details>
-          </tr>
-        </tal:watches>
-      </tbody>
-    </table>
-  </metal:macro>
-</metal:macros>
-
-<div metal:fill-slot="main">
-
-  <p tal:content="context/summary">
-    $BugTracker.summary goes here. This should be quite short,
-    just a single paragraph of text really, giving the BugTracker
-    highlights.
-  </p>
-
-  <h2>
-    Location
-  </h2>
-
-  <ul id="bugtracker-urls">
-    <li>
-      <strong>
-        <a tal:replace="structure context/fmt:external-link">
-          http://bugs.example.com/
-        </a>
-      </strong>
-    </li>
-    <li tal:repeat="alias context/fmt:aliases">
-      <strong tal:content="alias" /> (Alias)
-    </li>
-  </ul>
-
-  <h2 tal:condition="context/contactdetails">
-    Contact details
-  </h2>
-
-  <div tal:condition="context/contactdetails"
-       tal:content="context/contactdetails" >
-    The contact details for the admins of this bug tracker go here, so we
-    can get to them in an emergency.
+                  <em>(Private)</em>
+                </td>
+                <td><em>-</em></td>
+                <td></td>
+              </tal:hide-watch-details>
+              <tal:show-watch-details condition="show">
+                <td>
+                  <img alt="" src="/@@/bug" />
+                  <a href="#" tal:attributes="href watch/bug/fmt:url">
+                    #<span tal:replace="watch/bug/id">34</span>:
+                    <span tal:replace="watch/bug/title">
+                      Launchpad Bug Title
+                    </span>
+                  </a>
+                </td>
+                <td>
+                  <a tal:replace="structure watch/fmt:external-link-short">
+                    1234
+                  </a>
+                </td>
+                <td><tal:status tal:replace="watch/remotestatus"/></td>
+              </tal:show-watch-details>
+            </tr>
+          </tal:watches>
+        </tbody>
+      </table>
+    </metal:macro>
+  </metal:macros>
+
+  <div metal:fill-slot="main">
+    <div class="top-portlet">
+      <p tal:content="context/summary">
+        $BugTracker.summary goes here. This should be quite short,
+        just a single paragraph of text really, giving the BugTracker
+        highlights.
+      </p>
+
+      <h2>
+        Location
+      </h2>
+      <ul id="bugtracker-urls">
+        <li>
+          <strong>
+            <a tal:replace="structure context/fmt:external-link">
+              http://bugs.example.com/
+            </a>
+          </strong>
+        </li>
+        <li tal:repeat="alias context/fmt:aliases">
+          <strong tal:content="alias" /> (Alias)
+        </li>
+      </ul>
+
+      <h2 tal:condition="context/contactdetails">
+        Contact details
+      </h2>
+      <div tal:condition="context/contactdetails"
+           tal:content="context/contactdetails" >
+        The contact details for the admins of this bug tracker go here,
+        so we can get to them in an emergency.
+      </div>
+
+      <h2 tal:condition="context/watches">Bug watches</h2>
+      <tal:navigation
+          replace="structure view/batchnav/@@+navigation-links-upper" />
+      <tal:block define="watches view/batchnav/batch" condition="watches">
+        <metal:watches use-macro="template/macros/watchlisting" />
+      </tal:block>
+      <tal:navigation
+          replace="structure view/batchnav/@@+navigation-links-lower" />
+    </div>
   </div>
 
-  <h2 tal:condition="context/watches">Bug watches</h2>
-  <tal:navigation
-      replace="structure view/batchnav/@@+navigation-links-upper" />
-
-  <tal:block define="watches view/batchnav/batch"
-             condition="watches">
-
-    <metal:watches use-macro="template/macros/watchlisting" />
-
-  </tal:block>
-
-  <tal:navigation
-      replace="structure view/batchnav/@@+navigation-links-lower" />
-
-</div>
-
-</body>
-</html>
+</bug-tracker-index>

=== modified file 'lib/lp/bugs/templates/bugtrackers-add.pt'
--- lib/lp/bugs/templates/bugtrackers-add.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtrackers-add.pt	2009-08-25 11:20:11 +0000
@@ -1,12 +1,10 @@
-<html
+<bug-trackers-add
   xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
-  metal:use-macro="view/macro:page/onecolumn"
->
-  <body>
-    <h1 metal:fill-slot="heading">Register an external bug tracker</h1>
-    <div metal:fill-slot="main">
-      <div metal:use-macro="context/@@launchpad_form/form" />
-    </div>
-  </body>
-</html>
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only">
+  <div metal:fill-slot="main">
+    <div metal:use-macro="context/@@launchpad_form/form" />
+  </div>
+</bug-trackers-add>

=== modified file 'lib/lp/bugs/templates/bugtrackers-index.pt'
--- lib/lp/bugs/templates/bugtrackers-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtrackers-index.pt	2009-08-25 15:59:15 +0000
@@ -1,126 +1,94 @@
-<html
+<bug-trackers-index
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn"
->
-  <body>
-    <div metal:fill-slot="main">
-      <h1>Bug trackers registered in Launchpad</h1>
-      <p>
-        A bug report in Launchpad can be linked to a bug report in any of
-        these bug trackers.
-        The status of the external bug report is shown in Launchpad, and
-        Launchpad subscribers are notified when the external status changes.
-      </p>
-
-      <p
-         tal:define="link context/menu:context/newbugtracker"
-         tal:content="structure link/render"
-         tal:condition="link/enabled">
-        Add a new bug tracker
-      </p>
-
-  <table class="sortable listing" id="trackers">
-    <thead>
-      <tr>
-        <th>Title</th>
-        <th>Location</th>
-        <th>Linked Projects</th>
-        <th class="type">Type</th>
-        <th class="amount">Watches</th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <tr tal:repeat="bugtracker view/active_bug_trackers">
-          <td>
-            <a tal:replace="structure bugtracker/fmt:link" />
-          </td>
-          <td>
-            <a tal:replace="structure bugtracker/fmt:external-link" />
-          </td>
-          <td tal:define="pillar_data python:view.getPillarData(bugtracker)">
-            <tal:pillars condition="pillar_data">
-              <tal:pillar-entry repeat="pillar pillar_data/pillars">
+  metal:use-macro="view/macro:page/main_only">
+
+  <metal:macros fill-slot="bogus">
+    <metal:macro define-macro="tracker-table">
+      <table class="sortable listing" tal:attributes="id id">
+        <thead>
+          <tr>
+            <th>Title</th>
+            <th>Location</th>
+            <th>Linked Projects</th>
+            <th class="type">Type</th>
+            <th class="amount">Watches</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="tracker trackers">
+            <td>
+              <a tal:replace="structure tracker/fmt:link" />
+            </td>
+            <td>
+              <a tal:replace="structure tracker/fmt:external-link" />
+            </td>
+            <td tal:define="pillar_data python:view.getPillarData(tracker)">
+              <tal:pillars condition="pillar_data">
+                <tal:pillar-entry repeat="pillar pillar_data/pillars">
                   <a tal:attributes="href pillar/fmt:url"
                      tal:content="pillar/displayname"
                      ></a><tal:comma condition="not: repeat/pillar/end">, </tal:comma>
-              </tal:pillar-entry>
-              <tal:many-pillars
-                condition="pillar_data/has_more_pillars">
-                  &hellip;
-              </tal:many-pillars>
-            </tal:pillars>
-            <tal:no-pillars condition="not: pillar_data">
-                &mdash;
-            </tal:no-pillars>
-          </td>
-          <td class="type"
-            tal:content="bugtracker/bugtrackertype/title">bugtrackertype</td>
-          <td class="amount" tal:content="bugtracker/watches/count">bugcount</td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p
-     tal:define="link context/menu:context/newbugtracker"
-     tal:content="structure link/render"
-     tal:condition="link/enabled">
-    Add a new bug tracker
-  </p>
-
-  <tal:inactive-bug-trackers condition="view/inactive_bug_trackers">
-    <h1>Inactive bug trackers</h1>
-
-    <table class="sortable listing" id="inactive-trackers">
-      <thead>
-        <tr>
-          <th>Title</th>
-          <th>Location</th>
-          <th>Linked Projects</th>
-          <th class="type">Type</th>
-          <th class="amount">Watches</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr tal:repeat="bugtracker view/inactive_bug_trackers">
-            <td>
-              <a tal:replace="structure bugtracker/fmt:link" />
-            </td>
-            <td>
-              <a tal:replace="structure bugtracker/fmt:external-link" />
-            </td>
-            <td tal:define="pillar_data python:view.getPillarData(bugtracker)">
-              <tal:pillars condition="pillar_data">
-                <tal:pillar-entry repeat="pillar pillar_data/pillars">
-                    <a tal:attributes="href pillar/fmt:url"
-                       tal:content="pillar/displayname"
-                       ></a><tal:comma condition="not: repeat/pillar/end">, </tal:comma>
                 </tal:pillar-entry>
                 <tal:many-pillars
-                  condition="pillar_data/has_more_pillars">
-                    &hellip;
+                    condition="pillar_data/has_more_pillars">
+                  &hellip;
                 </tal:many-pillars>
               </tal:pillars>
               <tal:no-pillars condition="not: pillar_data">
-                  &mdash;
+                &mdash;
               </tal:no-pillars>
             </td>
             <td class="type"
-              tal:content="bugtracker/bugtrackertype/title">bugtrackertype</td>
-            <td class="amount" tal:content="bugtracker/watches/count">bugcount</td>
-        </tr>
-      </tbody>
-    </table>
-  </tal:inactive-bug-trackers>
-
-</div>
-
-</body>
-</html>
+                tal:content="tracker/bugtrackertype/title">bugtrackertype</td>
+            <td class="amount" tal:content="tracker/watches/count">bugcount</td>
+          </tr>
+        </tbody>
+      </table>
+    </metal:macro>
+  </metal:macros>
+
+  <div metal:fill-slot="heading">
+    <h1 tal:content="context/title" />
+  </div>
+
+  <div metal:fill-slot="main">
+    <div class="yui-u">
+      <div class="top-portlet">
+        <p>
+          A bug report in Launchpad can be linked to a bug report in any
+          of these bug trackers. The status of the external bug report is
+          shown in Launchpad, and Launchpad subscribers are notified when
+          the external status changes.
+        </p>
+        <p tal:define="link context/menu:context/newbugtracker"
+           tal:content="structure link/render"
+           tal:condition="link/enabled">
+          Add a new bug tracker
+        </p>
+        <tal:table define="id string:trackers;
+                           trackers view/active_bug_trackers">
+          <metal:table use-macro="template/macros/tracker-table" />
+        </tal:table>
+        <p style="margin-top: 1em"
+           tal:define="link context/menu:context/newbugtracker"
+           tal:content="structure link/render"
+           tal:condition="link/enabled">
+          Add a new bug tracker
+        </p>
+      </div>
+    </div>
+    <div class="yui-u" condition="view/inactive_bug_trackers">
+      <div class="portlet">
+        <h2>Inactive bug trackers</h2>
+        <tal:table define="id string:inactive-trackers;
+                           trackers view/inactive_bug_trackers">
+          <metal:table use-macro="template/macros/tracker-table" />
+        </tal:table>
+      </div>
+    </div>
+  </div>
+
+</bug-trackers-index>