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