Merge lp:~sinzui/launchpad/blueprints-ui into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to fix 3.0 UI inconsistencies in blueprints.

    lp:~sinzui/launchpad/blueprints-ui
    Diff size: 753
    Launchpad bug: https://bugs.launchpad.net/bugs/436249
                   https://bugs.launchpad.net/bugs/456192
                   https://bugs.launchpad.net/bugs/456974
                   https://bugs.launchpad.net/bugs/422693
    Test command: ./bin/test -vv -m lp.blueprints -t buglinktarget-views
    Pre-implementation: no one
    Target release: 3.1.11

= Fix 3.0 UI inconsistencies in blueprints =

Bug 436249 [specification-index displays an empty global menu]
    When I do not have permission to edit a blueprint the box still renders.

Bug 456192 [Page that links blueprint to bug report says "question" instead]
    When I go to a blueprint page and from there click on to linking a bug
    report. The heading and title for this page say "Link question to a bug
    report" and "Link question #12345 to a bug report," respectively.

    blueprint and questions share the same view for linking to bugs. The view
    needs to be smarter by testing he context type, or the views can be
    subclassed.

Bug 456974 [the 1.0 register a blueprint button is showing on a 3.0 page]
    The page should use the involvement menu instead.

Bug 422693 [Register a sprint is missing from /sprints]
    The sprints top-level collection page needs a link to register a sprint.

== Rules ==

Bug 436249 [specification-index displays an empty global menu]
    * Replace the hard coded menu with a navigation menu.

Bug 456192 [Page that links blueprint to bug report says "question" instead]
    * Simplify the page_title because the the view is used by many objects,
      and the context object is already listed in the breadcrumbs and title.

Bug 456974 [the 1.0 register a blueprint button is showing on a 3.0 page]
    * Add an involvement menu to the pages that use the old buttons.

Bug 422693 [Register a sprint is missing from /sprints]
    * Add a Register meeting link to the menu.

== QA ==

Bug 436249 [specification-index displays an empty global menu]
    * Visit a specification that you cannot edit.
    * Verify that an empty global menu is not displayed.

Bug 456192 [Page that links blueprint to bug report says "question" instead]
    * Choose the Link to bug link.
    * Verify the heading does not not mention 'question'.

Bug 456974 [the 1.0 register a blueprint button is showing on a 3.0 page]
    * Visit the front page for a project's blueprints.
    * Verify that the 1.0 button is not shown.
    * Verify that the page has an involvement menu to register a blueprint.

Bug 422693 [Register a sprint is missing from /sprints]
    * Visit /sprints
    * Verify there is a link to create a meeting.

== Lint ==

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/lp/blueprints/browser/configure.zcml
  lib/lp/blueprints/browser/specification.py
  lib/lp/blueprints/browser/specificationtarget.py
  lib/lp/blueprints/browser/sprint.py
  lib/lp/blueprints/browser/tests/test_menus.py
  lib/lp/blueprints/browser/tests/test_specificationtarget.py
  lib/lp/blueprints/stories/blueprints/01-creation.txt
  lib/lp/blueprints/stories/bl...

[Graham Binns (gmb)]

Code looks good to me. You should get a UI review too, though.

review: Approve (code)

[Curtis Hovey (sinzui)]

This branch fixes the /sprints menus:
    http://people.canonical.com/~curtis/meeting-menu.png

This branch replaces the 1.0 register a sprint button with a involvement-style
porlet as is done on the bugs pages
    http://people.canonical.com/~curtis/register-a-blueprint.png

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-10-16 13:20:48 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-11-14 04:37:12 +0000
@@ -800,8 +800,6 @@
 
 sprint_edit = ContextTitle(smartquote('Edit "%s" details'))
 
-sprint_index = ContextTitle('%s (sprint or meeting)')
-
 sprint_new = 'Register a meeting or sprint in Launchpad'
 
 sprint_specs = ContextTitle('Blueprints for %s')

=== modified file 'lib/lp/blueprints/browser/configure.zcml'
--- lib/lp/blueprints/browser/configure.zcml	2009-09-22 19:52:18 +0000
+++ lib/lp/blueprints/browser/configure.zcml	2009-11-14 04:37:13 +0000
@@ -110,6 +110,7 @@
     <browser:page
         name="+addspec"
         for="lp.blueprints.interfaces.sprint.ISprint"
+        facet="specifications"
         class="lp.blueprints.browser.specification.NewSpecificationFromSprintView"
         permission="launchpad.AnyPerson"
         template="../../app/templates/generic-edit.pt"/>
@@ -235,6 +236,7 @@
         <browser:menus
             module="lp.blueprints.browser.specification"
             classes="
+                SpecificationActionMenu
                 SpecificationContextMenu"/>
         <browser:navigation
             module="lp.blueprints.browser.specification"

=== modified file 'lib/lp/blueprints/browser/specification.py'
--- lib/lp/blueprints/browser/specification.py	2009-09-22 16:42:19 +0000
+++ lib/lp/blueprints/browser/specification.py	2009-11-14 04:37:13 +0000
@@ -13,6 +13,7 @@
     'NewSpecificationFromProjectView',
     'NewSpecificationFromRootView',
     'NewSpecificationFromSprintView',
+    'SpecificationActionMenu',
     'SpecificationContextMenu',
     'SpecificationNavigation',
     'SpecificationView',
