Merge lp:~edwin-grubbs/launchpad/bug-430610-sprint-settopics.pt-3.0-layout into lp:launchpad

[Edwin Grubbs]

[Edwin Grubbs (edwin-grubbs)]

Converted sprint-settopics.pt to UI 3.0.

./bin/test -vvt sprint

[Barry Warsaw (barry)]

On Sep 18, 2009, at 06:10 PM, Edwin Grubbs wrote:

>Edwin Grubbs has proposed merging lp:~edwin-grubbs/launchpad/bug-430610-sprint-settopics.pt-3.0-layout into lp:launchpad/devel.
>
>Requested reviews:
> Canonical Launchpad Engineering (launchpad): code
>
>Converted sprint-settopics.pt to UI 3.0.
>
>./bin/test -vvt sprint

Thanks for another great blueprint template update Edwin. I have some minor
comments that should be easy to resolve. merge-conditional, r=me with their
consideration.

 review approve code ui*
 status approve

=== 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-18 18:06:53 +0000
> @@ -50,6 +50,7 @@
> from canonical.launchpad.webapp.breadcrumb import Breadcrumb
> from canonical.launchpad.helpers import shortlist
> from canonical.widgets.date import DateTimeWidget
> +from canonical.lazr.utils import smartquote

Please sort these imports.

> class SprintFacets(StandardLaunchpadFacets):
> @@ -327,7 +328,15 @@
>
> It is unusual because we want to display multiple objects with
> checkboxes, then process the selected items, which is not the usual
> - add/edit metaphor."""
> + add/edit metaphor.
> + """
> +
> + @property
> + def label(self):
> + return smartquote(
> + 'Review discussion topics for "%s" sprint' % self.context.title)
> +
> + page_title = label

I bet you don't need the page_title. You should remove this so the default
reverse-breadcrumbs are used.

=== modified file 'lib/lp/blueprints/stories/sprints/sprint-settopics.txt'
--- lib/lp/blueprints/stories/sprints/sprint-settopics.txt 2009-08-13 19:03:36 +0000
+++ lib/lp/blueprints/stories/sprints/sprint-settopics.txt 2009-09-16 10:45:22 +0000
> @@ -70,7 +70,8 @@
> >>> cprov_browser.getLink('Set agenda').click()
>
> >>> cprov_browser.title
> - 'Review topics proposed for discussion at Ubuntu DevSummit Guacamole'
> + '+settopics : Blueprints for Ubuntu DevSummit Guacamole : Ubuntu
> + DevSummit Guacamole : Meetings'

You should print the title so the quotes aren't shown.

review: Approve (code ui*)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-16 01:35:03 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-18 18:06:53 +0000
@@ -983,8 +983,6 @@
 
 sprint_specs = ContextTitle('Blueprints for %s')
 
-sprint_settopics = ContextTitle('Review topics proposed for discussion at %s')
-
 sprint_workload = ContextTitle('Workload at %s')
 
 sprintspecification_decide = 'Consider spec for sprint agenda'

=== 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-18 18:06:53 +0000
@@ -50,6 +50,7 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.helpers import shortlist
 from canonical.widgets.date import DateTimeWidget
+from canonical.lazr.utils import smartquote
 
 
 class SprintFacets(StandardLaunchpadFacets):
@@ -327,7 +328,15 @@
 
     It is unusual because we want to display multiple objects with
     checkboxes, then process the selected items, which is not the usual
-    add/edit metaphor."""
+    add/edit metaphor.
+    """
+
+    @property
+    def label(self):
+        return smartquote(
+            'Review discussion topics for "%s" sprint' % self.context.title)
+
+    page_title = label
 
     def initialize(self):
         self.status_message = None

=== modified file 'lib/lp/blueprints/stories/sprints/sprint-settopics.txt'
--- lib/lp/blueprints/stories/sprints/sprint-settopics.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/blueprints/stories/sprints/sprint-settopics.txt	2009-09-16 10:45:22 +0000
@@ -70,7 +70,8 @@
   >>> cprov_browser.getLink('Set agenda').click()
 
   >>> cprov_browser.title
-  'Review topics proposed for discussion at Ubuntu DevSummit Guacamole'
+  '+settopics : Blueprints for Ubuntu DevSummit Guacamole : Ubuntu
+  DevSummit Guacamole : Meetings'
 
   >>> cprov_browser.getControl('CD Media Integrity Check').selected = True
   >>> cprov_browser.getControl('Accept').click()

=== modified file 'lib/lp/blueprints/templates/sprint-settopics.pt'
--- lib/lp/blueprints/templates/sprint-settopics.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprint-settopics.pt	2009-09-18 18:06:53 +0000
@@ -3,26 +3,12 @@
   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"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-details" />
-</metal:rightportlets>
-
-<metal:heading fill-slot="pageheading">
-  <h1>Set topics for discussion</h1>
-</metal:heading>
-
 <div metal:fill-slot="main"
      tal:define="speclinks view/spec_links">
 
@@ -56,7 +42,7 @@
                      value speclink/id;
                      id string:speclink_${speclink/id}" /><br />
               <span tal:attributes="
-                    class string:specpriority${spec/priority/name}" 
+                    class string:specpriority${spec/priority/name}"
                     tal:content="spec/priority/title">High</span><br />
               <span tal:attributes="
                     class string:specstatus${spec/definition_status/name}"