Merge lp:~edwin-grubbs/launchpad/bug-430590-specificationgoal-setgoals.pt-3.0-layout into lp:launchpad

Proposed by Edwin Grubbs
Status: Merged
Approved by: Barry Warsaw
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~edwin-grubbs/launchpad/bug-430590-specificationgoal-setgoals.pt-3.0-layout
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~edwin-grubbs/launchpad/bug-430590-specificationgoal-setgoals.pt-3.0-layout
Reviewer Review Type Date Requested Status
Barry Warsaw (community) code ui* Approve
Review via email: mp+12095@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Convert specification-setgoals.pt to UI 3.0.

./bin/test -vvt stories/blueprints

Revision history for this message
Barry Warsaw (barry) wrote :

Code and ui looks good, thanks!

review: Approve (code ui*)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/pagetitles.py'
2--- lib/canonical/launchpad/pagetitles.py 2009-09-16 01:35:03 +0000
3+++ lib/canonical/launchpad/pagetitles.py 2009-09-18 19:47:24 +0000
4@@ -953,8 +953,6 @@
5
6 specificationgoal_specs = ContextTitle('List goals for %s')
7
8-specificationgoal_setgoals = ContextTitle('Set goals for %s')
9-
10 def specificationsubscription_edit(context, view):
11 """Return the page title for subscribing to a specification."""
12 return "Subscription of %s" % context.person.displayname
13
14=== modified file 'lib/lp/blueprints/browser/specificationgoal.py'
15--- lib/lp/blueprints/browser/specificationgoal.py 2009-06-25 00:00:26 +0000
16+++ lib/lp/blueprints/browser/specificationgoal.py 2009-09-18 19:47:24 +0000
17@@ -29,6 +29,8 @@
18 add/edit metaphor.
19 """
20
21+ label = "Set feature goals"
22+
23 @cachedproperty
24 def spec_filter(self):
25 """This page always filters for specs which have been proposed
26
27=== modified file 'lib/lp/blueprints/templates/specificationgoal-setgoals.pt'
28--- lib/lp/blueprints/templates/specificationgoal-setgoals.pt 2009-07-17 17:59:07 +0000
29+++ lib/lp/blueprints/templates/specificationgoal-setgoals.pt 2009-09-18 19:47:24 +0000
30@@ -3,22 +3,11 @@
31 xmlns:tal="http://xml.zope.org/namespaces/tal"
32 xmlns:metal="http://xml.zope.org/namespaces/metal"
33 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
34- xml:lang="en"
35- lang="en"
36- dir="ltr"
37- metal:use-macro="context/@@main_template/master"
38+ metal:use-macro="view/macro:page/main_only"
39 i18n:domain="launchpad"
40 >
41 <body>
42
43-<metal:rightportlets fill-slot="portlets_two">
44- <div tal:replace="structure context/@@+portlet-latestspecs" />
45-</metal:rightportlets>
46-
47-<metal:heading fill-slot="pageheading">
48- <h1>Set feature goals</h1>
49-</metal:heading>
50-
51 <div metal:fill-slot="main">
52
53 <p class="documentDescription">
54@@ -54,10 +43,12 @@
55 tal:content="spec/priority/title">High</span><br />
56 <span tal:attributes="
57 class string:specstatus${spec/definition_status/name}"
58- tal:content="spec/definition_status/title">New</span><br />
59+ tal:content="spec/definition_status/title">New</span>
60+ <br />
61 <span tal:attributes="
62 class string:specdelivery${spec/implementation_status/name}"
63- tal:content="spec/implementation_status/title">New</span><br />
64+ tal:content="spec/implementation_status/title">New</span>
65+ <br />
66 </td>
67 <td>
68 <label tal:attributes="for string:spec_${spec/name}">
69@@ -65,7 +56,7 @@
70 </label>
71 <div>
72 <img src="/@@/blueprint" />&nbsp;<a
73- tal:attributes="href spec/fmt:url">Details</a >
74+ tal:attributes="href spec/fmt:url">Details</a>
75 <tal:weblink condition="spec/specurl">
76 <img src="/@@/link" />&nbsp;<a
77 tal:attributes="href spec/specurl">Blueprint</a>