@@ -71,12 +72,12 @@
     HasSpecificationsView)
 
 from canonical.launchpad.webapp import (
-    ContextMenu, LaunchpadView, LaunchpadEditFormView, LaunchpadFormView,
-    Link, Navigation, action, canonical_url, enabled_with_permission,
+    LaunchpadView, LaunchpadEditFormView, LaunchpadFormView,
+    Navigation, action, canonical_url,
     safe_action, stepthrough, stepto, custom_widget)
 from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.interfaces import ILaunchBag
-from lp.registry.browser.mentoringoffer import CanBeMentoredView
+from canonical.launchpad.webapp.menu import (
+    ContextMenu, enabled_with_permission, Link, NavigationMenu)
 from canonical.launchpad.browser.launchpad import AppFrontPageSearchView
 
 
@@ -272,7 +273,32 @@
         return self.context.getSprintSpecification(name)
 
 
-class SpecificationContextMenu(ContextMenu):
+class SpecificationEditLinksMixin:
+
+    @enabled_with_permission('launchpad.Edit')
+    def edit(self):
+        text = 'Change details'
+        return Link('+edit', text, icon='edit')
+
+    @enabled_with_permission('launchpad.Edit')
+    def supersede(self):
+        text = 'Mark superseded'
+        return Link('+supersede', text, icon='edit')
+
+    @enabled_with_permission('launchpad.Edit')
+    def retarget(self):
+        text = 'Re-target blueprint'
+        return Link('+retarget', text, icon='edit')
+
+
+class SpecificationActionMenu(NavigationMenu, SpecificationEditLinksMixin):
+
+    usedfor = ISpecification
+    facet = 'specifications'
+    links = ('edit', 'supersede', 'retarget')
+
+
+class SpecificationContextMenu(ContextMenu, SpecificationEditLinksMixin):
 
     usedfor = ISpecification
     links = ['edit', 'people', 'status', 'priority',
@@ -280,16 +306,10 @@
              'milestone', 'requestfeedback', 'givefeedback', 'subscription',
              'subscribeanother',
              'linkbug', 'unlinkbug', 'linkbranch',
-             'offermentoring', 'retractmentoring',
              'adddependency', 'removedependency',
              'dependencytree', 'linksprint', 'supersede',
              'retarget']
 
-    @enabled_with_permission('launchpad.Edit')
-    def edit(self):
-        text = 'Change details'
-        return Link('+edit', text, icon='edit')
-
     def givefeedback(self):
         text = 'Give feedback'
         enabled = (self.user is not None and
@@ -306,7 +326,7 @@
         text = 'Change people'
         return Link('+people', text, icon='edit')
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission('launchpad.Admin')
     def priority(self):
         text = 'Change priority'
         return Link('+priority', text, icon='edit')
@@ -335,24 +355,6 @@
         text = 'Change status'
         return Link('+status', text, icon='edit')
 
-    @enabled_with_permission('launchpad.AnyPerson')
-    def offermentoring(self):
-        text = 'Offer mentorship'
-        user = getUtility(ILaunchBag).user
-        enabled = self.context.canMentor(user)
-        return Link('+mentor', text, icon='add', enabled=enabled)
-
-    def retractmentoring(self):
-        text = 'Retract mentorship'
-        user = getUtility(ILaunchBag).user
-        # We should really only allow people to retract mentoring if the
-        # spec's open and the user's already a mentor.
-        if user and not self.context.is_complete:
-            enabled = self.context.isMentor(user)
-        else:
-            enabled = False
-        return Link('+retractmentoring', text, icon='remove', enabled=enabled)
-
     def subscribeanother(self):
         """Return the 'Subscribe someone else' Link."""
         text = 'Subscribe someone else'
@@ -372,16 +374,12 @@
             icon = 'add'
         return Link('+subscribe', text, icon=icon)
 
-    @enabled_with_permission('launchpad.Edit')
-    def supersede(self):
-        text = 'Mark superseded'
-        return Link('+supersede', text, icon='edit')
-
     @enabled_with_permission('launchpad.AnyPerson')
     def linkbug(self):
         text = 'Link a bug report'
         return Link('+linkbug', text, icon='add')
 
+    @enabled_with_permission('launchpad.AnyPerson')
     def unlinkbug(self):
         text = 'Unlink a bug'
         enabled = bool(self.context.bugs)
@@ -409,11 +407,6 @@
         text = 'Propose for sprint'
         return Link('+linksprint', text, icon='add')
 
-    @enabled_with_permission('launchpad.Edit')
-    def retarget(self):
-        text = 'Re-target blueprint'
-        return Link('+retarget', text, icon='edit')
-
     @enabled_with_permission('launchpad.AnyPerson')
     def whiteboard(self):
         text = 'Edit whiteboard'
@@ -427,7 +420,8 @@
             text = 'Link a related branch'
         return Link('+linkbranch', text, icon='add')
 
-class SpecificationSimpleView(LaunchpadView, CanBeMentoredView):
+
+class SpecificationSimpleView(LaunchpadView):
     """Used to render portlets and listing items that need browser code."""
 
     __used_for__ = ISpecification
@@ -489,16 +483,18 @@
             essential = request.form.get('essential') == 'yes'
             if sub is not None:
                 self.context.subscribe(self.user, self.user, essential)
-                self.notices.append("You have subscribed to this spec.")
+                self.notices.append(
+                    "You have subscribed to this blueprint.")
             elif upd is not None:
                 self.context.subscribe(self.user, self.user, essential)
                 self.notices.append('Your subscription has been updated.')
             elif unsub is not None:
                 self.context.unsubscribe(self.user)
-                self.notices.append("You have unsubscribed from this spec.")
+                self.notices.append(
+                    "You have unsubscribed from this blueprint.")
 
         if self.feedbackrequests:
-            msg = "You have %d feedback request(s) on this specification."
+            msg = "You have %d feedback request(s) on this blueprint."
             msg %= len(self.feedbackrequests)
             self.notices.append(msg)
 
@@ -529,7 +525,7 @@
         newstate = self.context.updateLifecycleStatus(self.user)
         if newstate is not None:
             self.request.response.addNotification(
-                'Specification is now considered "%s".' % newstate.title)
+                'blueprint is now considered "%s".' % newstate.title)
         self.next_url = canonical_url(self.context)
 
 
