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
=== modified file 'html-report'
--- html-report 2013-01-10 05:28:17 +0000
+++ html-report 2013-05-27 17:35:39 +0000
@@ -364,10 +364,13 @@
364 data.update(spec_completion(db, opts.team, milestone_collection=milestone_collection))364 data.update(spec_completion(db, opts.team, milestone_collection=milestone_collection))
365 data.update(by_assignee(db, team=opts.team, milestone_collection=milestone_collection))365 data.update(by_assignee(db, team=opts.team, milestone_collection=milestone_collection))
366 data.update(time_stats(db, team=opts.team, milestone_collection=milestone_collection))366 data.update(time_stats(db, team=opts.team, milestone_collection=milestone_collection))
367 data.update(
368 milestone_groups=report_tools.milestone_groups(
369 db, team=opts.team))
367 if milestone_collection is not None:370 if milestone_collection is not None:
368 data.update(dict(page_type="milestones"))371 data.update(dict(page_type="milestones"))
369 elif isinstance(opts.team, report_tools.user_string):372 elif isinstance(opts.team, report_tools.user_string):
370 data.update(dict(page_type="people"))373 data.update(dict(page_type="people"), assignee=True)
371 else:374 else:
372 data.update(dict(page_type="teams"))375 data.update(dict(page_type="teams"))
373 print report_tools.fill_template(376 print report_tools.fill_template(
374377
=== modified file 'templates/burndown.html'
--- templates/burndown.html 2012-06-20 21:05:33 +0000
+++ templates/burndown.html 2013-05-27 17:35:39 +0000
@@ -177,42 +177,20 @@
177177
178</table>178</table>
179179
180<h2>Work items as Cards</h2>180% if milestone_groups:
181<table id="workitemcards">181<h2>Milestones</h2>
182<thead>182<ul class="list list-ubuntu">
183 <tr>183 % for group in milestone_groups:
184% for status in valid_states:184 % for milestone in group.milestones:
185 <th>${state_labels[valid_states.index(status)]}</th>185 % if assignee:
186% endfor186 <li><a href="${util.url('u/' + milestone.link)}">${milestone.name}</a></li>
187 </tr>187 % else:
188</thead>188 <li><a href="${util.url(milestone.link)}">${milestone.name}</a></li>
189189 % endif
190% for a in assignees:190 % endfor
191<tr>191 % endfor
192 <td colspan="${len(valid_states)}">${util.real_name(a.name)}</td>192</ul>
193</tr>193% endif
194
195<tr>
196% for status in valid_states:
197 <td>
198% for bp, item, priority, url in getattr(a, status+"_wis"):
199 <table border="0" class="workitemcard">
200 <tr>
201 <td colspan="2">${item}</td>
202 </tr>
203 <tr>
204 <td><a href="${url}">${bp}</a></td>
205 <td class="priority_${priority}">${priority}</td>
206 </tr>
207 </table>
208% endfor
209 </td>
210% endfor
211</tr>
212% endfor
213</table>
214
215
216<h2>Development over time</h2>194<h2>Development over time</h2>
217<table id="time_stats">195<table id="time_stats">
218 <thead>196 <thead>
219197
=== modified file 'themes/ubuntu/css/theme.css'
--- themes/ubuntu/css/theme.css 2012-06-20 21:41:25 +0000
+++ themes/ubuntu/css/theme.css 2013-05-27 17:35:39 +0000
@@ -177,6 +177,16 @@
177 line-height: 1.4;177 line-height: 1.4;
178}178}
179179
180.list-ubuntu li {
181 background-repeat : no-repeat;
182 background-position : 0 15px;
183 padding-left : 25px;
184}
185
186.list-ubuntu li {
187 background-image : url("//assets.ubuntu.com/sites/community-themes/img/tick-orange.png");
188}
189
180strong {190strong {
181 font-weight: bold191 font-weight: bold
182}192}
@@ -1061,25 +1071,6 @@
1061 background: #ffffff;1071 background: #ffffff;
1062}1072}
10631073
1064table#workitemcards th {
1065 min-width: 150px;
1066}
1067
1068table.workitemcard td {
1069 background-color: #AEA79F;
1070 color: #FFFFFF;
1071}
1072
1073table.workitemcard td.priority_Undefined { color: #FFFFFF; text-align: right;}
1074table.workitemcard td.priority_Low { color: #19B6EE; text-align: right;}
1075table.workitemcard td.priority_Medium { color: #f60; text-align: right;}
1076table.workitemcard td.priority_High { color: #DF382C; text-align: right;}
1077table.workitemcard td.priority_Essential { color: #DF382C; text-align: right;}
1078
1079table.workitemcard {
1080 margin: 6px;
1081}
1082
1083/*- Tooltips1074/*- Tooltips
1084-------------------------------------------------------------------------------------------------------- */1075-------------------------------------------------------------------------------------------------------- */
10851076

Subscribers

People subscribed via source and target branches

to all changes: