Launchpad itself

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

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

Converted sprint-register.pt to UI 3.0.

./bin/test -vvt sprint

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

This merge-proposal is finishing up https://code.edge.launchpad.net/~adeuring/launchpad/bug-430663-sprint-register.pt-3.0.-layout/+merge/11870

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

On Sep 18, 2009, at 05:50 PM, Edwin Grubbs wrote:

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

Thanks for taking over on this branch. The ui looks great. I have just a
minor comment on the code, so merge-conditional.

 review approve code ui*
 status approve

=== modified file 'lib/lp/blueprints/browser/sprintattendance.py'
--- lib/lp/blueprints/browser/sprintattendance.py 2009-06-25 00:00:26 +0000
+++ lib/lp/blueprints/browser/sprintattendance.py 2009-09-18 17:38:55 +0000
> @@ -145,6 +145,7 @@
> class SprintAttendanceRegisterView(BaseSprintAttendanceAddView):
> """A view used to register someone else's attendance at a sprint."""
>
> + label = page_title = 'Register someone to attend this meeting'

This is a duplicate, unnecessary line. You don't need to set the page_title
and you already set the label below.

> field_names = ['attendee', 'time_starts', 'time_ends']
>
> @property
> @@ -157,3 +158,5 @@
> def register_action(self, action, data):
> time_starts, time_ends = self.getDates(data)
> self.context.attend(data['attendee'], time_starts, time_ends)
> +
> + label = 'Register someone else'

Just move this line up instead of the previous line and you'll be fine.

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 17:38:55 +0000
4@@ -979,8 +979,6 @@
5
6 sprint_new = 'Register a meeting or sprint in Launchpad'
7
8-sprint_register = 'Register someone to attend this meeting'
9-
10 sprint_specs = ContextTitle('Blueprints for %s')
11
12 sprint_settopics = ContextTitle('Review topics proposed for discussion at %s')
13
14=== modified file 'lib/lp/blueprints/browser/sprintattendance.py'
15--- lib/lp/blueprints/browser/sprintattendance.py 2009-06-25 00:00:26 +0000
16+++ lib/lp/blueprints/browser/sprintattendance.py 2009-09-18 17:38:55 +0000
17@@ -145,6 +145,7 @@
18 class SprintAttendanceRegisterView(BaseSprintAttendanceAddView):
19 """A view used to register someone else's attendance at a sprint."""
20
21+ label = page_title = 'Register someone to attend this meeting'
22 field_names = ['attendee', 'time_starts', 'time_ends']
23
24 @property
25@@ -157,3 +158,5 @@
26 def register_action(self, action, data):
27 time_starts, time_ends = self.getDates(data)
28 self.context.attend(data['attendee'], time_starts, time_ends)
29+
30+ label = 'Register someone else'
31
32=== modified file 'lib/lp/blueprints/templates/sprint-register.pt'
33--- lib/lp/blueprints/templates/sprint-register.pt 2009-07-17 17:59:07 +0000
34+++ lib/lp/blueprints/templates/sprint-register.pt 2009-09-18 17:44:08 +0000
35@@ -3,47 +3,23 @@
36 xmlns:tal="http://xml.zope.org/namespaces/tal"
37 xmlns:metal="http://xml.zope.org/namespaces/metal"
38 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
39- xml:lang="en"
40- lang="en"
41- dir="ltr"
42- metal:use-macro="context/@@main_template/master"
43+ metal:use-macro="view/macro:page/main_only"
44 i18n:domain="launchpad"
45 >
46
47 <body>
48
49-<metal:leftportlets fill-slot="portlets_one">
50- <div tal:replace="structure context/@@+portlet-attendees" />
51-</metal:leftportlets>
52-
53-<metal:rightportlets fill-slot="portlets_two">
54- <div tal:replace="structure context/@@+portlet-details" />
55-</metal:rightportlets>
56-
57 <div metal:fill-slot="main">
58-
59 <div metal:use-macro="context/@@launchpad_form/form">
60
61- <h1 metal:fill-slot="heading">Register someone else</h1>
62-
63 <div metal:fill-slot="extra_info" class="documentDescription">
64 Use this form to register someone else to attend the meeting.
65 Use the sprint's local time.
66 </div>
67
68 </div>
69-
70-</div>
71-
72-<div metal:fill-slot="help">
73-<p>If you know that someone is attending the sprint, but has not yet
74-registered themselves, you can register them here.</p>
75-
76-<p>The times should be entered in the local time for the location of
77-the sprint, which is
78-<kbd tal:content="context/time_zone">UTC</kbd>.</p>
79-</div>
80-
81+</div>
82+
83 </body>
84 </html>
85