Hi Danilo,

This is really nice :)

My only comment really is that you probably ought to document the new
cancel links you've added.

Thanks, Gavin.


> === modified file 'lib/lp/blueprints/browser/configure.zcml'
> --- lib/lp/blueprints/browser/configure.zcml	2009-09-08 15:03:11 +0000
> +++ lib/lp/blueprints/browser/configure.zcml	2009-09-16 12:38:58 +0000
> @@ -68,7 +68,7 @@
>          class="lp.blueprints.browser.sprint.SprintEditView"
>          permission="launchpad.Edit"
>          facet="overview"
> -        template="../templates/sprint-edit.pt"/>
> +        template="../../app/templates/generic-edit.pt"/>
>      <browser:page
>          name="+branding"
>          for="lp.blueprints.interfaces.sprint.ISprint"
> @@ -203,7 +203,7 @@
>          class="lp.blueprints.browser.specificationsubscription.SpecificationSubscriptionEditView"
>          facet="specifications"
>          permission="launchpad.Edit"
> -        template="../templates/specificationsubscription-edit.pt"/>
> +        template="../../app/templates/generic-edit.pt"/>
>      <browser:defaultView
>          for="lp.blueprints.interfaces.sprintattendance.ISprintAttendance"
>          name="+edit"/>
> @@ -306,19 +306,19 @@
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specificationsubscription.SpecificationSubscriptionAddView"
>              permission="launchpad.AnyPerson"
> -            template="../templates/specification-addsubscriber.pt"/>
> +            template="../../app/templates/generic-edit.pt"/>
>          <browser:page
>              name="+retarget"
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specification.SpecificationRetargetingView"
>              permission="launchpad.Edit"
> -            template="../templates/specification-retargeting.pt"/>
> +            template="../../app/templates/generic-edit.pt"/>
>          <browser:page
>              name="+supersede"
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specification.SpecificationSupersedingView"
>              permission="launchpad.Edit"
> -            template="../templates/specification-superseding.pt"/>
> +            template="../../app/templates/generic-edit.pt"/>
>          <browser:page
>              name="+edit"
>              for="lp.blueprints.interfaces.specification.ISpecification"
> @@ -342,14 +342,14 @@
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specification.SpecificationGoalProposeView"
>              permission="launchpad.Edit"
> -            template="../templates/specification-distroseries.pt">
> +            template="../../app/templates/generic-edit.pt">
>          </browser:page>
>          <browser:page
>              name="+setproductseries"
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specification.SpecificationProductSeriesGoalProposeView"
>              permission="launchpad.Edit"
> -            template="../templates/specification-productseries.pt">
> +            template="../../app/templates/generic-edit.pt">
>          </browser:page>
>          <browser:page
>              name="+decide"
> @@ -411,20 +411,20 @@
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specificationdependency.SpecificationDependencyAddView"
>              permission="launchpad.Edit"
> -            template="../templates/specification-dependency.pt"/>
> +            template="../../app/templates/generic-edit.pt"/>
>          <browser:page
>              name="+removedependency"
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specificationdependency.SpecificationDependencyRemoveView"
>              permission="launchpad.Edit"
> -            template="../templates/specification-removedep.pt">
> +            template="../../app/templates/generic-edit.pt">
>          </browser:page>
>          <browser:page
>              name="+linksprint"
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              class="lp.blueprints.browser.specification.SpecificationSprintAddView"
>              permission="launchpad.AnyPerson"
> -            template="../templates/specification-linksprint.pt"/>
> +            template="../../app/templates/generic-edit.pt"/>
>          <browser:page
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              name="deptree.png"
> @@ -447,7 +447,7 @@
>              for="lp.blueprints.interfaces.specification.ISpecification"
>              name="+linkbranch"
>              class="lp.blueprints.browser.specification.SpecificationLinkBranchView"
> -            template="../templates/specification-linkbranch.pt"
> +            template="../../app/templates/generic-edit.pt"
>              permission="launchpad.AnyPerson"/>
>          <browser:url
>              for="lp.blueprints.interfaces.specification.ISpecificationSet"
> @@ -492,7 +492,7 @@
>              name="+new"
>              for="lp.blueprints.interfaces.specification.ISpecificationSet"
>              permission="launchpad.AnyPerson"
> -            template="../templates/specification-new.pt"
> +            template="../../app/templates/generic-edit.pt"
>              class="lp.blueprints.browser.specification.NewSpecificationFromRootView"/>
>      </facet>
>      <facet
>
> === modified file 'lib/lp/blueprints/browser/specification.py'
> --- lib/lp/blueprints/browser/specification.py	2009-09-08 15:03:11 +0000
> +++ lib/lp/blueprints/browser/specification.py	2009-09-16 12:38:58 +0000
> @@ -111,6 +111,10 @@
>          # Set the default value for the next URL.
>          self._next_url = canonical_url(spec)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>      def transform(self, data):
>          """Transforms the given form data.
>
> @@ -568,6 +572,10 @@
>              self.context, data['distroseries'], self.user)
>          self.next_url = canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  class SpecificationProductSeriesGoalProposeView(SpecificationGoalProposeView):
>      label = 'Target to a product series'
> @@ -580,6 +588,10 @@
>              self.context, data['productseries'], self.user)
>          self.next_url = canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  def propose_goal_with_automatic_approval(specification, series, user):
>      """Proposes the given specification as a goal for the given series. If
> @@ -664,6 +676,10 @@
>      def next_url(self):
>          return self._nextURL
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  class SupersededByWidget(DropdownWidget):
>      """Custom select widget for specification superseding.
> @@ -733,6 +749,10 @@
>                  'Specification is now considered "%s".' % newstate.title)
>          self.next_url = canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  class SpecGraph:
>      """A directed linked graph of nodes representing spec dependencies."""
> @@ -923,6 +943,10 @@
>          self.context.linkSprint(data["sprint"], self.user)
>          self.next_url = canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  class SpecGraphNode:
>      """Node in the spec dependency graph.
> @@ -1160,14 +1184,14 @@
>          self.context.linkBranch(branch=data['branch'],
>                                  registrant=self.user)
>
> -    @action(_('Cancel'), name='cancel', validator='validate_cancel')
> -    def cancel_action(self, action, data):
> -        """Do nothing and go back to the blueprint page."""
> -
>      @property
>      def next_url(self):
>          return canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  class SpecificationSetView(AppFrontPageSearchView, HasSpecificationsView):
>      """View for the Blueprints index page."""
>
> === modified file 'lib/lp/blueprints/browser/specificationdependency.py'
> --- lib/lp/blueprints/browser/specificationdependency.py	2009-07-27 18:06:21 +0000
> +++ lib/lp/blueprints/browser/specificationdependency.py	2009-09-16 12:38:58 +0000
> @@ -62,6 +62,10 @@
>      def next_url(self):
>          return canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
> +
>
>  class SpecificationDependencyRemoveView(LaunchpadFormView):
>      schema = ISpecificationDependencyRemoval
> @@ -73,3 +77,7 @@
>      def continue_action(self, action, data):
>          self.context.removeDependency(data['dependency'])
>          self.next_url = canonical_url(self.context)
> +
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)
>
> === modified file 'lib/lp/blueprints/browser/specificationsubscription.py'
> --- lib/lp/blueprints/browser/specificationsubscription.py	2009-06-25 00:00:26 +0000
> +++ lib/lp/blueprints/browser/specificationsubscription.py	2009-09-16 12:38:58 +0000
> @@ -44,3 +44,7 @@
>      def change_action(self, action, data):
>          self.updateContextFromData(data)
>          self.next_url = canonical_url(self.context.specification)
> +
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context.specification)
>
> === modified file 'lib/lp/blueprints/browser/sprint.py'
> --- lib/lp/blueprints/browser/sprint.py	2009-09-03 15:04:13 +0000
> +++ lib/lp/blueprints/browser/sprint.py	2009-09-16 12:38:58 +0000
> @@ -321,6 +321,10 @@
>      def next_url(self):
>          return canonical_url(self.context)
>
> +    @property
> +    def cancel_url(self):
> +        return canonical_url(self.context)

