--- trac/templates/macros.html.orig	2009-04-14 12:54:34.000000000 -0500
+++ trac/templates/macros.html	2009-05-14 08:09:15.000000000 -0500
@@ -270,7 +270,7 @@
           <th rowspan="2" class="id">Id</th>
           <th rowspan="2">Summary</th>
           <py:for each="stage in completion_stages">
-              <th colspan="2" class="completion_stage">${stage['short_label']}</th>
+              <th colspan="2" class="completion_stage">${stage['short_label']}<br/></th>
           </py:for>
           <th rowspan="2" class="size">SIZE</th>
           <th rowspan="2" class="done">DONE</th>
@@ -309,10 +309,10 @@
                   <td py:with="ticket_stage=ticket_stages[stage['stage']]">
                     <div class="completion">
                     <py:choose>
-                      <span py:when="ticket_stage['size_defined'] and ticket_stage['size'] > 0 and ticket_stage['complete']" class="complete">
+                      <span py:when="ticket_stage['size_defined'] and ticket_stage['size'] > 0 and (ticket_stage['date'] or ticket_stage['complete'])" class="complete">
                         <span class="empty_cell"></span>
                       </span>
-                      <span py:when="ticket_stage['size_defined'] and ticket_stage['size'] > 0 and not ticket_stage['complete']" class="not_complete">
+                      <span py:when="ticket_stage['size_defined'] and ticket_stage['size'] > 0 and not (ticket_stage['date'] or ticket_stage['complete'])" class="not_complete">
                         <span class="empty_cell"></span>
                       </span>
                       <span py:when="ticket_stage['size_defined'] and ticket_stage['size'] == 0" class="not_applicable">