@@ -693,7 +689,7 @@
         elif IDistribution.providedBy(target):
             distribution = target
         else:
-            raise AssertionError, 'Unknown target'
+            raise AssertionError('Unknown target.')
         self.context.retarget(product=product, distribution=distribution)
         self._nextURL = canonical_url(self.context)
 
@@ -747,8 +743,8 @@
                 vocabulary=SimpleVocabulary(terms),
                 required=False,
                 description=_(
-                    "The specification which supersedes this one. Note "
-                    "that selecting a specification here and pressing "
+                    "The blueprint which supersedes this one. Note "
+                    "that selecting a blueprint here and pressing "
                     "Continue will change the specification status "
                     "to Superseded.")),
             render_context=self.render_context)

=== modified file 'lib/lp/blueprints/browser/specificationtarget.py'
--- lib/lp/blueprints/browser/specificationtarget.py	2009-09-22 15:02:41 +0000
+++ lib/lp/blueprints/browser/specificationtarget.py	2009-11-14 04:37:12 +0000
@@ -31,9 +31,10 @@
 
 from canonical.config import config
 from canonical.launchpad import _
-from canonical.launchpad.webapp import LaunchpadView, Link
+from canonical.launchpad.webapp import LaunchpadView
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
+from canonical.launchpad.webapp.menu import enabled_with_permission, Link
 from canonical.launchpad.helpers import shortlist
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad.webapp import canonical_url
@@ -81,6 +82,12 @@
         text = 'Register a blueprint'
         return Link('+addspec', text, icon='add')
 
+    @enabled_with_permission('launchpad.View')
+    def register_sprint(self):
+        text = 'Register a meeting'
+        summary = 'Register a developer sprint, summit, or gathering'
+        return Link('/sprints/+new', text, summary=summary, icon='add')
+
 
 class HasSpecificationsView(LaunchpadView):
     """Base class for several context-specific views that involve lists of
@@ -117,9 +124,8 @@
     is_sprint = False
     has_drivers = False
 
-    # XXX: jsk: 2007-07-12: This method might be improved by
+    # XXX: jsk: 2007-07-12 bug=173972: This method might be improved by
     # replacing the conditional execution with polymorphism.
-    # See https://bugs.launchpad.net/blueprint/+bug/173972.
     def initialize(self):
         if IPerson.providedBy(self.context):
             self.is_person = True
@@ -145,7 +151,7 @@
             self.is_sprint = True
             self.show_target = True
         else:
-            raise AssertionError, 'Unknown blueprint listing site'
+            raise AssertionError('Unknown blueprint listing site.')
 
         if IHasDrivers.providedBy(self.context):
             self.has_drivers = True
@@ -162,6 +168,8 @@
         else:
             return _('Blueprints for $name', mapping=mapping)
 
+    page_title = 'Blueprints'
+
     def mdzCsv(self):
         """Quick hack for mdz, to get csv dump of specs."""
         import csv
@@ -382,7 +390,9 @@
 class RegisterABlueprintButtonView:
     """View that renders a button to register a blueprint on its context."""
 
-    def __call__(self):
+    @cachedproperty
+    def target_url(self):
+        """The +addspec URL for the specifiation target or None"""
         # Check if the context has an +addspec view available.
         if queryMultiAdapter(
             (self.context, self.request), name='+addspec'):
@@ -390,15 +400,25 @@
         else:
             # otherwise find an adapter to ISpecificationTarget which will.
             target = ISpecificationTarget(self.context)
+        if target is None:
+            return None
+        else:
+            return canonical_url(
+                target, rootsite='blueprints', view_name='+addspec')
 
+    def __call__(self):
+        if self.target_url is None:
+            return ''
         return """
-              <a href="%s/+addspec" id="addspec">
-                <img
-                  alt="Register a blueprint"
-                  src="/+icing/but-sml-registerablueprint.gif"
-                />
-              </a>
-        """ % canonical_url(target, rootsite='blueprints')
+            <div id="involvement" class="portlet involvement">
+              <ul>
+                <li style="border: none">
+                  <a class="menu-link-register_blueprint sprite blueprints"
+                    href="%s">Register a blueprint</a>
+                </li>
+              </ul>
+            </div>
+            """ % self.target_url
 
 
 class BlueprintsVHostBreadcrumb(Breadcrumb):

=== modified file 'lib/lp/blueprints/browser/sprint.py'
--- lib/lp/blueprints/browser/sprint.py	2009-10-30 16:38:20 +0000
+++ lib/lp/blueprints/browser/sprint.py	2009-11-14 04:37:12 +0000
@@ -149,6 +149,10 @@
     # a second h1 to display. But as this view implements IMajorHeadingView
     # it should not include an h1 below the app buttons.
     label = None
