1.1 --- a/htdocs/styles.css Sat Oct 17 23:49:28 2015 +0200
1.2 +++ b/htdocs/styles.css Sun Oct 18 00:21:21 2015 +0200
1.3 @@ -1,5 +1,10 @@
1.4 /* Table styling. */
1.5
1.6 +table.calendar {
1.7 + min-width: 100%;
1.8 + table-layout: fixed;
1.9 +}
1.10 +
1.11 table.conflicts,
1.12 table.counters,
1.13 table.recurrence,
1.14 @@ -41,6 +46,7 @@
1.15 th.timeslot {
1.16 padding-top: 0;
1.17 vertical-align: top;
1.18 + width: 10em;
1.19 }
1.20
1.21 th.timeslot span.endpoint {
1.22 @@ -54,6 +60,10 @@
1.23 width: 10em;
1.24 }
1.25
1.26 +td.empty {
1.27 + min-width: 10em;
1.28 +}
1.29 +
1.30 td.event.only-organising {
1.31 background-color: #afd;
1.32 }
2.1 --- a/imipweb/calendar.py Sat Oct 17 23:49:28 2015 +0200
2.2 +++ b/imipweb/calendar.py Sun Oct 18 00:21:21 2015 +0200
2.3 @@ -383,6 +383,8 @@
2.4 # Only include the requests column if it provides objects.
2.5
2.6 if group_type != "request" or columns:
2.7 + if group_type != "request":
2.8 + columns += 1
2.9 group_columns.append(columns)
2.10 partitioned_groups.append(partitioned)
2.11 partitioned_group_types.append(group_type)
2.12 @@ -691,7 +693,8 @@
2.13
2.14 # Where no periods exist for the given time interval, generate
2.15 # an empty cell. Where a participant provides no periods at all,
2.16 - # the colspan is adjusted to be 1, not 0.
2.17 + # one column is provided; otherwise, one more column than the
2.18 + # number required is provided.
2.19
2.20 if not active:
2.21 self._empty_slot(point, endpoint, max(columns, 1))