Merge lp:~jkakar/kanban/suppress-uncategorized-lane into lp:kanban

Proposed by Jamu Kakar
Status: Merged
Approved by: Martin Pool
Approved revision: 25
Merged at revision: 25
Proposed branch: lp:~jkakar/kanban/suppress-uncategorized-lane
Merge into: lp:kanban
Diff against target: 49 lines (+14/-6)
2 files modified
kanban/templates/kanban.html (+9/-5)
media/kanban.css (+5/-1)
To merge this branch: bzr merge lp:~jkakar/kanban/suppress-uncategorized-lane
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+53151@code.launchpad.net

Description of the change

This branch introduces the following changes:

- The 'uncategorized' story name is only shown when there is more than
  one story displayed on the board.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) :
review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

This has some conflicts; i'll resolve them.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'kanban/templates/kanban.html'
--- kanban/templates/kanban.html 2011-02-17 10:07:00 +0000
+++ kanban/templates/kanban.html 2011-03-12 22:12:02 +0000
@@ -27,13 +27,17 @@
27 </div>27 </div>
2828
29 {% for story in kanban_board.stories %}29 {% for story in kanban_board.stories %}
30 <div class="tiles row story">30 {% if kanban_board.stories|length > 1 %}
31 {% if story.name %}31 <div class="tiles row story">
32 <div class="position-0 width-12 cell">{{ story.name }}</div>32 {% if story.name %}
33 <div class="position-0 width-12 cell">{{ story.name }}</div>
34 {% else %}
35 <div class="position-0 width-12 cell">uncategorized</div>
36 {% endif %}
37 </div>
33 {% else %}38 {% else %}
34 <div class="position-0 width-12 cell">uncategorized</div>39 <div class="tiles row no-story"></div>
35 {% endif %}40 {% endif %}
36 </div>
3741
38 <div class="tiles row">42 <div class="tiles row">
39 <div class="position-0 width-2 cell">43 <div class="position-0 width-2 cell">
4044
=== modified file 'media/kanban.css'
--- media/kanban.css 2011-02-08 15:16:14 +0000
+++ media/kanban.css 2011-03-12 22:12:02 +0000
@@ -95,13 +95,17 @@
95 padding-bottom: 12px;95 padding-bottom: 12px;
96}96}
9797
98.story {98.story, .no-story {
99 color: black;99 color: black;
100 font-weight: bolder;100 font-weight: bolder;
101 border-top: 1px dotted #dddddd;101 border-top: 1px dotted #dddddd;
102 padding-top: 12px;102 padding-top: 12px;
103}103}
104104
105.no-story {
106 padding-top: 0;
107}
108
105#prefooter {109#prefooter {
106 line-height: 0;110 line-height: 0;
107 -moz-border-radius-bottomleft: 6px;111 -moz-border-radius-bottomleft: 6px;

Subscribers

People subscribed via source and target branches

to all changes: