Merge lp:~cjohnston/launchpad-work-items-tracker/add-milestones-to-pages into lp:launchpad-work-items-tracker

Proposed by Chris Johnston
Status: Merged
Merged at revision: 312
Proposed branch: lp:~cjohnston/launchpad-work-items-tracker/add-milestones-to-pages
Merge into: lp:launchpad-work-items-tracker
Diff against target: 125 lines (+28/-56)
3 files modified
html-report (+4/-1)
templates/burndown.html (+14/-36)
themes/ubuntu/css/theme.css (+10/-19)
To merge this branch: bzr merge lp:~cjohnston/launchpad-work-items-tracker/add-milestones-to-pages
Reviewer Review Type Date Requested Status
Developers of work-items-tracker Pending
Review via email: mp+165919@code.launchpad.net

This proposal has been superseded by a proposal from 2013-05-28.

Commit message

Adds milestone links to team, assignee, and milestone pages

Description of the change

Currently there are no links to team and assignee milestone pages. This makes it quite hard to do monthly planning. This adds links to team pages for team milestones, assignee pages to assignee milestones, and milestone pages to the other milestones.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'html-report'
2--- html-report 2013-01-10 05:28:17 +0000
3+++ html-report 2013-05-27 17:35:39 +0000
4@@ -364,10 +364,13 @@
5 data.update(spec_completion(db, opts.team, milestone_collection=milestone_collection))
6 data.update(by_assignee(db, team=opts.team, milestone_collection=milestone_collection))
7 data.update(time_stats(db, team=opts.team, milestone_collection=milestone_collection))
8+ data.update(
9+ milestone_groups=report_tools.milestone_groups(
10+ db, team=opts.team))
11 if milestone_collection is not None:
12 data.update(dict(page_type="milestones"))
13 elif isinstance(opts.team, report_tools.user_string):
14- data.update(dict(page_type="people"))
15+ data.update(dict(page_type="people"), assignee=True)
16 else:
17 data.update(dict(page_type="teams"))
18 print report_tools.fill_template(
19
20=== modified file 'templates/burndown.html'
21--- templates/burndown.html 2012-06-20 21:05:33 +0000
22+++ templates/burndown.html 2013-05-27 17:35:39 +0000
23@@ -177,42 +177,20 @@
24
25 </table>
26
27-<h2>Work items as Cards</h2>
28-<table id="workitemcards">
29-<thead>
30- <tr>
31-% for status in valid_states:
32- <th>${state_labels[valid_states.index(status)]}</th>
33-% endfor
34- </tr>
35-</thead>
36-
37-% for a in assignees:
38-<tr>
39- <td colspan="${len(valid_states)}">${util.real_name(a.name)}</td>
40-</tr>
41-
42-<tr>
43-% for status in valid_states:
44- <td>
45-% for bp, item, priority, url in getattr(a, status+"_wis"):
46- <table border="0" class="workitemcard">
47- <tr>
48- <td colspan="2">${item}</td>
49- </tr>
50- <tr>
51- <td><a href="${url}">${bp}</a></td>
52- <td class="priority_${priority}">${priority}</td>
53- </tr>
54- </table>
55-% endfor
56- </td>
57-% endfor
58-</tr>
59-% endfor
60-</table>
61-
62-
63+% if milestone_groups:
64+<h2>Milestones</h2>
65+<ul class="list list-ubuntu">
66+ % for group in milestone_groups:
67+ % for milestone in group.milestones:
68+ % if assignee:
69+ <li><a href="${util.url('u/' + milestone.link)}">${milestone.name}</a></li>
70+ % else:
71+ <li><a href="${util.url(milestone.link)}">${milestone.name}</a></li>
72+ % endif
73+ % endfor
74+ % endfor
75+</ul>
76+% endif
77 <h2>Development over time</h2>
78 <table id="time_stats">
79 <thead>
80
81=== modified file 'themes/ubuntu/css/theme.css'
82--- themes/ubuntu/css/theme.css 2012-06-20 21:41:25 +0000
83+++ themes/ubuntu/css/theme.css 2013-05-27 17:35:39 +0000
84@@ -177,6 +177,16 @@
85 line-height: 1.4;
86 }
87
88+.list-ubuntu li {
89+ background-repeat : no-repeat;
90+ background-position : 0 15px;
91+ padding-left : 25px;
92+}
93+
94+.list-ubuntu li {
95+ background-image : url("//assets.ubuntu.com/sites/community-themes/img/tick-orange.png");
96+}
97+
98 strong {
99 font-weight: bold
100 }
101@@ -1061,25 +1071,6 @@
102 background: #ffffff;
103 }
104
105-table#workitemcards th {
106- min-width: 150px;
107-}
108-
109-table.workitemcard td {
110- background-color: #AEA79F;
111- color: #FFFFFF;
112-}
113-
114-table.workitemcard td.priority_Undefined { color: #FFFFFF; text-align: right;}
115-table.workitemcard td.priority_Low { color: #19B6EE; text-align: right;}
116-table.workitemcard td.priority_Medium { color: #f60; text-align: right;}
117-table.workitemcard td.priority_High { color: #DF382C; text-align: right;}
118-table.workitemcard td.priority_Essential { color: #DF382C; text-align: right;}
119-
120-table.workitemcard {
121- margin: 6px;
122-}
123-
124 /*- Tooltips
125 -------------------------------------------------------------------------------------------------------- */
126

Subscribers

People subscribed via source and target branches

to all changes: