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
=== 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 19:47:24 +0000
@@ -953,8 +953,6 @@
953953
954specificationgoal_specs = ContextTitle('List goals for %s')954specificationgoal_specs = ContextTitle('List goals for %s')
955955
956specificationgoal_setgoals = ContextTitle('Set goals for %s')
957
958def specificationsubscription_edit(context, view):956def specificationsubscription_edit(context, view):
959 """Return the page title for subscribing to a specification."""957 """Return the page title for subscribing to a specification."""
960 return "Subscription of %s" % context.person.displayname958 return "Subscription of %s" % context.person.displayname
961959
=== modified file 'lib/lp/blueprints/browser/specificationgoal.py'
--- lib/lp/blueprints/browser/specificationgoal.py 2009-06-25 00:00:26 +0000
+++ lib/lp/blueprints/browser/specificationgoal.py 2009-09-18 19:47:24 +0000
@@ -29,6 +29,8 @@
29 add/edit metaphor.29 add/edit metaphor.
30 """30 """
3131
32 label = "Set feature goals"
33
32 @cachedproperty34 @cachedproperty
33 def spec_filter(self):35 def spec_filter(self):
34 """This page always filters for specs which have been proposed36 """This page always filters for specs which have been proposed
3537
=== modified file 'lib/lp/blueprints/templates/specificationgoal-setgoals.pt'
--- lib/lp/blueprints/templates/specificationgoal-setgoals.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/specificationgoal-setgoals.pt 2009-09-18 19:47:24 +0000
@@ -3,22 +3,11 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8>
12<body>9<body>
1310
14<metal:rightportlets fill-slot="portlets_two">
15 <div tal:replace="structure context/@@+portlet-latestspecs" />
16</metal:rightportlets>
17
18<metal:heading fill-slot="pageheading">
19 <h1>Set feature goals</h1>
20</metal:heading>
21
22<div metal:fill-slot="main">11<div metal:fill-slot="main">
2312
24 <p class="documentDescription">13 <p class="documentDescription">
@@ -54,10 +43,12 @@
54 tal:content="spec/priority/title">High</span><br />43 tal:content="spec/priority/title">High</span><br />
55 <span tal:attributes="44 <span tal:attributes="
56 class string:specstatus${spec/definition_status/name}"45 class string:specstatus${spec/definition_status/name}"
57 tal:content="spec/definition_status/title">New</span><br />46 tal:content="spec/definition_status/title">New</span>
47 <br />
58 <span tal:attributes="48 <span tal:attributes="
59 class string:specdelivery${spec/implementation_status/name}"49 class string:specdelivery${spec/implementation_status/name}"
60 tal:content="spec/implementation_status/title">New</span><br />50 tal:content="spec/implementation_status/title">New</span>
51 <br />
61 </td>52 </td>
62 <td>53 <td>
63 <label tal:attributes="for string:spec_${spec/name}">54 <label tal:attributes="for string:spec_${spec/name}">
@@ -65,7 +56,7 @@
65 </label>56 </label>
66 <div>57 <div>
67 <img src="/@@/blueprint" />&nbsp;<a58 <img src="/@@/blueprint" />&nbsp;<a
68 tal:attributes="href spec/fmt:url">Details</a >59 tal:attributes="href spec/fmt:url">Details</a>
69 <tal:weblink condition="spec/specurl">60 <tal:weblink condition="spec/specurl">
70 <img src="/@@/link" />&nbsp;<a61 <img src="/@@/link" />&nbsp;<a
71 tal:attributes="href spec/specurl">Blueprint</a>62 tal:attributes="href spec/specurl">Blueprint</a>