1.1 --- a/css/event-aggregator.css Thu Mar 26 00:17:36 2009 +0100
1.2 +++ b/css/event-aggregator.css Thu Mar 26 01:04:02 2009 +0100
1.3 @@ -98,16 +98,20 @@
1.4 }
1.5
1.6 .event-summary {
1.7 - padding: 0.25em;
1.8 + padding: 0.25em 0.5em 0.25em 0.5em;
1.9 margin-bottom: 0.25em;
1.10 min-height: 2em;
1.11 + margin-left: 0;
1.12 + margin-right: 0;
1.13 }
1.14
1.15 -.event-starts {
1.16 +.event-summary.event-starts {
1.17 + padding: 0.25em;
1.18 margin-left: 0.5em;
1.19 }
1.20
1.21 -.event-ends {
1.22 +.event-summary.event-ends {
1.23 + padding: 0.25em;
1.24 margin-right: 0.5em;
1.25 }
1.26
2.1 --- a/macros/EventAggregator.py Thu Mar 26 00:17:36 2009 +0100
2.2 +++ b/macros/EventAggregator.py Thu Mar 26 01:04:02 2009 +0100
2.3 @@ -375,6 +375,8 @@
2.4
2.5 bg = getColour(event_page.page_name)
2.6 fg = getBlackOrWhite(bg)
2.7 + style = ("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + fg))
2.8 + hidden_style = ("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + bg))
2.9
2.10 css_classes = ["event-summary"]
2.11
2.12 @@ -394,11 +396,12 @@
2.13 else:
2.14 hide_text = 1
2.15
2.16 - output.append(fmt.div(on=1, css_class=(" ".join(css_classes)),
2.17 - style=("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + fg))))
2.18 -
2.19 if not hide_text:
2.20 + output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=style))
2.21 output.append(event_page.link_to_raw(request, wikiutil.escape(pretty_pagename)))
2.22 + else:
2.23 + output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=hidden_style))
2.24 + output.append(fmt.text(pretty_pagename))
2.25
2.26 output.append(fmt.div(on=0))
2.27