This pattern is used soooo much, but it's such a triviality. DRY would
lead us to defining a new superclass, or a mixin, etc, but the savings
are small compared to the clarity of just doing this inline. I guess
what I'm saying is: this is fine.

> +
>
>  class SprintTopicSetView(HasSpecificationsView, LaunchpadView):
>      """Custom view class to process the results of this unusual page.
>
> === modified file 'lib/lp/blueprints/browser/tests/test_breadcrumbs.py'
> --- lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2009-08-24 20:28:33 +0000
> +++ lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2009-09-16 12:38:58 +0000
> @@ -41,6 +41,28 @@
>                            'Blueprints involving %s' % self.person.displayname)
>
>
> +class TestSpecificationBreadcrumb(BaseBreadcrumbTestCase):
> +    """Test breadcrumbs for an `ISpecification`."""
> +
> +    def setUp(self):
> +        super(TestSpecificationBreadcrumb, self).setUp()
> +        self.product = self.factory.makeProduct(
> +            name='crumb-tester', displayname="Crumb Tester")
> +        self.specification = self.factory.makeSpecification(
> +            title="Crumby Specification", product=self.product)
> +        self.specification_url = canonical_url(
> +            self.specification, rootsite='blueprints')
> +
> +    def test_specification(self):
> +        crumbs = self._getBreadcrumbs(
> +            self.specification_url,
> +            [self.root, self.product, self.specification])
> +        last_crumb = crumbs[-1]
> +        self.assertEquals(last_crumb.url, self.specification_url)
> +        self.assertEquals(
> +            last_crumb.text, self.specification.title)
> +
> +
>  def test_suite():
>      return unittest.TestLoader().loadTestsFromName(__name__)
>
>
> === modified file 'lib/lp/blueprints/configure.zcml'
> --- lib/lp/blueprints/configure.zcml	2009-09-03 15:04:13 +0000
> +++ lib/lp/blueprints/configure.zcml	2009-09-16 12:38:58 +0000
> @@ -35,6 +35,11 @@
>          for="lp.blueprints.interfaces.sprint.ISprintSet"
>          factory="lp.blueprints.browser.sprint.SprintSetBreadcrumb"
>          permission="zope.Public"/>
> +    <adapter
> +        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
> +        for="lp.blueprints.interfaces.specification.ISpecification"
> +        factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
> +        permission="zope.Public"/>
>
>      <!-- This is a view used to export data needed by the sprint scheduler.
>                           As there are no API stability guarantees, the view name starts
>
> === modified file 'lib/lp/blueprints/stories/blueprints/sprint-links.txt'
> --- lib/lp/blueprints/stories/blueprints/sprint-links.txt	2009-05-11 18:19:21 +0000
> +++ lib/lp/blueprints/stories/blueprints/sprint-links.txt	2009-09-16 12:38:58 +0000
> @@ -22,7 +22,7 @@
>
>    >>> browser.getLink('Propose for sprint').click()
>    >>> browser.title
> -  'Put blueprint on sprint agenda'
> +  '+linksprint : Support <canvas> Objects : Blueprints for Mozilla Firefox : Mozilla Firefox'
>
>  The page contains a link back to the blueprint, in case we change our
>  mind.
>
> === modified file 'lib/lp/blueprints/stories/blueprints/xx-branch-links.txt'
> --- lib/lp/blueprints/stories/blueprints/xx-branch-links.txt	2009-09-09 06:37:22 +0000
> +++ lib/lp/blueprints/stories/blueprints/xx-branch-links.txt	2009-09-16 12:38:58 +0000
> @@ -86,7 +86,7 @@
>      There is 1 error.
>      This branch has already been linked to the blueprint
>
> -    >>> browser.getControl('Cancel').click()
> +    >>> browser.getLink('Cancel').click()

Maybe you ought to document all the other cancel links you added?

>
>
>  == Deleting a Branch Link ==
>
> === modified file 'lib/lp/blueprints/stories/blueprints/xx-overview.txt'
> --- lib/lp/blueprints/stories/blueprints/xx-overview.txt	2009-09-09 23:16:08 +0000
> +++ lib/lp/blueprints/stories/blueprints/xx-overview.txt	2009-09-16 12:38:58 +0000
> @@ -52,9 +52,11 @@
>      >>> browser.getLink('Propose as goal').click()
>      >>> main = find_main_content(browser.contents)
>      >>> print extract_text(main).encode('ascii', 'backslashreplace')
> +    Target to a product series
> +    Mozilla Firefox
> +    ...
>      Support Native SVG Objects
> -    Select the release series of Mozilla Firefox
> -    for which this feature should be implemented...
> +    ...
>
>      >>> series = browser.getControl('Series Goal')
>      >>> series.displayValue = ['firefox 1.0']
> @@ -149,9 +151,11 @@
>      >>> browser.getLink('Propose as goal').click()
>      >>> main = find_main_content(browser.contents)
>      >>> print extract_text(main).encode('ascii', 'backslashreplace')
> +    Target to a distribution series
> +    Ubuntu
> +    ...
>      CD Media Integrity Check
> -    Select the release of Ubuntu for which this blueprint should be
> -    a feature goal...
> +    ...
>      >>> series = browser.getControl('Series Goal')
>      >>> series.displayValue = ['ubuntu grumpy']
>      >>> browser.getControl('Continue').click()
>
> === removed file 'lib/lp/blueprints/templates/specification-addsubscriber.pt'
> --- lib/lp/blueprints/templates/specification-addsubscriber.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-addsubscriber.pt	1970-01-01 00:00:00 +0000
> @@ -1,25 +0,0 @@
> -<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="launchpad"
> ->
> -  <body>
> -
> -<div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -
> -  <div metal:use-macro="context/@@launchpad_form/form">
> -
> -  </div>
> -
> -</div>
> -
> -</body>
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/specification-dependency.pt'
> --- lib/lp/blueprints/templates/specification-dependency.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-dependency.pt	1970-01-01 00:00:00 +0000
> @@ -1,30 +0,0 @@
> -<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="launchpad"
> ->
> -
> -  <body>
> -
> -    <metal:leftportlets fill-slot="portlets_one">
> -      <div tal:replace="structure context/@@+portlet-dependencies" />
> -    </metal:leftportlets>
> -
> -    <div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -      <div metal:use-macro="context/@@launchpad_form/form">
> -
> -      </div>
> -
> -    </div>
> -
> -  </body>
> -
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/specification-distroseries.pt'
> --- lib/lp/blueprints/templates/specification-distroseries.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-distroseries.pt	1970-01-01 00:00:00 +0000
> @@ -1,38 +0,0 @@
> -<tal:root
> -  xmlns:tal="http://xml.zope.org/namespaces/tal"
> -  xmlns:metal="http://xml.zope.org/namespaces/metal"
> -  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
> -  omit-tag="">
> -
> -<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="launchpad"
> ->
> -
> -<body>
> -
> -  <div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -
> -    <div metal:use-macro="context/@@launchpad_form/form">
> -
> -    <p metal:fill-slot="extra_info">
> -      Select the release of
> -      <span tal:replace="context/distribution/displayname">Ubuntu</span>
> -      for which this blueprint should be a feature goal.
> -    </p>
> -
> -  </div>
> -
> -</div>
> -</body>
> -</html>
> -</tal:root>
>
> === removed file 'lib/lp/blueprints/templates/specification-linkbranch.pt'
> --- lib/lp/blueprints/templates/specification-linkbranch.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-linkbranch.pt	1970-01-01 00:00:00 +0000
> @@ -1,28 +0,0 @@
> -<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="launchpad"
> ->
> -  <body>
> -
> -  <div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -      <div metal:use-macro="context/@@launchpad_form/form" />
> -
> -  </div>
> -
> -  <div metal:fill-slot="help">
> -    <p>If you have a branch related to a blueprint (implementing
> -    the feature, or fixing the problem the blueprint outlines),
> -    you can create a link between them.  The summary field can be used
> -    to leave a note about the relationship.</p>
> -  </div>
> -</body>
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/specification-linksprint.pt'
> --- lib/lp/blueprints/templates/specification-linksprint.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-linksprint.pt	1970-01-01 00:00:00 +0000
> @@ -1,24 +0,0 @@
> -<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="launchpad"
> ->
> -
> -<body>
> -
> -<div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -
> -  <div metal:use-macro="context/@@launchpad_form/form" />
> -
> -</div>
> -
> -</body>
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/specification-new.pt'
> --- lib/lp/blueprints/templates/specification-new.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-new.pt	1970-01-01 00:00:00 +0000
> @@ -1,29 +0,0 @@
> -<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="view/macro:page/applicationhome"
> -  i18n:domain="specifications">
> -
> -<body>
> -
> -<h1 metal:fill-slot="heading">Blueprint tracking</h1>
> -
> -<metal:leftportlets fill-slot="portlets_one">
> -</metal:leftportlets>
> -
> -<metal:rightportlets fill-slot="portlets_two">
> -</metal:rightportlets>
> -
> -<div metal:fill-slot="main">
> -
> -  <div metal:use-macro="context/@@launchpad_form/form" />
> -
> -</div>
> -
> -</body>
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/specification-productseries.pt'
> --- lib/lp/blueprints/templates/specification-productseries.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-productseries.pt	1970-01-01 00:00:00 +0000
> @@ -1,33 +0,0 @@
> -<tal:root
> -  xmlns:tal="http://xml.zope.org/namespaces/tal"
> -  xmlns:metal="http://xml.zope.org/namespaces/metal"
> -  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
> -  omit-tag="">
> -
> -<html
> -    xmlns="http://www.w3.org/1999/xhtml"
> -    xml:lang="en"
> -    lang="en"
> -    metal:use-macro="context/@@main_template/master"
> -    i18n:domain="launchpad">
> -
> -<body>
> -
> -  <div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -
> -    <div metal:use-macro="context/@@launchpad_form/form">
> -
> -    <p metal:fill-slot="extra_info">
> -      Select the release series of
> -      <span tal:replace="context/product/displayname">Firefox</span>
> -      for which this feature should be implemented.
> -    </p>
> -
> -  </div>
> -
> -</div>
> -</body>
> -</html>
> -</tal:root>
>
> === removed file 'lib/lp/blueprints/templates/specification-removedep.pt'
> --- lib/lp/blueprints/templates/specification-removedep.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-removedep.pt	1970-01-01 00:00:00 +0000
> @@ -1,38 +0,0 @@
> -<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="launchpad"
> ->
> -
> -<body>
> -
> -<metal:portlets fill-slot="portlets">
> -  <div tal:replace="structure context/@@+portlet-dependencies" />
> -</metal:portlets>
> -
> -<div metal:fill-slot="main">
> -
> -      <div>
> -        <img alt="" src="/@@/blueprint" />
> -        <a tal:attributes="href context/fmt:url" tal:content="context/title" />
> -      </div>
> -
> -  <div metal:use-macro="context/@@launchpad_form/form">
> -
> -    <p metal:fill-slot="extra_info">
> -      This will <em>remove</em> the dependency on the selected blueprint.
> -    </p>
> -
> -  </div>
> -
> -</div>
> -
> -</body>
> -</html>
> -
>
> === removed file 'lib/lp/blueprints/templates/specification-retargeting.pt'
> --- lib/lp/blueprints/templates/specification-retargeting.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specification-retargeting.pt	1970-01-01 00:00:00 +0000
> @@ -1,36 +0,0 @@
> -<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="launchpad"
> ->
> -
> -<body>
> -
> -<div metal:fill-slot="main">
> -
> -      <div tal:content="structure context/fmt:link" />
> -
> -  <div metal:use-macro="context/@@launchpad_form/form">
> -
> -    <h1 tal:condition="view/label"
> -        tal:content="view/label"
> -        metal:fill-slot="heading">Heading from ZCML label="xxx"</h1>
> -
> -    <div metal:fill-slot="extra_info" class="documentDescription">
> -      You can target the blueprint to a different project. Be careful, when
> -      you retarget the blueprint you will lose any goal or milestone
> -      information for it.
> -    </div>
> -
> -  </div>
> -
> -</div>
> -
> -</body>
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/specificationsubscription-edit.pt'
> --- lib/lp/blueprints/templates/specificationsubscription-edit.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/specificationsubscription-edit.pt	1970-01-01 00:00:00 +0000
> @@ -1,31 +0,0 @@
> -<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="launchpad"
> ->
> -
> -<body>
> -
> -<metal:portlets fill-slot="portlets">
> -  <div tal:replace="structure context/person/@@+portlet-details" />
> -</metal:portlets>
> -
> -<div metal:fill-slot="main">
> -
> -  <div>
> -    <img alt="" src="/@@/blueprint" />
> -    <a tal:attributes="href context/specification/fmt:url"
> -       tal:content="context/specification/title" />
> -  </div>
> -
> -  <div metal:use-macro="context/@@launchpad_form/form" />
> -
> -</div>
> -</body>
> -</html>
>
> === removed file 'lib/lp/blueprints/templates/sprint-edit.pt'
> --- lib/lp/blueprints/templates/sprint-edit.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/blueprints/templates/sprint-edit.pt	1970-01-01 00:00:00 +0000
> @@ -1,35 +0,0 @@
> -<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="launchpad"
> ->
> -
> -<body>
> -
> -<metal:leftportlets fill-slot="portlets_one">
> -  <div tal:replace="structure context/@@+portlet-attendees" />
> -</metal:leftportlets>
> -
> -<metal:rightportlets fill-slot="portlets_two">
> -  <div tal:replace="structure context/@@+portlet-details" />
> -</metal:rightportlets>
> -
> -<div metal:fill-slot="main">
> -
> -  <div metal:use-macro="context/@@launchpad_form/form" />
> -
> -</div>
> -
> -<div metal:fill-slot="help">
> -<p>Note that the start and end dates for the sprint are treated as
> -local time for the sprint.</p>
> -</div>
> -
> -</body>
> -</html>

Ah, all those minuses felt so good :)

>
> === modified file 'lib/lp/registry/stories/branding/xx-object-branding.txt'
> --- lib/lp/registry/stories/branding/xx-object-branding.txt	2009-08-23 05:28:49 +0000
> +++ lib/lp/registry/stories/branding/xx-object-branding.txt	2009-09-16 12:38:58 +0000
> @@ -263,7 +263,6 @@
>      >>> browser.open('http://launchpad.dev/sprints/futurista')
>      >>> browser.url
>      'http://launchpad.dev/sprints/futurista'
> -    >>> browser.getLink('Change details').click()
>      >>> browser.getLink('Change branding').click()
>      >>> browser.url
>      'http://launchpad.dev/sprints/futurista/+branding'
> @@ -287,7 +286,6 @@
>
>      >>> browser.url
>      'http://launchpad.dev/sprints/futurista'
> -    >>> browser.getLink('Change details').click()
>      >>> browser.getLink('Change branding').click()
>
>      >>> browser.getControl(name='field.logo.action').value
>