# HG changeset patch # User Paul Boddie # Date 1423326029 -3600 # Node ID 55f9f804c6290dc67b02c1b0836a1e2003e63402 # Parent afde370a7e01c61dceef1416da5353246301a097 Removed the showing/hiding of unused start-of-day periods. diff -r afde370a7e01 -r 55f9f804c629 htdocs/styles.css --- a/htdocs/styles.css Sat Feb 07 17:16:48 2015 +0100 +++ b/htdocs/styles.css Sat Feb 07 17:20:29 2015 +0100 @@ -108,33 +108,28 @@ text-decoration: underline; } -/* Hiding/showing busy slots/periods or unused days/slots/periods. */ +/* Hiding/showing busy slots/periods or unused days. */ /* Hide the controls. */ input#hidebusy, input#hidedays, -input#hideslots, /* Hide the enable labels when controls are already enabled. */ input#hidebusy:checked ~ .controls label.enable[for=hidebusy], input#hidedays:checked ~ .controls label.enable[for=hidedays], -input#hideslots:checked ~ .controls label.enable[for=hideslots], /* Hide the disable labels when controls are already disabled. */ input#hidebusy:not(:checked) ~ .controls label.disable[for=hidebusy], input#hidedays:not(:checked) ~ .controls label.disable[for=hidedays], -input#hideslots:not(:checked) ~ .controls label.disable[for=hideslots], /* Hide calendar rows depending on the selected controls. */ input#hidebusy:checked ~ .calendar tr.slot.busy, input#hidedays:checked ~ .calendar tr.separator.empty, -input#hidedays:checked ~ .calendar tr.slot.onlyslot.daystart.empty, -input#hideslots:checked ~ .calendar tr.separator.empty, -input#hideslots:checked ~ .calendar tr.slot.daystart.empty { +input#hidedays:checked ~ .calendar tr.slot.onlyslot.daystart.empty { display: none; } @@ -151,8 +146,7 @@ padding-left: 0.25em; } -label.hidedays, -label.hideslots { +label.hidedays { border-left: 1em solid #faa; /* th.participantheading background-color */ } diff -r afde370a7e01 -r 55f9f804c629 imip_manager.py --- a/imip_manager.py Sat Feb 07 17:16:48 2015 +0100 +++ b/imip_manager.py Sat Feb 07 17:20:29 2015 +0100 @@ -850,10 +850,9 @@ page.input(name="reset", type="submit", value="Clear selections", id="reset") page.p.close() - # Show controls for hiding empty and busy slots. + # Show controls for hiding empty days and busy slots. # The positioning of the control, paragraph and table are important here. - page.input(name="hideslots", type="checkbox", value="hide", id="hideslots") page.input(name="hidedays", type="checkbox", value="hide", id="hidedays") page.input(name="hidebusy", type="checkbox", value="hide", id="hidebusy") @@ -862,8 +861,6 @@ page.label("Show busy time periods", for_="hidebusy", class_="hidebusy disable") page.label("Hide empty days", for_="hidedays", class_="hidedays enable") page.label("Show empty days", for_="hidedays", class_="hidedays disable") - page.label("Hide unused time periods", for_="hideslots", class_="hideslots enable") - page.label("Show unused time periods", for_="hideslots", class_="hideslots disable") page.p.close() freebusy = self.store.get_freebusy(self.user) @@ -1103,10 +1100,10 @@ page.thead.close() page.tbody() - self.show_calendar_points(intervals, groups_for_day, partitioned_group_types, group_columns, is_empty) + self.show_calendar_points(intervals, groups_for_day, partitioned_group_types, group_columns) page.tbody.close() - def show_calendar_points(self, intervals, groups, group_types, group_columns, is_empty): + def show_calendar_points(self, intervals, groups, group_types, group_columns): """ Show the time 'intervals' along with period information from the given @@ -1134,7 +1131,7 @@ css = " ".join( ["slot"] + - (is_empty and ["onlyslot"] or []) + + (len(intervals) == 1 and ["onlyslot"] or []) + (have_active and ["busy"] or ["empty"]) + (continuation and ["daystart"] or []) )