+    
+    @property
+    def page_title(self):
+        return '%s (sprint or meeting)' % self.context.title
 
     def initialize(self):
         self.notices = []
@@ -340,6 +344,8 @@
         return smartquote(
             'Review discussion topics for "%s" sprint' % self.context.title)
 
+    page_title = label
+
     def initialize(self):
         self.status_message = None
         self.process_form()
@@ -470,15 +476,22 @@
 class SprintSetNavigationMenu(RegistryCollectionActionMenuBase):
     """Action menu for sprints index."""
     usedfor = ISprintSet
-    links = [
+    links = (
         'register_team',
         'register_project',
+        'register_sprint',
         'create_account',
         'view_all_sprints',
-        ]
+        )
+
+    @enabled_with_permission('launchpad.View')
+    def register_sprint(self):
+        text = 'Register a meeting'
+        summary = 'Register a developer sprint, summit, or gathering'
+        return Link('+new', text, summary=summary, icon='add')
 
     def view_all_sprints(self):
-        text = 'Show all sprints'
+        text = 'Show all meetings'
         return Link('+all', text, icon='list')
 
 

=== added file 'lib/lp/blueprints/browser/tests/test_menus.py'
--- lib/lp/blueprints/browser/tests/test_menus.py	1970-01-01 00:00:00 +0000
+++ lib/lp/blueprints/browser/tests/test_menus.py	2009-11-14 04:37:13 +0000
@@ -0,0 +1,40 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+import unittest
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+
+from lp.blueprints.browser.specification import (
+    SpecificationActionMenu, SpecificationContextMenu)
+from lp.testing import TestCaseWithFactory
+from lp.testing.menu import check_menu_links
+
+
+class TestSpecificationMenus(TestCaseWithFactory):
+    """Test specification menus links."""
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        TestCaseWithFactory.setUp(self)
+        self.specification = self.factory.makeSpecification()
+
+    def test_SpecificationContextMenu(self):
+        menu = SpecificationContextMenu(self.specification)
+        self.assertTrue(check_menu_links(menu))
+
+    def test_SpecificationActionMenu(self):
+        menu = SpecificationActionMenu(self.specification)
+        self.assertTrue(check_menu_links(menu))
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.TestLoader().loadTestsFromName(__name__))
+    return suite
+
+
+if __name__ == '__main__':
+    unittest.TextTestRunner().run(test_suite())

=== added file 'lib/lp/blueprints/browser/tests/test_specificationtarget.py'
--- lib/lp/blueprints/browser/tests/test_specificationtarget.py	1970-01-01 00:00:00 +0000
+++ lib/lp/blueprints/browser/tests/test_specificationtarget.py	2009-11-14 04:37:13 +0000
@@ -0,0 +1,93 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+import unittest
+
+from canonical.launchpad.layers import BlueprintLayer
+from canonical.testing.layers import DatabaseFunctionalLayer
+
+from lp.blueprints.interfaces.specificationtarget import (
+    IHasSpecifications, ISpecificationTarget)
+from lp.testing import login_person, TestCaseWithFactory
+from lp.testing.views import create_view
+
+
+class TestRegisterABlueprintButtonView(TestCaseWithFactory):
+    """Test specification menus links."""
+    layer = DatabaseFunctionalLayer
+
+    def verify_view(self, context, name):
+        view = create_view(
+            context, '+register-a-blueprint-button')
+        self.assertEqual(
+            'http://blueprints.launchpad.dev/%s/+addspec' % name,
+            view.target_url)
+        self.assertTrue(
+            '<div id="involvement" class="portlet involvement">' in view())
+
+    def test_specificationtarget(self):
+        context = self.factory.makeProduct(name='almond')
+        self.assertTrue(ISpecificationTarget.providedBy(context))
+        self.verify_view(context, context.name)
+
+    def test_adaptable_to_specificationtarget(self):
+        context = self.factory.makeProject(name='hazelnut')
+        self.assertFalse(ISpecificationTarget.providedBy(context))
+        self.verify_view(context, context.name)
+
+    def test_sprint(self):
+        # Sprints are a special case. They are not ISpecificationTargets,
+        # nor can they be adapted to a ISpecificationTarget,
+        # but can create a spcification for a ISpecificationTarget.
+        context = self.factory.makeSprint(title='Walnut', name='walnut')
+        self.assertFalse(ISpecificationTarget.providedBy(context))
+        self.verify_view(context, 'sprints/%s' % context.name)
+
+
+class TestHasSpecificationsView(TestCaseWithFactory):
+    """Test specification menus links."""
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        TestCaseWithFactory.setUp(self)
+        self.user = self.factory.makePerson(name="macadamia")
+        login_person(self.user)
+
+    def verify_involvment(self, context):
+        self.assertTrue(IHasSpecifications.providedBy(context))
+        view = create_view(
+            context, '+specs', layer=BlueprintLayer, principal=self.user)
+        self.assertTrue(
+            '<div id="involvement" class="portlet involvement">' in view())
+
+    def test_specificationtarget(self):
+        context = self.factory.makeProduct(name='almond')
+        self.verify_involvment(context)
+
+    def test_adaptable_to_specificationtarget(self):
+        context = self.factory.makeProject(name='hazelnut')
+        self.verify_involvment(context)
+
+    def test_sprint(self):
+        context = self.factory.makeSprint(title='Walnut', name='walnut')
+        self.verify_involvment(context)
+
+    def test_person(self):
+        context = self.factory.makePerson(name='pistachio')
+        self.assertTrue(IHasSpecifications.providedBy(context))
+        view = create_view(
+            context, '+specs', layer=BlueprintLayer, principal=self.user)
+        self.assertFalse(
+            '<div id="involvement" class="portlet involvement">' in view())
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.TestLoader().loadTestsFromName(__name__))
+    return suite
+
+
+if __name__ == '__main__':
+    unittest.TextTestRunner().run(test_suite())

