Merge lp:~edwin-grubbs/launchpad/bug-430739-sprintspecification-decide.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-430739-sprintspecification-decide.pt-3.0-layout
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~edwin-grubbs/launchpad/bug-430739-sprintspecification-decide.pt-3.0-layout
Reviewer Review Type Date Requested Status
Barry Warsaw (community) code ui* Approve
Review via email: mp+12105@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Summary
-------

Converted sprintspecification-decide.pt to UI 3.0.

Tests
-----

./bin/test -vv -t sprint-links.txt

Demo and Q/A
------------

* Open https://blueprints.launchpad.dev/firefox/+spec/canvas
  * Click on the "Propose for Sprint" link.
  * After submitting the form, you will see either a green checkmark or a blue question mark depending on whether you have edit privs. You must have edit privs for that icon to be linkified. Click on it.
  * You will now be presented with a form where you can accept or decline the item from the agenda.

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

Nice. These are getting easy now aren't they? :)

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-16 14:59:16 +0000
4@@ -987,8 +987,6 @@
5
6 sprint_workload = ContextTitle('Workload at %s')
7
8-sprintspecification_decide = 'Consider spec for sprint agenda'
9-
10 sprintspecification_admin = 'Approve blueprint for sprint agenda'
11
12 standardshipitrequests_index = 'Standard ShipIt options'
13
14=== modified file 'lib/lp/blueprints/browser/sprintspecification.py'
15--- lib/lp/blueprints/browser/sprintspecification.py 2009-06-25 00:00:26 +0000
16+++ lib/lp/blueprints/browser/sprintspecification.py 2009-09-18 21:18:47 +0000
17@@ -10,10 +10,16 @@
18 ]
19
20 from canonical.launchpad.webapp import canonical_url, LaunchpadView
21+from canonical.lazr.utils import smartquote
22
23
24 class SprintSpecificationDecideView(LaunchpadView):
25
26+ @property
27+ def label(self):
28+ return smartquote(
29+ 'Consider agenda item for "%s"' % self.context.sprint.title)
30+
31 def initialize(self):
32 accept = self.request.form.get('accept')
33 decline = self.request.form.get('decline')
34
35=== modified file 'lib/lp/blueprints/templates/sprintspecification-decide.pt'
36--- lib/lp/blueprints/templates/sprintspecification-decide.pt 2009-07-17 17:59:07 +0000
37+++ lib/lp/blueprints/templates/sprintspecification-decide.pt 2009-09-18 17:22:58 +0000
38@@ -3,32 +3,21 @@
39 xmlns:tal="http://xml.zope.org/namespaces/tal"
40 xmlns:metal="http://xml.zope.org/namespaces/metal"
41 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
42- xml:lang="en"
43- lang="en"
44- dir="ltr"
45- metal:use-macro="context/@@main_template/master"
46+ metal:use-macro="view/macro:page/main_only"
47 i18n:domain="launchpad"
48 >
49
50 <body>
51
52-<metal:rightportlets fill-slot="portlets_two">
53- <div tal:replace="structure context/sprint/@@+portlet-details" />
54-</metal:rightportlets>
55-
56 <div metal:fill-slot="main">
57
58+ <form method="POST" action=".">
59+
60+ <div>
61+ <h2>Specification summary:</h2>
62+
63 <div tal:content="structure context/specification/fmt:link" />
64
65- <h1>Accept for agenda of <span
66- tal:replace="context/sprint/title">Firefox</span>?</h1>
67-
68- <form method="POST" action=".">
69-
70- <div>
71-
72- <h3>Specification summary:</h3>
73-
74 <p tal:content="context/specification/summary">
75 Summary here
76 </p>
77@@ -36,13 +25,11 @@
78 </div>
79
80 <div>
81-
82- <h3>Sprint details:</h3>
83+ <h2>Sprint details:</h2>
84
85 <p tal:content="context/sprint/summary">
86 Summary here
87 </p>
88-
89 </div>
90
91 <p>