# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1238025842 -3600
# Node ID f88e0568aaf84ef2a93d919f4d3a2064236ec2d9
# Parent  4634d879b6187a1de87f3421d754da39d97b41ac
Introduced more convincing calendar marking with "weekly" names on events.

diff -r 4634d879b618 -r f88e0568aaf8 css/event-aggregator.css
--- a/css/event-aggregator.css	Thu Mar 26 00:17:36 2009 +0100
+++ b/css/event-aggregator.css	Thu Mar 26 01:04:02 2009 +0100
@@ -98,16 +98,20 @@
 }
 
 .event-summary {
-    padding: 0.25em;
+    padding: 0.25em 0.5em 0.25em 0.5em;
     margin-bottom: 0.25em;
     min-height: 2em;
+    margin-left: 0;
+    margin-right: 0;
 }
 
-.event-starts {
+.event-summary.event-starts {
+    padding: 0.25em;
     margin-left: 0.5em;
 }
 
-.event-ends {
+.event-summary.event-ends {
+    padding: 0.25em;
     margin-right: 0.5em;
 }
 
diff -r 4634d879b618 -r f88e0568aaf8 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Thu Mar 26 00:17:36 2009 +0100
+++ b/macros/EventAggregator.py	Thu Mar 26 01:04:02 2009 +0100
@@ -375,6 +375,8 @@
 
                                 bg = getColour(event_page.page_name)
                                 fg = getBlackOrWhite(bg)
+                                style = ("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + fg))
+                                hidden_style = ("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + bg))
 
                                 css_classes = ["event-summary"]
 
@@ -394,11 +396,12 @@
                                 else:
                                     hide_text = 1
 
-                                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))))
-
                                 if not hide_text:
+                                    output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=style))
                                     output.append(event_page.link_to_raw(request, wikiutil.escape(pretty_pagename)))
+                                else:
+                                    output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=hidden_style))
+                                    output.append(fmt.text(pretty_pagename))
 
                                 output.append(fmt.div(on=0))