# HG changeset patch # User Paul Boddie # Date 1423266434 -3600 # Node ID 55345413b3b96de43d919106e0609378c71ab47d # Parent 00e06f26c48624c63583d65db8121ec6403599c7 Coalesce empty table cells. diff -r 00e06f26c486 -r 55345413b3b9 imip_manager.py --- a/imip_manager.py Thu Feb 05 23:18:54 2015 +0100 +++ b/imip_manager.py Sat Feb 07 00:47:14 2015 +0100 @@ -1141,10 +1141,21 @@ slots.sort() spans = get_spans(slots) + empty = 0 + # Show a column for each active period. for t in active: if t and len(t) >= 2: + + # Flush empty slots preceding this one. + + if empty: + page.td(class_="empty container", colspan=empty) + self._empty_slot(point, endpoint) + page.td.close() + empty = 0 + start, end, uid, key = get_freebusy_details(t) span = spans[key] @@ -1189,16 +1200,14 @@ page.td.close() else: - page.td(class_="empty container") - self._empty_slot(point, endpoint) - page.td.close() + empty += 1 # Pad with empty columns. - i = columns - len(active) - while i > 0: - i -= 1 - page.td(class_="empty container") + empty = columns - len(active) + + if empty: + page.td(class_="empty container", colspan=empty) self._empty_slot(point, endpoint) page.td.close()