Kanban

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

Proposed by Jamu Kakar on 2011-03-12

Status:	Merged
Approved by:	Martin Pool on 2011-03-15
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
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Martin Pool		2011-03-12	Approve on 2011-03-14
Review via email: mp+53151@code.launchpad.net

This branch introduces the following changes:

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

Revision history for this message

Martin Pool (mbp) on 2011-03-14:

review: Approve

Revision history for this message

Martin Pool (mbp) wrote on 2011-03-15:

This has some conflicts; i'll resolve them.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === 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 @@
        </div>
      {% for story in kanban_board.stories %}
--      <div class="tiles row story">
--      {% if story.name %}
--        <div class="position-0 width-12 cell">{{ story.name }}</div>
++      {% if kanban_board.stories|length > 1 %}
++        <div class="tiles row story">
++        {% if story.name %}
++          <div class="position-0 width-12 cell">{{ story.name }}</div>
++        {% else %}
++          <div class="position-0 width-12 cell">uncategorized</div>
++        {% endif %}
++        </div>
        {% else %}
--        <div class="position-0 width-12 cell">uncategorized</div>
++        <div class="tiles row no-story"></div>
        {% endif %}
--      </div>
        <div class="tiles row">
          <div class="position-0 width-2 cell">
 === 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 @@
      padding-bottom: 12px;
+ }
--.story {
++.story, .no-story {
      color: black;
      font-weight: bolder;
      border-top: 1px dotted #dddddd;
      padding-top: 12px;
+ }
++.no-story {
++    padding-top: 0;
++}
++
  #prefooter {
      line-height: 0;
      -moz-border-radius-bottomleft: 6px;