1.1 --- a/imipweb/resource.py Tue Oct 20 18:38:42 2015 +0200
1.2 +++ b/imipweb/resource.py Tue Oct 20 18:39:52 2015 +0200
1.3 @@ -476,6 +476,8 @@
1.4
1.5 # Show dates for up to one week around the current date.
1.6
1.7 + page.span(class_="date enabled")
1.8 +
1.9 dt = default.as_datetime()
1.10 if not dt:
1.11 dt = date.today()
1.12 @@ -498,6 +500,8 @@
1.13 items.append((format_datetime(d), self.format_date(d, "full")))
1.14 self.menu("%s-date" % name, format_datetime(base), items, index=index)
1.15
1.16 + page.span.close()
1.17 +
1.18 # Show time details.
1.19
1.20 page.span(class_="time enabled")
1.21 @@ -589,6 +593,11 @@
1.22 input#dtend-enable-%(index)d:not(:checked) ~ .recurrence td.objectvalue.dtend .dt.enabled,
1.23 input#dtend-enable-%(index)d:checked ~ .recurrence td.objectvalue.dtend .dt.disabled {
1.24 display: none;
1.25 +}
1.26 +
1.27 +input#dtend-enable-%(index)d:not(:checked) ~ .recurrence td.objectvalue.dtend .date.enabled,
1.28 +input#dtend-enable-%(index)d:checked ~ .recurrence td.objectvalue.dtend .date.disabled {
1.29 + visibility: hidden;
1.30 }""" % {"index" : index})
1.31
1.32 page.style.close()
1.33 @@ -628,12 +637,11 @@
1.34 page.div.close()
1.35
1.36 else:
1.37 + self.date_controls("dtend", formdate)
1.38 page.div(class_="dt disabled")
1.39 page.label("Specify end date", for_="dtend-enable", class_="enable")
1.40 page.div.close()
1.41 page.div(class_="dt enabled")
1.42 - self.date_controls("dtend", formdate)
1.43 - page.br()
1.44 page.label("End on same day", for_="dtend-enable", class_="disable")
1.45 page.div.close()
1.46
1.47 @@ -680,16 +688,14 @@
1.48 self.control("recur-replaced", "hidden", period.replaced and str(index) or "")
1.49
1.50 else:
1.51 - page.div(class_="dt disabled")
1.52 - if not read_only:
1.53 - page.label("Specify end date", for_=_id("dtend-enable", index), class_="enable")
1.54 - page.div.close()
1.55 - page.div(class_="dt enabled")
1.56 self.date_controls(_name("dtend", "recur", index), period.get_form_end(), index=index, show_tzid=False, read_only=read_only)
1.57 if not read_only:
1.58 - page.br()
1.59 + page.div(class_="dt disabled")
1.60 + page.label("Specify end date", for_=_id("dtend-enable", index), class_="enable")
1.61 + page.div.close()
1.62 + page.div(class_="dt enabled")
1.63 page.label("End on same day", for_=_id("dtend-enable", index), class_="disable")
1.64 - page.div.close()
1.65 + page.div.close()
1.66
1.67 page.td.close()
1.68