=== modified file 'lib/lp/blueprints/stories/blueprints/01-creation.txt'
--- lib/lp/blueprints/stories/blueprints/01-creation.txt	2009-09-22 15:02:41 +0000
+++ lib/lp/blueprints/stories/blueprints/01-creation.txt	2009-11-14 04:37:12 +0000
@@ -52,11 +52,12 @@
 
     >>> user_browser.open('http://blueprints.launchpad.dev/ubuntu')
 
-Users can press the graphical "Register a blueprint" button:
+Users can use the ISpecificationTarget involvement menu to register a
+blueprint.
 
-    >>> print find_tag_by_id(user_browser.contents, 'addspec')
-    <a href="http://blueprints.launchpad.dev/ubuntu/+addspec"
-    id="addspec"> <img alt="Register a blueprint"...
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'involvement').a)
+    Register a blueprint
 
 Users can also follow the textual "Register a blueprint" link:
 
@@ -73,12 +74,6 @@
 
     >>> user_browser.open('http://blueprints.launchpad.dev/ubuntu/hoary')
 
-Users can press the graphical "Register a blueprint" button:
-
-    >>> print find_tag_by_id(user_browser.contents, 'addspec')
-    <a href="http://blueprints.launchpad.dev/ubuntu/hoary/+addspec"
-    id="addspec"> <img alt="Register a blueprint"...
-
 Users can also follow the textual "Register a blueprint" link:
 
     >>> for tag in find_tags_by_class(
@@ -94,11 +89,6 @@
 
     >>> user_browser.open('http://blueprints.launchpad.dev/bzr')
 
-Users can press the graphical "Register a blueprint" button:
-
-    >>> print find_tag_by_id(user_browser.contents, 'addspec')
-    <a href="http://blueprints.launchpad.dev/bzr/+addspec"
-    id="addspec"> <img alt="Register a blueprint"...
 
 Users can also follow the textual "Register a blueprint" link:
 
@@ -125,11 +115,6 @@
 
     >>> user_browser.open('http://blueprints.launchpad.dev/firefox/1.0')
 
-Users can press the graphical "Register a blueprint" button:
-
-    >>> print find_tag_by_id(user_browser.contents, 'addspec')
-    <a href="http://blueprints.launchpad.dev/firefox/1.0/+addspec"
-    id="addspec"> <img alt="Register a blueprint" ...
 
 Users can also follow the textual "Register a blueprint" link:
 
@@ -146,12 +131,6 @@
 
     >>> user_browser.open('http://blueprints.launchpad.dev/mozilla')
 
-Users can press the graphical "Register a blueprint" button:
-
-    >>> print find_tag_by_id(user_browser.contents, 'addspec')
-    <a href="http://blueprints.launchpad.dev/mozilla/+addspec"
-    id="addspec"> <img alt="Register a blueprint" ...
-
 Users can follow the textual "Register a blueprint" link:
 
     >>> for tag in find_tags_by_class(
@@ -167,12 +146,6 @@
 
     >>> user_browser.open('http://blueprints.launchpad.dev/sprints/futurista')
 
-Users can press the graphical "Register a blueprint" button:
-
-    >>> print find_tag_by_id(user_browser.contents, 'addspec')
-    <a href="http://blueprints.launchpad.dev/sprints/futurista/+addspec"
-    id="addspec"> <img alt="Register a blueprint"...
-
 Users can also follow the textual "Register a blueprint" link:
 
     >>> for tag in find_tags_by_class(

=== modified file 'lib/lp/blueprints/stories/blueprints/02-buglinks.txt'
--- lib/lp/blueprints/stories/blueprints/02-buglinks.txt	2009-09-18 23:33:06 +0000
+++ lib/lp/blueprints/stories/blueprints/02-buglinks.txt	2009-11-14 04:37:12 +0000
@@ -13,7 +13,7 @@
     ...     'http://launchpad.dev/firefox/+spec/svg-support')
     >>> print extract_text(find_tag_by_id(anon_browser.contents, 'bug_links'))
     Related bugs
-    Bug #1: Firefox does not support SVG ...
+    Bug #1: Firefox does not support SVG
 
 
 == Adding Links ==

=== modified file 'lib/lp/blueprints/stories/sprints/05-sprint-creation.txt'
--- lib/lp/blueprints/stories/sprints/05-sprint-creation.txt	2009-09-24 14:12:38 +0000
+++ lib/lp/blueprints/stories/sprints/05-sprint-creation.txt	2009-11-14 04:37:12 +0000
@@ -3,7 +3,8 @@
 We should also be able to create a new sprint. We do this off the Sprints
 +new page.
 
-  >>> user_browser.open('http://launchpad.dev/sprints/+new')
+  >>> user_browser.open('http://launchpad.dev/sprints')
+  >>> user_browser.getLink('Register a meeting').click()
 
   >>> print user_browser.title
   Register a meeting...

=== modified file 'lib/lp/blueprints/stories/standalone/subscribing.txt'
--- lib/lp/blueprints/stories/standalone/subscribing.txt	2009-09-22 20:21:30 +0000
+++ lib/lp/blueprints/stories/standalone/subscribing.txt	2009-11-14 04:37:12 +0000
@@ -49,7 +49,7 @@
 subscribed.
 
     >>> browser.getControl('Subscribe').click()
-    >>> 'You have subscribed to this spec' in browser.contents
+    >>> 'You have subscribed to this blueprint' in browser.contents
     True
     >>> 'subscriber-essential' in browser.contents
     True
@@ -101,7 +101,7 @@
     >>> unsubit.value
     'Unsubscribe'
     >>> unsubit.click()
-    >>> 'You have unsubscribed from this spec.' in browser.contents
+    >>> 'You have unsubscribed from this blueprint.' in browser.contents
     True
     >>> 'subscriber-inessential' in browser.contents
     False

=== modified file 'lib/lp/blueprints/templates/hasspecifications-specs.pt'
--- lib/lp/blueprints/templates/hasspecifications-specs.pt	2009-09-22 15:02:41 +0000
+++ lib/lp/blueprints/templates/hasspecifications-specs.pt	2009-11-14 04:37:12 +0000
@@ -10,6 +10,8 @@
 <body>
 
 <tal:side metal:fill-slot="side">
+  <tal:register-blueprint
+    content="structure context/@@+register-a-blueprint-button|nothing" />
   <tal:menu replace="structure context/@@+global-actions" />
   <div tal:replace="structure context/@@+portlet-latestspecs" />
 </tal:side>
@@ -31,9 +33,6 @@
     </tal:block>
   </tal:block>
 
-  <div style="float: right;"
-       tal:content="structure context/@@+register-a-blueprint-button|nothing" />
-
   <tal:no_specs condition="not: has_any_specs">
     <p>
       Launchpad lets projects track the features they intend to implement over
@@ -107,14 +106,11 @@
           In this case, the drivers are:
         </p>
 
-        <blockquote>
-          <ul>
-            <li tal:repeat="driver context/drivers" class="person">
-              <a tal:attributes="href driver/fmt:url"
-                 tal:content="driver/displayname">Foo Bar</a>
-            </li>
-          </ul>
-        </blockquote>
+        <ul class="subordinate">
+          <li tal:repeat="driver context/drivers">
+            <a tal:replace="structure driver/fmt:link">Foo Bar</a>
+          </li>
+        </ul>
       </tal:not_driver>
       <tal:is_driver condition="context/required:launchpad.Driver">
         Since you are a driver of
@@ -130,14 +126,13 @@
       release management with Launchpad.
     </p>
 
-    <blockquote>
-      <ul class="menu">
-        <li class="info">
-          <a href="https://help.launchpad.net/BlueprintDocumentation"
-          >Read more about tracking blueprints</a>
-        </li>
-      </ul>
-    </blockquote>
+    <ul class="horizontal">
+      <li>
+        <a class="info sprite"
+          href="https://help.launchpad.net/BlueprintDocumentation">Read
+          more about tracking blueprints</a>
+      </li>
+    </ul>
 
   </tal:no_specs>
   <tal:has_specs condition="has_any_specs">

=== modified file 'lib/lp/blueprints/templates/specification-index.pt'
--- lib/lp/blueprints/templates/specification-index.pt	2009-09-23 08:20:02 +0000
+++ lib/lp/blueprints/templates/specification-index.pt	2009-11-14 04:37:12 +0000
@@ -347,19 +347,7 @@
   </div>
 
   <tal:side metal:fill-slot="side">
-    <div class="portlet">
-      <ul>
-        <li tal:condition="context/menu:context/edit/enabled">
-          <a tal:replace="structure context/menu:context/edit/fmt:link" />
-        </li>
-        <li tal:condition="context/menu:context/supersede/enabled">
-          <a tal:replace="structure context/menu:context/supersede/fmt:link" />
-        </li>
-        <li tal:condition="context/menu:context/retarget/enabled">
-          <a tal:replace="structure context/menu:context/retarget/fmt:link" />
-        </li>
-      </ul>
-    </div>
+    <tal:menu replace="structure context/@@+global-actions" />
 
     <div tal:replace="structure context/@@+portlet-subscribers" />
   </tal:side>

=== modified file 'lib/lp/blueprints/templates/specificationtarget-documentation.pt'
--- lib/lp/blueprints/templates/specificationtarget-documentation.pt	2009-09-17 21:20:14 +0000
+++ lib/lp/blueprints/templates/specificationtarget-documentation.pt	2009-11-14 04:37:13 +0000
@@ -10,10 +10,9 @@
 <body>
   <metal:main fill-slot="main" tal:define="specs view/documentation">
     <p>
-      To classify a blueprint as documentation, check the
-      &#8220;Is Informational&#8221; box on its &#8220;Edit Details&#8221;
-      page. When the blueprint is marked "Approved" then it will show
-      up in this listing.
+      To classify a blueprint as documentation, set the Implementation status
+      to &#8220;Informational&#8221; When the blueprint's Definition status is
+      marked &#8220;Approved&#8221;, it will appear in this listing.
     </p>
 
     <table id="documentation-listing-table">

=== modified file 'lib/lp/blueprints/templates/sprint-portlet-attendees.pt'
--- lib/lp/blueprints/templates/sprint-portlet-attendees.pt	2009-09-23 13:49:22 +0000
+++ lib/lp/blueprints/templates/sprint-portlet-attendees.pt	2009-11-14 04:37:13 +0000
@@ -11,7 +11,7 @@
   <div class="portletBody portletContent">
 
     <ul>
-      <li class="person" tal:repeat="attendance context/attendances">
+      <li tal:repeat="attendance context/attendances">
         <a tal:replace="structure attendance/attendee/fmt:link">Foo Bar</a><br />
         <div class="discreet">
            <span tal:replace="python:view.formatDate(attendance.time_starts)">

=== modified file 'lib/lp/blueprints/templates/sprint-register.pt'
--- lib/lp/blueprints/templates/sprint-register.pt	2009-09-18 17:44:08 +0000
+++ lib/lp/blueprints/templates/sprint-register.pt	2009-11-14 04:37:12 +0000
@@ -8,6 +8,10 @@
 >
 
 <body>
+  <metal:block fill-slot="head_epilogue">
+    <metal:yui-dependencies
+      use-macro="context/@@launchpad_widget_macros/yui2calendar-dependencies" />
+  </metal:block>
 
 <div metal:fill-slot="main">
   <div metal:use-macro="context/@@launchpad_form/form">

=== modified file 'lib/lp/bugs/browser/buglinktarget.py'
--- lib/lp/bugs/browser/buglinktarget.py	2009-08-13 17:04:41 +0000
+++ lib/lp/bugs/browser/buglinktarget.py	2009-11-14 04:37:12 +0000
@@ -30,19 +30,15 @@
 class BugLinkView(LaunchpadFormView):
     """This view is used to link bugs to any IBugLinkTarget."""
 
-    label = _('Link to bug report')
-
+    label = _('Link a bug report')
     schema = IBugLinkForm
 
     focused_element_id = 'bug'
 
     @property
-    def page_title(self):
-        return 'Link question #%s to a bug report' % self.context.id
-
-    @property
-    def label(self):
-        return 'Link question to a bug report'
+    def cancel_url(self):
+        """See `LaunchpadFormview`."""
+        return canonical_url(self.context)
 
     @action(_('Link'))
     def linkBug(self, action, data):
@@ -98,17 +94,13 @@
     """This view is used to remove bug links from any IBugLinkTarget."""
 
     label = _('Remove links to bug reports')
-
     schema = IUnlinkBugsForm
     custom_widget('bugs', LabeledMultiCheckBoxWidget)
 
     @property
-    def page_title(self):
-        return 'Remove bug links from question #%s' % self.context.id
-
-    @property
-    def label(self):
-        return 'Remove links to bug reports'
+    def cancel_url(self):
+        """See `LaunchpadFormview`."""
+        return canonical_url(self.context)
 
     @action(_('Remove'))
     def unlinkBugs(self, action, data):
@@ -134,4 +126,3 @@
         """
         return [bug for bug in self.context.bugs
                 if check_permission('launchpad.View', bug)]
-

=== modified file 'lib/lp/bugs/browser/tests/buglinktarget-views.txt'
--- lib/lp/bugs/browser/tests/buglinktarget-views.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/browser/tests/buglinktarget-views.txt	2009-11-14 04:37:13 +0000
@@ -24,8 +24,16 @@
 
 == Link Bug View ==
 
-The +linkbug view is used to link bugs to IBugLinkTarget. It has a
-simple widget to enter the bug number or nickname of the bug to link
+The +linkbug view is used to link bugs to IBugLinkTarget.
+
+    >>> view = create_view(cve, name='+linkbug')
+    >>> print view.label
+    Link a bug report
+
+    >>> print view.cancel_url
+    http://launchpad.dev/bugs/cve/2005-2730
+
+It has a simple widget to enter the bug number or nickname of the bug to link
 to. After it links the bug, it sends a ObjectModifiedEvent.
 
     >>> request = LaunchpadTestRequest(
@@ -70,8 +78,16 @@
 
 
 The +unlinkbug view is used to unlink a selection of bugs from an
-IBugLinkTarget. After removing the bugs, it sends a SQLObjectModified
-event.
+IBugLinkTarget. 
+
+    >>> view = create_view(cve, name='+unlinkbug')
+    >>> print view.label
+    Remove links to bug reports
+
+    >>> print view.cancel_url
+    http://launchpad.dev/bugs/cve/2005-2730
+
+After removing the bugs, it sends a SQLObjectModified event.
 
     >>> request = LaunchpadTestRequest(
     ...     method="POST",

=== modified file 'lib/lp/coop/answersbugs/stories/question-buglink.txt'
--- lib/lp/coop/answersbugs/stories/question-buglink.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/coop/answersbugs/stories/question-buglink.txt	2009-11-14 04:37:12 +0000
@@ -70,7 +70,7 @@
 
     >>> user_browser.getLink('Remove bug link').click()
     >>> print user_browser.title
-    Remove bug links from question #2...
+    Remove links to bug reports : Question #...
 
 The list of linked bugs is displayed. The user selects the link to
 remove and clicks the 'Remove' button.

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-11-10 11:31:06 +0000
+++ lib/lp/registry/browser/distribution.py	2009-11-14 04:37:13 +0000
@@ -452,7 +452,7 @@
                                      HasSpecificationsMenuMixin):
     usedfor = IDistribution
     facet = 'specifications'
-    links = ['listall', 'doc', 'assignments', 'new']
+    links = ['listall', 'doc', 'assignments', 'new', 'register_sprint']
 
 
 class DistributionPackageSearchView(PackageSearchViewBase):

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2009-11-07 01:45:32 +0000
+++ lib/lp/registry/browser/distroseries.py	2009-11-14 04:37:13 +0000
@@ -227,7 +227,9 @@
 
     usedfor = IDistroSeries
     facet = 'specifications'
-    links = ['listall', 'listdeclined', 'assignments', 'setgoals', 'new']
+    links = [
+        'listall', 'listdeclined', 'assignments', 'setgoals',
+        'new', 'register_sprint']
 
 
 class DistroSeriesPackageSearchView(PackageSearchViewBase):

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-10-30 14:55:25 +0000
+++ lib/lp/registry/browser/person.py	2009-11-14 04:37:13 +0000
@@ -1808,6 +1808,7 @@
 class PersonSpecFeedbackView(HasSpecificationsView):
 
     label = 'Feature feedback requests'
+    page_title = label
 
     @cachedproperty
     def feedback_specs(self):

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-11-07 00:49:26 +0000
+++ lib/lp/registry/browser/product.py	2009-11-14 04:37:12 +0000
@@ -468,7 +468,7 @@
                                 HasSpecificationsMenuMixin):
     usedfor = IProduct
     facet = 'specifications'
-    links = ['listall', 'doc', 'assignments', 'new']
+    links = ['listall', 'doc', 'assignments', 'new', 'register_sprint']
 
 
 def _sort_distros(a, b):

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2009-11-11 00:19:14 +0000
+++ lib/lp/registry/browser/productseries.py	2009-11-14 04:37:13 +0000
@@ -256,7 +256,9 @@
 
     usedfor = IProductSeries
     facet = 'specifications'
-    links = ['listall', 'assignments', 'setgoals', 'listdeclined', 'new']
+    links = [
+        'listall', 'assignments', 'setgoals', 'listdeclined',
+        'new', 'register_sprint']
 
 
 class ProductSeriesOverviewNavigationMenu(NavigationMenu):

=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2009-11-10 05:05:49 +0000
+++ lib/lp/registry/browser/project.py	2009-11-14 04:37:13 +0000
@@ -273,7 +273,7 @@
                                 HasSpecificationsMenuMixin):
     usedfor = IProject
     facet = 'specifications'
-    links = ['listall', 'doc', 'assignments', 'new']
+    links = ['listall', 'doc', 'assignments', 'new', 'register_sprint']
 
 
 class ProjectAnswersMenu(QuestionCollectionAnswersMenu):

=== modified file 'lib/lp/registry/browser/tests/product-menus.txt'
--- lib/lp/registry/browser/tests/product-menus.txt	2009-10-08 18:15:31 +0000
+++ lib/lp/registry/browser/tests/product-menus.txt	2009-11-14 04:37:12 +0000
@@ -9,32 +9,12 @@
 The check_menu_links() function is defined here to make it simple to
 test all the product menu classes below.
 
-    >>> from zope.component import getMultiAdapter
-    >>> from canonical.lazr.testing.menus import make_fake_request
-    >>> from canonical.launchpad.webapp.publisher import canonical_url
-    >>> from lp.registry.interfaces.product import IProductSet
-
-    >>> def check_menu_links(menu):
-    ...     context = menu.context
-    ...     is_sane_menu = True
-    ...     for link in menu.iterlinks():
-    ...         if '?' in link.target:
-    ...             view_name, _args = link.target.split('?')
-    ...         else:
-    ...             view_name = link.target
-    ...         url = canonical_url(context, view_name=view_name)
-    ...         request = make_fake_request(url)
-    ...         try:
-    ...             view = getMultiAdapter((context, request), name=view_name)
-    ...         except:
-    ...             is_sane_menu = False
-    ...             print 'Bad link %s: %s' % (link.name, url)
-    ...     print is_sane_menu
-
+    >>> from lp.testing.menu import check_menu_links
     >>> from lp.registry.browser.product import (
     ...     ProductBugsMenu, ProductNavigationMenu,
     ...     ProductOverviewMenu, ProductSpecificationsMenu)
-    >>> product = getUtility(IProductSet)['firefox']
+
+    >>> product = factory.makeProduct()
 
     >>> check_menu_links(ProductOverviewMenu(product))
     True

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2009-11-13 14:58:08 +0000
+++ lib/lp/testing/factory.py	2009-11-14 04:37:12 +0000
@@ -619,12 +619,13 @@
             description=description,
             owner=owner)
 
-    def makeSprint(self, title=None):
+    def makeSprint(self, title=None, name=None):
         """Make a sprint."""
         if title is None:
             title = self.getUniqueString('title')
         owner = self.makePerson()
-        name = self.getUniqueString('name')
+        if name is None:
+            name = self.getUniqueString('name')
         time_starts = datetime(2009, 1, 1, tzinfo=pytz.UTC)
         time_ends = datetime(2009, 1, 2, tzinfo=pytz.UTC)
         time_zone = 'UTC'

=== modified file 'lib/lp/testing/menu.py'
--- lib/lp/testing/menu.py	2009-11-13 13:06:50 +0000
+++ lib/lp/testing/menu.py	2009-11-14 04:37:13 +0000
@@ -14,6 +14,9 @@
 def check_menu_links(menu):
     context = menu.context
     for link in menu.iterlinks():
+        if link.target.startswith('/'):
+            # The context is not the context of this target.
+            continue
         if '?' in link.target:
             view_name, _args = link.target.split('?')
         else: