Merge lp:~fginther/kanban-tracker/prefix-icons into lp:kanban-tracker

Proposed by Francis Ginther
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 320
Merged at revision: 320
Proposed branch: lp:~fginther/kanban-tracker/prefix-icons
Merge into: lp:kanban-tracker
Diff against target: 222 lines (+130/-1)
3 files modified
css/status.css (+90/-0)
html-report (+36/-0)
themes/canonical/templates/burndown.html (+4/-1)
To merge this branch: bzr merge lp:~fginther/kanban-tracker/prefix-icons
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+120876@code.launchpad.net

Commit message

Replace card prefix text with icons

Description of the change

Replace card prefix text with icons

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/status.css'
2--- css/status.css 2011-05-18 20:51:50 +0000
3+++ css/status.css 2012-08-22 21:35:23 +0000
4@@ -35,6 +35,96 @@
5 td.priority_Essential, th.priority_Essential { color: red; }
6 td span.implementation_status { font-size: 70%; }
7
8+td.icon-bug-fix-task {
9+padding-left: 16px;
10+background: url('icon-bug-gray.png') no-repeat 0% 50%;
11+}
12+
13+td.icon-complete {
14+padding-left: 16px;
15+background: url('icon-circle-check-green.png') no-repeat 0% 50%;
16+}
17+
18+td.icon-defect {
19+padding-left: 16px;
20+background: url('icon-bug-gray.png') no-repeat 0% 50%;
21+}
22+
23+td.icon-design {
24+padding-left: 16px;
25+background: url('icon-paper-stack-white.png') no-repeat 0% 50%;
26+}
27+
28+td.icon-design-task {
29+padding-left: 16px;
30+background: url('icon-paper-stack-white.png') no-repeat 0% 50%;
31+}
32+
33+td.icon-epic {
34+padding-left: 16px;
35+background: url('icon-star-gold.png') no-repeat 0% 50%;
36+}
37+
38+td.icon-feature {
39+padding-left: 16px;
40+background: url('icon-paper-boxes-check-green.png') no-repeat 0% 50%;
41+}
42+
43+td.icon-feature-task {
44+padding-left: 16px;
45+background: url('icon-paper-boxes-check-green.png') no-repeat 0% 50%;
46+}
47+
48+td.icon-improvement {
49+padding-left: 16px;
50+background: url('icon-up-right-arrow.png') no-repeat 0% 50%;
51+}
52+
53+td.icon-improvement-task {
54+padding-left: 16px;
55+background: url('icon-up-right-arrow.png') no-repeat 0% 50%;
56+}
57+
58+td.icon-insufficient-resources {
59+padding-left: 16px;
60+background: url('icon-circle-minus-pink.png') no-repeat 0% 50%;
61+}
62+
63+td.icon-more-resources-required {
64+padding-left: 16px;
65+background: url('icon-circle-bang-yellow.png') no-repeat 0% 50%;
66+}
67+
68+td.icon-non-coding-task {
69+padding-left: 16px;
70+background: url('icon-pencil.png') no-repeat 0% 50%;
71+}
72+
73+td.icon-planning {
74+padding-left: 16px;
75+background: url('icon-paper-discussion.png') no-repeat 0% 50%;
76+}
77+
78+td.icon-sufficient-resourcing {
79+padding-left: 16px;
80+background: url('icon-circle-plus-green.png') no-repeat 0% 50%;
81+}
82+
83+td.icon-task {
84+padding-left: 16px;
85+background: url('icon-open-frame.png') no-repeat 0% 50%;
86+}
87+
88+td.icon-unknown {
89+padding-left: 16px;
90+background: url('icon-circle-question-blue.png') no-repeat 0% 50%;
91+}
92+
93+td.icon-user-story {
94+padding-left: 16px;
95+background: url('icon-two-people.png') no-repeat 0% 50%;
96+}
97+
98 .status-todo a {color: orange;}
99 .status-inprogress a {color: gray;}
100 .status-done a {color: green;}
101
102=== modified file 'html-report'
103--- html-report 2012-03-08 12:21:47 +0000
104+++ html-report 2012-08-22 21:35:23 +0000
105@@ -70,6 +70,42 @@
106 self.postponed_wis = postponed_wis
107 self.done_wis = done_wis
108
109+ def get_card_type(self, item):
110+ """Extracts the card type information from an item.
111+
112+ Returns the hover text, card icon, and modified item text. Assumes
113+ that every item will start with a card type."""
114+ type_lookup = {
115+ "[Bug Fix Task]": "icon-bug-fix-task",
116+ "[Complete]": "icon-complete",
117+ "[Defect]": "icon-defect",
118+ "[Design]": "icon-design",
119+ "[Design Task]": "icon-design-task",
120+ "[Epic]": "icon-epic",
121+ "[Feature]": "icon-feature",
122+ "[Feature Task]": "icon-feature-task",
123+ "[Improvement]": "icon-improvement",
124+ "[Improvement Task]": "icon-improvement-task",
125+ "[Insufficient Resources]": "icon-insufficient-resources",
126+ "[More Resources Required]": "icon-more-resources-required",
127+ "[Non-coding Task]": "icon-non-coding-task",
128+ "[Planning]": "icon-planning",
129+ "[Sufficient Resourcing]": "icon-sufficient-resourcing",
130+ "[Task]": "icon-task",
131+ "[User Story]": "icon-user-story",
132+ }
133+
134+ if ('[' in item) and (']' in item):
135+ card_hover = item[:item.find(']') + 1]
136+ item = item[len(card_hover):].strip()
137+ try:
138+ card_icon = type_lookup[card_hover]
139+ except KeyError:
140+ #print("WARNING: type_lookup failed: %s" % (card_hover))
141+ card_icon = "icon-unknown"
142+
143+ return card_hover, card_icon, item
144+
145
146 class BlueprintGroup(Blueprint):
147
148
149=== added file 'images/icon-alert-triangle-yellow.png'
150Binary files images/icon-alert-triangle-yellow.png 1970-01-01 00:00:00 +0000 and images/icon-alert-triangle-yellow.png 2012-08-22 21:35:23 +0000 differ
151=== added file 'images/icon-bug-gray.png'
152Binary files images/icon-bug-gray.png 1970-01-01 00:00:00 +0000 and images/icon-bug-gray.png 2012-08-22 21:35:23 +0000 differ
153=== added file 'images/icon-check-open.png'
154Binary files images/icon-check-open.png 1970-01-01 00:00:00 +0000 and images/icon-check-open.png 2012-08-22 21:35:23 +0000 differ
155=== added file 'images/icon-circle-bang-yellow.png'
156Binary files images/icon-circle-bang-yellow.png 1970-01-01 00:00:00 +0000 and images/icon-circle-bang-yellow.png 2012-08-22 21:35:23 +0000 differ
157=== added file 'images/icon-circle-check-green.png'
158Binary files images/icon-circle-check-green.png 1970-01-01 00:00:00 +0000 and images/icon-circle-check-green.png 2012-08-22 21:35:23 +0000 differ
159=== added file 'images/icon-circle-cross-red.png'
160Binary files images/icon-circle-cross-red.png 1970-01-01 00:00:00 +0000 and images/icon-circle-cross-red.png 2012-08-22 21:35:23 +0000 differ
161=== added file 'images/icon-circle-minus-pink.png'
162Binary files images/icon-circle-minus-pink.png 1970-01-01 00:00:00 +0000 and images/icon-circle-minus-pink.png 2012-08-22 21:35:23 +0000 differ
163=== added file 'images/icon-circle-minus-red.png'
164Binary files images/icon-circle-minus-red.png 1970-01-01 00:00:00 +0000 and images/icon-circle-minus-red.png 2012-08-22 21:35:23 +0000 differ
165=== added file 'images/icon-circle-plus-green.png'
166Binary files images/icon-circle-plus-green.png 1970-01-01 00:00:00 +0000 and images/icon-circle-plus-green.png 2012-08-22 21:35:23 +0000 differ
167=== added file 'images/icon-circle-question-blue.png'
168Binary files images/icon-circle-question-blue.png 1970-01-01 00:00:00 +0000 and images/icon-circle-question-blue.png 2012-08-22 21:35:23 +0000 differ
169=== added file 'images/icon-circle-radioactive.png'
170Binary files images/icon-circle-radioactive.png 1970-01-01 00:00:00 +0000 and images/icon-circle-radioactive.png 2012-08-22 21:35:23 +0000 differ
171=== added file 'images/icon-close-frame.png'
172Binary files images/icon-close-frame.png 1970-01-01 00:00:00 +0000 and images/icon-close-frame.png 2012-08-22 21:35:23 +0000 differ
173=== added file 'images/icon-down-up-arrow.png'
174Binary files images/icon-down-up-arrow.png 1970-01-01 00:00:00 +0000 and images/icon-down-up-arrow.png 2012-08-22 21:35:23 +0000 differ
175=== added file 'images/icon-open-frame.png'
176Binary files images/icon-open-frame.png 1970-01-01 00:00:00 +0000 and images/icon-open-frame.png 2012-08-22 21:35:23 +0000 differ
177=== added file 'images/icon-package-user.png'
178Binary files images/icon-package-user.png 1970-01-01 00:00:00 +0000 and images/icon-package-user.png 2012-08-22 21:35:23 +0000 differ
179=== added file 'images/icon-paper-boxes-check-green.png'
180Binary files images/icon-paper-boxes-check-green.png 1970-01-01 00:00:00 +0000 and images/icon-paper-boxes-check-green.png 2012-08-22 21:35:23 +0000 differ
181=== added file 'images/icon-paper-check-green.png'
182Binary files images/icon-paper-check-green.png 1970-01-01 00:00:00 +0000 and images/icon-paper-check-green.png 2012-08-22 21:35:23 +0000 differ
183=== added file 'images/icon-paper-cross-red.png'
184Binary files images/icon-paper-cross-red.png 1970-01-01 00:00:00 +0000 and images/icon-paper-cross-red.png 2012-08-22 21:35:23 +0000 differ
185=== added file 'images/icon-paper-discussion.png'
186Binary files images/icon-paper-discussion.png 1970-01-01 00:00:00 +0000 and images/icon-paper-discussion.png 2012-08-22 21:35:23 +0000 differ
187=== added file 'images/icon-paper-stack-blue.png'
188Binary files images/icon-paper-stack-blue.png 1970-01-01 00:00:00 +0000 and images/icon-paper-stack-blue.png 2012-08-22 21:35:23 +0000 differ
189=== added file 'images/icon-paper-stack-white.png'
190Binary files images/icon-paper-stack-white.png 1970-01-01 00:00:00 +0000 and images/icon-paper-stack-white.png 2012-08-22 21:35:23 +0000 differ
191=== added file 'images/icon-pencil-cross-red.png'
192Binary files images/icon-pencil-cross-red.png 1970-01-01 00:00:00 +0000 and images/icon-pencil-cross-red.png 2012-08-22 21:35:23 +0000 differ
193=== added file 'images/icon-pencil.png'
194Binary files images/icon-pencil.png 1970-01-01 00:00:00 +0000 and images/icon-pencil.png 2012-08-22 21:35:23 +0000 differ
195=== added file 'images/icon-star-gold.png'
196Binary files images/icon-star-gold.png 1970-01-01 00:00:00 +0000 and images/icon-star-gold.png 2012-08-22 21:35:23 +0000 differ
197=== added file 'images/icon-two-people.png'
198Binary files images/icon-two-people.png 1970-01-01 00:00:00 +0000 and images/icon-two-people.png 2012-08-22 21:35:23 +0000 differ
199=== added file 'images/icon-up-right-arrow.png'
200Binary files images/icon-up-right-arrow.png 1970-01-01 00:00:00 +0000 and images/icon-up-right-arrow.png 2012-08-22 21:35:23 +0000 differ
201=== modified file 'themes/canonical/templates/burndown.html'
202--- themes/canonical/templates/burndown.html 2012-08-16 06:30:19 +0000
203+++ themes/canonical/templates/burndown.html 2012-08-22 21:35:23 +0000
204@@ -162,6 +162,9 @@
205 printed_status = False
206 %>
207 % for bp, item, priority, size, url in getattr(a, status+"_wis"):
208+<%
209+ card_hover, card_icon, item = a.get_card_type(item)
210+%>
211 <tr>
212 % if not printed_assignee:
213 <td rowspan="${a.todo+a.blocked+a.postponed+a.done+a.inprogress}"><a href="${a.url}" name="${a.name}">${util.real_name(a.name)}</a></td>
214@@ -180,7 +183,7 @@
215 <td class="priority_${priority}">${priority}</td>
216 % endif
217 <td>${size}</td>
218- <td>${item}</td>
219+ <td class="${card_icon}" title="${card_hover}">${item}</td>
220 </tr>
221 % endfor
222 % endfor

Subscribers

People subscribed via source and target branches

to all changes: