# HG changeset patch # User Paul Boddie # Date 1237684720 -3600 # Node ID da9d7628d1fa73d3ddcd4c67a5604125661a2e20 # Parent b3b01e7b369979eed6734345840330b8e47ba46f Changed heading colours. Made continuing events join up with the surrounding days as well as possible. Added empty day padding. diff -r b3b01e7b3699 -r da9d7628d1fa css/event-aggregator.css --- a/css/event-aggregator.css Sun Mar 22 01:46:06 2009 +0100 +++ b/css/event-aggregator.css Sun Mar 22 02:18:40 2009 +0100 @@ -16,25 +16,29 @@ } .event-month-heading { - background-color: #dddddd; + background-color: #777777; + color: #ffffff; text-align: center; font-weight: bold; } .event-day-heading { - background-color: #9999ff; + background-color: #999999; + color: #ffffff; text-align: center; } .event-day { width: 14%; vertical-align: top; + padding-top: 0; padding-left: 0; - padding-top: 0; + padding-right: 0; } .event-day-empty { background-color: #ffffff; + padding-bottom: 2em; } .event-day-busy { @@ -60,7 +64,15 @@ .event-summary { padding: 0.25em; - margin-bottom: 0.25em; + margin-bottom: 0.5em; +} + +.event-starts { + margin-left: 0.5em; +} + +.event-ends { + margin-right: 0.5em; } .event-summary a:link, diff -r b3b01e7b3699 -r da9d7628d1fa macros/EventAggregator.py --- a/macros/EventAggregator.py Sun Mar 22 01:46:06 2009 +0100 +++ b/macros/EventAggregator.py Sun Mar 22 02:18:40 2009 +0100 @@ -359,9 +359,17 @@ bg = getColour(event_page.page_name) fg = getBlackOrWhite(bg) + css_classes = ["event-summary"] + + if event_details["start"] == date: + css_classes.append("event-starts") + + if event_details["end"] == date: + css_classes.append("event-ends") + # Output the event. - output.append(fmt.div(on=1, css_class="event-summary", + output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + fg)))) output.append(event_page.link_to_raw(request, wikiutil.escape(pretty_pagename))) output.append(fmt.div(on=0))