1.1 --- a/htdocs/styles.css Sun Sep 27 01:26:05 2015 +0200
1.2 +++ b/htdocs/styles.css Sun Sep 27 17:53:46 2015 +0200
1.3 @@ -1,6 +1,5 @@
1.4 /* Table styling. */
1.5
1.6 -table.calendar,
1.7 table.conflicts,
1.8 table.counters,
1.9 table.recurrence,
1.10 @@ -24,9 +23,10 @@
1.11 background-color: #faa;
1.12 }
1.13
1.14 -th.dayheading,
1.15 +caption.dayheading,
1.16 th.mainheading {
1.17 background-color: #f85;
1.18 + width: 100%;
1.19 }
1.20
1.21 th.timeslot,
1.22 @@ -51,6 +51,7 @@
1.23 td.event {
1.24 background-color: #ff8;
1.25 border: 2px solid #000;
1.26 + width: 10em;
1.27 }
1.28
1.29 td.event.only-organising {
1.30 @@ -141,8 +142,8 @@
1.31 padding: 0; /* for regions covered by labels */
1.32 }
1.33
1.34 -th.dayheading:hover,
1.35 -th.dayheading:focus,
1.36 +caption.dayheading:hover,
1.37 +caption.dayheading:focus,
1.38 th.timeslot:hover,
1.39 th.timeslot:focus,
1.40 td.container:hover,
1.41 @@ -184,8 +185,7 @@
1.42 /* Hide calendar rows depending on the selected controls. */
1.43
1.44 input#hidebusy:checked ~ .calendar tr.slot.busy,
1.45 -input#showdays:not(:checked) ~ .calendar thead.separator.empty,
1.46 -input#showdays:not(:checked) ~ .calendar tbody.points.empty,
1.47 +input#showdays:not(:checked) ~ .calendar.empty,
1.48
1.49 /* Hiding/showing end datetimes and start/end times. */
1.50
2.1 --- a/imipweb/calendar.py Sun Sep 27 01:26:05 2015 +0200
2.2 +++ b/imipweb/calendar.py Sun Sep 27 17:53:46 2015 +0200
2.3 @@ -409,10 +409,7 @@
2.4
2.5 # Show the calendar itself.
2.6
2.7 - page.table(cellspacing=5, cellpadding=5, class_="calendar")
2.8 - self.show_calendar_participant_headings(partitioned_group_types, partitioned_group_sources, group_columns)
2.9 - self.show_calendar_days(days, partitioned_groups, partitioned_group_types, group_columns)
2.10 - page.table.close()
2.11 + self.show_calendar_days(days, partitioned_groups, partitioned_group_types, partitioned_group_sources, group_columns)
2.12
2.13 # End the form region.
2.14
2.15 @@ -443,8 +440,8 @@
2.16 for day in days:
2.17 daystr, dayid = self._day_value_and_identifier(day)
2.18 l.append("""\
2.19 -input.newevent.selector#%s:checked ~ table thead#region-%s label.day,
2.20 -input.newevent.selector#%s:checked ~ table tbody#region-%s label.timepoint""" % (dayid, dayid, dayid, dayid))
2.21 +input.newevent.selector#%s:checked ~ table#region-%s label.day,
2.22 +input.newevent.selector#%s:checked ~ table#region-%s label.timepoint""" % (dayid, dayid, dayid, dayid))
2.23
2.24 page.add(",\n".join(l))
2.25 page.add(""" {
2.26 @@ -477,10 +474,11 @@
2.27 l = []
2.28
2.29 for day, intervals in days.items():
2.30 + daystr, dayid = self._day_value_and_identifier(day)
2.31 for point, endpoint in intervals:
2.32 timestr, timeid = self._slot_value_and_identifier(point, endpoint)
2.33 l.append("""\
2.34 -input.newevent.selector#%s:checked ~ table th#region-%s label.timepoint""" % (timeid, timeid))
2.35 +input.newevent.selector#%s:checked ~ table#region-%s th#region-%s""" % (timeid, dayid, timeid))
2.36
2.37 page.add(",\n".join(l))
2.38 page.add(""" {
2.39 @@ -517,13 +515,15 @@
2.40 page.tr.close()
2.41 page.thead.close()
2.42
2.43 - def show_calendar_days(self, days, partitioned_groups, partitioned_group_types, group_columns):
2.44 + def show_calendar_days(self, days, partitioned_groups, partitioned_group_types,
2.45 + partitioned_group_sources, group_columns):
2.46
2.47 """
2.48 Show calendar days, defined by a collection of 'days', the contributing
2.49 period information as 'partitioned_groups' (partitioned by day), the
2.50 'partitioned_group_types' indicating the kind of contribution involved,
2.51 - and the 'group_columns' defining the number of columns in each group.
2.52 + the 'partitioned_group_sources' indicating the origin of each group, and
2.53 + the 'group_columns' defining the number of columns in each group.
2.54 """
2.55
2.56 page = self.page
2.57 @@ -556,18 +556,20 @@
2.58
2.59 daystr, dayid = self._day_value_and_identifier(day)
2.60
2.61 - page.thead(class_="separator%s" % (is_empty and " empty" or ""), id="region-%s" % dayid)
2.62 - page.tr()
2.63 - page.th(class_="dayheading container", colspan=all_columns+1)
2.64 + page.table(cellspacing=5, cellpadding=5, class_="calendar %s" % (is_empty and " empty" or ""), id="region-%s" % dayid)
2.65 +
2.66 + page.caption(class_="dayheading container separator")
2.67 self._day_heading(day)
2.68 - page.th.close()
2.69 - page.tr.close()
2.70 - page.thead.close()
2.71 + page.caption.close()
2.72
2.73 - page.tbody(class_="points%s" % (is_empty and " empty" or ""), id="region-%s" % dayid)
2.74 + self.show_calendar_participant_headings(partitioned_group_types, partitioned_group_sources, group_columns)
2.75 +
2.76 + page.tbody(class_="points")
2.77 self.show_calendar_points(intervals, groups_for_day, partitioned_group_types, group_columns)
2.78 page.tbody.close()
2.79
2.80 + page.table.close()
2.81 +
2.82 def show_calendar_points(self, intervals, groups, group_types, group_columns):
2.83
2.84 """