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
=== 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-16 14:59:16 +0000
@@ -987,8 +987,6 @@
987987
988sprint_workload = ContextTitle('Workload at %s')988sprint_workload = ContextTitle('Workload at %s')
989989
990sprintspecification_decide = 'Consider spec for sprint agenda'
991
992sprintspecification_admin = 'Approve blueprint for sprint agenda'990sprintspecification_admin = 'Approve blueprint for sprint agenda'
993991
994standardshipitrequests_index = 'Standard ShipIt options'992standardshipitrequests_index = 'Standard ShipIt options'
995993
=== modified file 'lib/lp/blueprints/browser/sprintspecification.py'
--- lib/lp/blueprints/browser/sprintspecification.py 2009-06-25 00:00:26 +0000
+++ lib/lp/blueprints/browser/sprintspecification.py 2009-09-18 21:18:47 +0000
@@ -10,10 +10,16 @@
10 ]10 ]
1111
12from canonical.launchpad.webapp import canonical_url, LaunchpadView12from canonical.launchpad.webapp import canonical_url, LaunchpadView
13from canonical.lazr.utils import smartquote
1314
1415
15class SprintSpecificationDecideView(LaunchpadView):16class SprintSpecificationDecideView(LaunchpadView):
1617
18 @property
19 def label(self):
20 return smartquote(
21 'Consider agenda item for "%s"' % self.context.sprint.title)
22
17 def initialize(self):23 def initialize(self):
18 accept = self.request.form.get('accept')24 accept = self.request.form.get('accept')
19 decline = self.request.form.get('decline')25 decline = self.request.form.get('decline')
2026
=== modified file 'lib/lp/blueprints/templates/sprintspecification-decide.pt'
--- lib/lp/blueprints/templates/sprintspecification-decide.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprintspecification-decide.pt 2009-09-18 17:22:58 +0000
@@ -3,32 +3,21 @@
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>
129
13<body>10<body>
1411
15<metal:rightportlets fill-slot="portlets_two">
16 <div tal:replace="structure context/sprint/@@+portlet-details" />
17</metal:rightportlets>
18
19<div metal:fill-slot="main">12<div metal:fill-slot="main">
2013
14 <form method="POST" action=".">
15
16 <div>
17 <h2>Specification summary:</h2>
18
21 <div tal:content="structure context/specification/fmt:link" />19 <div tal:content="structure context/specification/fmt:link" />
2220
23 <h1>Accept for agenda of <span
24 tal:replace="context/sprint/title">Firefox</span>?</h1>
25
26 <form method="POST" action=".">
27
28 <div>
29
30 <h3>Specification summary:</h3>
31
32 <p tal:content="context/specification/summary">21 <p tal:content="context/specification/summary">
33 Summary here22 Summary here
34 </p>23 </p>
@@ -36,13 +25,11 @@
36 </div>25 </div>
3726
38 <div>27 <div>
3928 <h2>Sprint details:</h2>
40 <h3>Sprint details:</h3>
4129
42 <p tal:content="context/sprint/summary">30 <p tal:content="context/sprint/summary">
43 Summary here31 Summary here
44 </p>32 </p>
45
46 </div>33 </div>
4734
48 <p>35 <p>