1.1 --- a/htdocs/styles.css Sat Feb 07 17:16:48 2015 +0100
1.2 +++ b/htdocs/styles.css Sat Feb 07 17:20:29 2015 +0100
1.3 @@ -108,33 +108,28 @@
1.4 text-decoration: underline;
1.5 }
1.6
1.7 -/* Hiding/showing busy slots/periods or unused days/slots/periods. */
1.8 +/* Hiding/showing busy slots/periods or unused days. */
1.9
1.10 /* Hide the controls. */
1.11
1.12 input#hidebusy,
1.13 input#hidedays,
1.14 -input#hideslots,
1.15
1.16 /* Hide the enable labels when controls are already enabled. */
1.17
1.18 input#hidebusy:checked ~ .controls label.enable[for=hidebusy],
1.19 input#hidedays:checked ~ .controls label.enable[for=hidedays],
1.20 -input#hideslots:checked ~ .controls label.enable[for=hideslots],
1.21
1.22 /* Hide the disable labels when controls are already disabled. */
1.23
1.24 input#hidebusy:not(:checked) ~ .controls label.disable[for=hidebusy],
1.25 input#hidedays:not(:checked) ~ .controls label.disable[for=hidedays],
1.26 -input#hideslots:not(:checked) ~ .controls label.disable[for=hideslots],
1.27
1.28 /* Hide calendar rows depending on the selected controls. */
1.29
1.30 input#hidebusy:checked ~ .calendar tr.slot.busy,
1.31 input#hidedays:checked ~ .calendar tr.separator.empty,
1.32 -input#hidedays:checked ~ .calendar tr.slot.onlyslot.daystart.empty,
1.33 -input#hideslots:checked ~ .calendar tr.separator.empty,
1.34 -input#hideslots:checked ~ .calendar tr.slot.daystart.empty {
1.35 +input#hidedays:checked ~ .calendar tr.slot.onlyslot.daystart.empty {
1.36 display: none;
1.37 }
1.38
1.39 @@ -151,8 +146,7 @@
1.40 padding-left: 0.25em;
1.41 }
1.42
1.43 -label.hidedays,
1.44 -label.hideslots {
1.45 +label.hidedays {
1.46 border-left: 1em solid #faa; /* th.participantheading background-color */
1.47 }
1.48
2.1 --- a/imip_manager.py Sat Feb 07 17:16:48 2015 +0100
2.2 +++ b/imip_manager.py Sat Feb 07 17:20:29 2015 +0100
2.3 @@ -850,10 +850,9 @@
2.4 page.input(name="reset", type="submit", value="Clear selections", id="reset")
2.5 page.p.close()
2.6
2.7 - # Show controls for hiding empty and busy slots.
2.8 + # Show controls for hiding empty days and busy slots.
2.9 # The positioning of the control, paragraph and table are important here.
2.10
2.11 - page.input(name="hideslots", type="checkbox", value="hide", id="hideslots")
2.12 page.input(name="hidedays", type="checkbox", value="hide", id="hidedays")
2.13 page.input(name="hidebusy", type="checkbox", value="hide", id="hidebusy")
2.14
2.15 @@ -862,8 +861,6 @@
2.16 page.label("Show busy time periods", for_="hidebusy", class_="hidebusy disable")
2.17 page.label("Hide empty days", for_="hidedays", class_="hidedays enable")
2.18 page.label("Show empty days", for_="hidedays", class_="hidedays disable")
2.19 - page.label("Hide unused time periods", for_="hideslots", class_="hideslots enable")
2.20 - page.label("Show unused time periods", for_="hideslots", class_="hideslots disable")
2.21 page.p.close()
2.22
2.23 freebusy = self.store.get_freebusy(self.user)
2.24 @@ -1103,10 +1100,10 @@
2.25 page.thead.close()
2.26
2.27 page.tbody()
2.28 - self.show_calendar_points(intervals, groups_for_day, partitioned_group_types, group_columns, is_empty)
2.29 + self.show_calendar_points(intervals, groups_for_day, partitioned_group_types, group_columns)
2.30 page.tbody.close()
2.31
2.32 - def show_calendar_points(self, intervals, groups, group_types, group_columns, is_empty):
2.33 + def show_calendar_points(self, intervals, groups, group_types, group_columns):
2.34
2.35 """
2.36 Show the time 'intervals' along with period information from the given
2.37 @@ -1134,7 +1131,7 @@
2.38
2.39 css = " ".join(
2.40 ["slot"] +
2.41 - (is_empty and ["onlyslot"] or []) +
2.42 + (len(intervals) == 1 and ["onlyslot"] or []) +
2.43 (have_active and ["busy"] or ["empty"]) +
2.44 (continuation and ["daystart"] or [])
2.45 )