# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1298081163 -3600
# Node ID 3c602433e6b549fdce35db62c4ed729717313607
# Parent  bb420cdfe360a32db981572fd8a23641d9989f11# Parent  a818bec1361017fc3c12ac7621314f1b817c1c16
Merged changes from revision 121 on the 0.7 (main) branch.

diff -r bb420cdfe360 -r 3c602433e6b5 .hgtags
--- a/.hgtags	Sun Feb 06 02:38:17 2011 +0100
+++ b/.hgtags	Sat Feb 19 03:06:03 2011 +0100
@@ -5,4 +5,5 @@
 f1f552421d5e3d23b6fe2d53625d264cfe1d182c rel-0-3
 27922520e51f07b289abe18b66537c7481556868 rel-0-4
 0c8421ec5a70dc70e93a773f9812564d837cc575 rel-0-5
+e1684a6e8a821ac67ae6d591b703edaefbb66b15 rel-0-6
 067b30223eb3db64971ace7dae263e4eae09dce6 rel-0-6-1
diff -r bb420cdfe360 -r 3c602433e6b5 EventAggregatorSupport.py
--- a/EventAggregatorSupport.py	Sun Feb 06 02:38:17 2011 +0100
+++ b/EventAggregatorSupport.py	Sat Feb 19 03:06:03 2011 +0100
@@ -31,7 +31,7 @@
 def escattr(s):
     return escape(s, 1)
 
-__version__ = "0.6.1"
+__version__ = "0.6.2"
 
 # Date labels.
 
@@ -80,9 +80,6 @@
 
 # Utility functions.
 
-def isMoin15():
-    return version.release.startswith("1.5.")
-
 def getCategoryPattern(request):
     global category_regexp
 
@@ -102,6 +99,147 @@
     else:
         return int(x)
 
+def sort_none_first(x, y):
+    if x is None:
+        return -1
+    elif y is None:
+        return 1
+    else:
+        return cmp(x, y)
+
+# Utility classes and associated functions.
+
+class Form:
+
+    """
+    A wrapper preserving MoinMoin 1.8.x (and earlier) behaviour in a 1.9.x
+    environment.
+    """
+
+    def __init__(self, form):
+        self.form = form
+
+    def get(self, name, default=None):
+        values = self.form.getlist(name)
+        if not values:
+            return default
+        else:
+            return values
+
+    def __getitem__(self, name):
+        return self.form.getlist(name)
+
+class ActionSupport:
+
+    """
+    Work around disruptive MoinMoin changes in 1.9, and also provide useful
+    convenience methods.
+    """
+
+    def get_form(self):
+        return get_form(self.request)
+
+    def _get_selected(self, value, input_value):
+
+        """
+        Return the HTML attribute text indicating selection of an option (or
+        otherwise) if 'value' matches 'input_value'.
+        """
+
+        return input_value is not None and value == input_value and 'selected="selected"' or ''
+
+    def _get_selected_for_list(self, value, input_values):
+
+        """
+        Return the HTML attribute text indicating selection of an option (or
+        otherwise) if 'value' matches one of the 'input_values'.
+        """
+
+        return value in input_values and 'selected="selected"' or ''
+
+    def _get_input(self, form, name, default=None):
+
+        """
+        Return the input from 'form' having the given 'name', returning either
+        the input converted to an integer or the given 'default' (optional, None
+        if not specified).
+        """
+
+        value = form.get(name, [None])[0]
+        if not value: # true if 0 obtained
+            return default
+        else:
+            return int(value)
+
+    def get_month_lists(self, default_as_current=0):
+
+        """
+        Return two lists of HTML element definitions corresponding to the start
+        and end month selection controls, with months selected according to any
+        values that have been specified via request parameters.
+        """
+
+        _ = self._
+        form = self.get_form()
+
+        # Initialise month lists.
+
+        start_month_list = []
+        end_month_list = []
+
+        start_month = self._get_input(form, "start-month", default_as_current and getCurrentMonth().month() or None)
+        end_month = self._get_input(form, "end-month", start_month)
+
+        # Prepare month lists, selecting specified months.
+
+        if not default_as_current:
+            start_month_list.append('<option value=""></option>')
+            end_month_list.append('<option value=""></option>')
+
+        for month in range(1, 13):
+            month_label = _(getMonthLabel(month))
+            selected = self._get_selected(month, start_month)
+            start_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, month_label))
+            selected = self._get_selected(month, end_month)
+            end_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, month_label))
+
+        return start_month_list, end_month_list
+
+    def get_year_defaults(self, default_as_current=0):
+
+        "Return defaults for the start and end years."
+
+        form = self.get_form()
+
+        start_year_default = form.get("start-year", [default_as_current and getCurrentYear() or ""])[0]
+        end_year_default = form.get("end-year", [default_as_current and start_year_default or ""])[0]
+
+        return start_year_default, end_year_default
+
+def get_form(request):
+
+    "Work around disruptive MoinMoin changes in 1.9."
+
+    if hasattr(request, "values"):
+        return Form(request.values)
+    else:
+        return request.form
+
+class send_headers:
+
+    """
+    A wrapper to preserve MoinMoin 1.8.x (and earlier) request behaviour in a
+    1.9.x environment.
+    """
+
+    def __init__(self, request):
+        self.request = request
+
+    def __call__(self, headers):
+        for header in headers:
+            parts = header.split(":")
+            self.request.headers.add(parts[0], ":".join(parts[1:]))
+
 # Textual representations.
 
 def getHTTPTimeString(tmtuple):
@@ -214,11 +352,7 @@
     """
 
     query = search.QueryParser().parse_query('category:%s' % pagename)
-    if isMoin15():
-        results = search.searchPages(request, query)
-        results.sortByPagename()
-    else:
-        results = search.searchPages(request, query, "page_name")
+    results = search.searchPages(request, query, "page_name")
 
     cat_pattern = getCategoryPattern(request)
     pages = []
@@ -249,21 +383,13 @@
 
         "Using 'request', return the URL of this page."
 
-        page = self.page
-
-        if isMoin15():
-            return request.getQualifiedURL(page.url(request))
-        else:
-            return request.getQualifiedURL(page.url(request, relative=0))
+        return request.getQualifiedURL(self.page.url(request, relative=0))
 
     def getFormat(self):
 
         "Get the format used on this page."
 
-        if isMoin15():
-            return "wiki" # page.pi_format
-        else:
-            return self.page.pi["format"]
+        return self.page.pi["format"]
 
     def getRevisions(self):
 
@@ -658,7 +784,7 @@
     Using 'request', set timestamp details in the details dictionary of each of
     the 'events'.
 
-    Retutn the latest timestamp found.
+    Return the latest timestamp found.
     """
 
     latest = None
@@ -728,6 +854,10 @@
 
     return min(first, last), last
 
+# NOTE: Support coverage using times within days. This will involve timespan
+# NOTE: objects which can be compared in such a way that set operations will be
+# NOTE: able to detect overlapping periods.
+
 def getCoverage(start, end, events):
 
     """
@@ -737,7 +867,7 @@
     of the form (set of covered days, events).
     """
 
-    all_events = []
+    all_events = {}
     full_coverage = set()
 
     # Get event details.
@@ -754,28 +884,39 @@
             event_start = max(event_details["start"], start)
             event_end = min(event_details["end"], end)
             event_coverage = set(event_start.days_until(event_end))
+            event_location = event_details.get("location")
 
             # Update the overall coverage.
 
             full_coverage.update(event_coverage)
 
-            # Try and fit the event into the events list.
-
-            for i, (coverage, covered_events) in enumerate(all_events):
-
-                # Where the event does not overlap with the current
-                # element, add it alongside existing events.
+            # Add a new events list for a new location.
+            # Locations can be unspecified, thus None refers to all unlocalised
+            # events.
 
-                if not coverage.intersection(event_coverage):
-                    covered_events.append(event)
-                    all_events[i] = coverage.union(event_coverage), covered_events
-                    break
+            if not all_events.has_key(event_location):
+                all_events[event_location] = [(event_coverage, [event])]
 
-            # Make a new element in the list if the event cannot be
-            # marked alongside existing events.
+            # Try and fit the event into an events list.
 
             else:
-                all_events.append((event_coverage, [event]))
+                slot = all_events[event_location]
+
+                for i, (coverage, covered_events) in enumerate(slot):
+
+                    # Where the event does not overlap with the current
+                    # element, add it alongside existing events.
+
+                    if not coverage.intersection(event_coverage):
+                        covered_events.append(event)
+                        slot[i] = coverage.union(event_coverage), covered_events
+                        break
+
+                # Make a new element in the list if the event cannot be
+                # marked alongside existing events.
+
+                else:
+                    slot.append((event_coverage, [event]))
 
     return full_coverage, all_events
 
@@ -1251,7 +1392,7 @@
     in the 'request'.
     """
 
-    return request.form.get(name, [default])[0]
+    return get_form(request).get(name, [default])[0]
 
 def getQualifiedParameter(request, calendar_name, argname, default=None):
 
@@ -1333,17 +1474,25 @@
     else:
         return None
 
+def getFullMonthLabel(request, year_month):
+
+    """
+    Return the full month plus year label using the given 'request' and
+    'year_month'.
+    """
+
+    _ = request.getText
+    year, month = year_month.as_tuple()
+    month_label = _(getMonthLabel(month))
+    return "%s %s" % (month_label, year)
+
 # Page-related functions.
 
 def getPrettyPageName(page):
 
     "Return a nicely formatted title/name for the given 'page'."
 
-    if isMoin15():
-        title = page.split_title(page.request, force=1)
-    else:
-        title = page.split_title(force=1)
-
+    title = page.split_title(force=1)
     return getPrettyTitle(title)
 
 def linkToPage(request, page, text, query_string=None):
@@ -1354,14 +1503,7 @@
     """
 
     text = wikiutil.escape(text)
-
-    if isMoin15():
-        url = wikiutil.quoteWikinameURL(page.page_name)
-        if query_string is not None:
-            url = "%s?%s" % (url, query_string)
-        return wikiutil.link_tag(request, url, text, getattr(page, "formatter", None))
-    else:
-        return page.link_to_raw(request, text, query_string)
+    return page.link_to_raw(request, text, query_string)
 
 def getFullPageName(parent, title):
 
diff -r bb420cdfe360 -r 3c602433e6b5 PKG-INFO
--- a/PKG-INFO	Sun Feb 06 02:38:17 2011 +0100
+++ b/PKG-INFO	Sat Feb 19 03:06:03 2011 +0100
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: EventAggregator
-Version: 0.6.1
+Version: 0.6.2
 Author: Paul Boddie
 Author-email: paul at boddie org uk
 Maintainer: Paul Boddie
 Maintainer-email: paul at boddie org uk
 Home-page: http://moinmo.in/MacroMarket/EventAggregator
-Download-url: http://moinmo.in/MacroMarket/EventAggregator?action=AttachFile&do=view&target=EventAggregator-0.6.tar.gz
+Download-url: http://moinmo.in/MacroMarket/EventAggregator?action=AttachFile&do=view&target=EventAggregator-0.7.tar.gz
 Summary: Aggregate event data and display it in an event calendar (or summarise it in iCalendar and RSS resources)
 License: GPL (version 2 or later)
 Description: The EventAggregator macro for MoinMoin can be used to display event
diff -r bb420cdfe360 -r 3c602433e6b5 README.txt
--- a/README.txt	Sun Feb 06 02:38:17 2011 +0100
+++ b/README.txt	Sat Feb 19 03:06:03 2011 +0100
@@ -26,9 +26,14 @@
 Important Notices
 -----------------
 
-Release 0.6.1 fixes various bugs in HTML production done by the actions. It is
+Release 0.6.2 fixes various bugs in HTML production done by the actions. It is
 strongly recommended to upgrade from earlier versions to this release.
 
+In release 0.6.2, support for MoinMoin 1.5.x has been dropped. Since usage of
+the Xapian search software is practically a necessary part of deploying this
+solution, and yet Xapian only became integrated with MoinMoin from version 1.6
+onwards, few deployments should have involved MoinMoin 1.5.x.
+
 In release 0.6, support for event times has been introduced. Due to the
 complicated nature of times, time zones, time regimes, and so on, the
 behaviour of the software may change in future versions to support common
@@ -112,12 +117,7 @@
 Using the Macro
 ---------------
 
-It should now be possible to edit pages and use the macro as follows. For
-MoinMoin 1.5:
-
-  [[EventAggregator(CategoryEvents)]]
-
-For MoinMoin 1.6 and above:
+It should now be possible to edit pages and use the macro as follows:
 
   <<EventAggregator(CategoryEvents)>>
 
@@ -227,6 +227,22 @@
 time zone information for the correct interpretation of time information in
 those summaries. Thus, it is highly recommended that pytz be installed.
 
+New in EventAggregator 0.6.2 (Changes since EventAggregator 0.6.1)
+------------------------------------------------------------------
+
+  * Dropped MoinMoin 1.5.x support, since Xapian search is not available for
+    that version and is virtually a necessity.
+  * Fixed form handling to be compatible with MoinMoin 1.9.x, since that
+    particular release series introduced an incompatible request API that
+    breaks existing code (no longer providing access to query string
+    parameters via the form attribute, and only returning single values
+    unless the new getlist method on form-like objects is used).
+  * Fixed the direct writing of requests to be compatible with MoinMoin 1.9.
+  * Added pop-up elements showing information about the calendar/view
+    resources available for download or subscription.
+  * Added download/subscription links which open the form associated with the
+    EventAggregatorSummary action and permit editing of the supplied values.
+
 New in EventAggregator 0.6.1 (Changes since EventAggregator 0.6)
 ----------------------------------------------------------------
 
diff -r bb420cdfe360 -r 3c602433e6b5 actions/EventAggregatorNewEvent.py
--- a/actions/EventAggregatorNewEvent.py	Sun Feb 06 02:38:17 2011 +0100
+++ b/actions/EventAggregatorNewEvent.py	Sat Feb 19 03:06:03 2011 +0100
@@ -27,27 +27,14 @@
 
 # Action class and supporting functions.
 
-class EventAggregatorNewEvent(ActionBase):
+class EventAggregatorNewEvent(ActionBase, EventAggregatorSupport.ActionSupport):
 
     "An event creation dialogue requesting various parameters."
 
-    def _get_selected(self, value, input_value):
-        return input_value is not None and value == input_value and 'selected="selected"' or ''
-
-    def _get_selected_for_list(self, value, input_values):
-        return value in input_values and 'selected="selected"' or ''
-
-    def _get_input(self, form, name, default=None):
-        value = form.get(name, [None])[0]
-        if not value: # true if 0 obtained
-            return default
-        else:
-            return int(value)
-
     def get_form_html(self, buttons_html):
         _ = self._
         request = self.request
-        form = request.form
+        form = self.get_form()
 
         # Handle advanced and basic forms, and enable/disable certain fields.
 
@@ -99,20 +86,8 @@
 
         # Initialise month lists.
 
-        start_month_list = []
-        end_month_list = []
-
-        start_month = self._get_input(form, "start-month", EventAggregatorSupport.getCurrentMonth().month())
-        end_month = self._get_input(form, "end-month", start_month)
-
-        # Prepare month lists, selecting specified months.
-
-        for month in range(1, 13):
-            month_label = _(EventAggregatorSupport.getMonthLabel(month))
-            selected = self._get_selected(month, start_month)
-            start_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, escape(month_label)))
-            selected = self._get_selected(month, end_month)
-            end_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, escape(month_label)))
+        start_month_list, end_month_list = self.get_month_lists(default_as_current=1)
+        start_year_default, end_year_default = self.get_year_defaults(default_as_current=1)
 
         # Initialise regime lists.
 
@@ -155,7 +130,7 @@
 
             "start_label"           : escape(_("Start date (day, month, year)")),
             "start_day_default"     : escattr(form.get("start-day", [""])[0]),
-            "start_year_default"    : escattr(form.get("start-year", [""])[0] or EventAggregatorSupport.getCurrentYear()),
+            "start_year_default"    : escattr(start_year_default),
             "start_time_label"      : escape(_("Start time (hour, minute, second)")),
             "start_hour_default"    : escattr(form.get("start-hour", [""])[0]),
             "start_minute_default"  : escattr(form.get("start-minute", [""])[0]),
@@ -164,7 +139,7 @@
 
             "end_label"             : escape(_("End date (day, month, year) - if different")),
             "end_day_default"       : escattr(form.get("end-day", [""])[0] or form.get("start-day", [""])[0]),
-            "end_year_default"      : escattr(form.get("end-year", [""])[0] or form.get("start-year", [""])[0]),
+            "end_year_default"      : escattr(end_year_default),
             "end_time_label"        : escape(_("End time (hour, minute, second)")),
             "end_hour_default"      : escattr(form.get("end-hour", [""])[0]),
             "end_minute_default"    : escattr(form.get("end-minute", [""])[0]),
@@ -469,7 +444,7 @@
         "Create the new event."
 
         _ = self._
-        form = self.request.form
+        form = self.get_form()
 
         # If no title exists in the request, an error message is returned.
 
@@ -499,7 +474,7 @@
         "Create an event page using the 'request'."
 
         _ = request.getText
-        form = request.form
+        form = self.get_form()
 
         category_pagenames = form.get("category", [])
         description = form.get("description", [None])[0]
diff -r bb420cdfe360 -r 3c602433e6b5 actions/EventAggregatorSummary.py
--- a/actions/EventAggregatorSummary.py	Sun Feb 06 02:38:17 2011 +0100
+++ b/actions/EventAggregatorSummary.py	Sat Feb 19 03:06:03 2011 +0100
@@ -14,7 +14,6 @@
 from MoinMoin.action import ActionBase
 from MoinMoin import config
 from MoinMoin.Page import Page
-import MoinMoin.util # for MoinMoin 1.5.x
 from MoinMoin import wikiutil
 import EventAggregatorSupport
 
@@ -25,50 +24,82 @@
 
 # Action class and supporting functions.
 
-class EventAggregatorSummary(ActionBase):
+class EventAggregatorSummary(ActionBase, EventAggregatorSupport.ActionSupport):
 
     "A summary dialogue requesting various parameters."
 
     def get_form_html(self, buttons_html):
         _ = self._
         request = self.request
-        form = request.form
+        form = self.get_form()
 
         category_list = []
+        category_pagenames = form.get("category", [])
 
         for category_name, category_pagename in \
             EventAggregatorSupport.getCategoryMapping(
                 EventAggregatorSupport.getCategories(request),
                 request):
 
-            category_list.append('<option value="%s">%s</option>' % (escattr(category_pagename), escape(category_name)))
+            selected = self._get_selected_for_list(category_pagename, category_pagenames)
+            category_list.append('<option value="%s" %s>%s</option>' % (escattr(category_pagename), selected, escape(category_name)))
+
+        # Initialise month lists.
+
+        start_month_list, end_month_list = self.get_month_lists()
+        start_year_default, end_year_default = self.get_year_defaults()
+
+        # Criteria instead of months and years.
 
-        month_list = []
-        month_list.append('<option value=""></option>')
+        start_criteria_default = form.get("start", [""])[0]
+        end_criteria_default = form.get("end", [""])[0]
+
+        start_criteria_evaluated = EventAggregatorSupport.getParameterMonth(start_criteria_default)
+        end_criteria_evaluated = EventAggregatorSupport.getParameterMonth(end_criteria_default)
 
-        for month in range(1, 13):
-            month_label = _(EventAggregatorSupport.getMonthLabel(month))
-            month_list.append('<option value="%02d">%s</option>' % (month, escape(month_label)))
+        start_criteria_evaluated = start_criteria_evaluated and \
+            EventAggregatorSupport.getFullMonthLabel(request, start_criteria_evaluated) or ""
+        end_criteria_evaluated = end_criteria_evaluated and \
+            EventAggregatorSupport.getFullMonthLabel(request, end_criteria_evaluated) or ""
+
+        # Descriptions.
+
+        descriptions = form.get("descriptions", [None])[0]
 
         descriptions_list = [
-            '<option value="%s">%s</option>' % ("page", escape(_("page"))),
-            '<option value="%s">%s</option>' % ("comment", escape(_("comment")))
+            '<option value="%s" %s>%s</option>' % ("page", self._get_selected("page", descriptions), escape(_("page"))),
+            '<option value="%s" %s>%s</option>' % ("comment", self._get_selected("comment", descriptions), escape(_("comment")))
             ]
 
+        # Format.
+
+        format = form.get("format", [None])[0]
+
         format_list = [
-            '<option value="%s">%s</option>' % ("iCalendar", escape(_("iCalendar"))),
-            '<option value="%s">%s</option>' % ("RSS", escape(_("RSS 2.0")))
+            '<option value="%s" %s>%s</option>' % ("iCalendar", self._get_selected("iCalendar", format), escape(_("iCalendar"))),
+            '<option value="%s" %s>%s</option>' % ("RSS", self._get_selected("RSS", format), escape(_("RSS 2.0")))
             ]
 
+        right_arrow = unicode('\xe2\x86\x92', "utf-8")
+
         d = {
             "buttons_html"          : buttons_html,
             "category_label"        : escape(_("Categories")),
             "category_list"         : "\n".join(category_list),
-            "month_list"            : "\n".join(month_list),
+            "start_month_list"      : "\n".join(start_month_list),
             "start_label"           : escape(_("Start year and month")),
-            "start_year_default"    : "",
+            "start_year_default"    : escattr(start_year_default),
+            "start_criteria_label"  : escape(_("or special criteria")),
+            "start_criteria_default": escattr(start_criteria_default),
+            "start_eval_label"      : escape(right_arrow),
+            "start_criteria_eval"   : escape(start_criteria_evaluated),
+            "end_month_list"        : "\n".join(end_month_list),
             "end_label"             : escape(_("End year and month")),
-            "end_year_default"      : "",
+            "end_year_default"      : escattr(end_year_default),
+            "end_criteria_label"    : escape(_("or special criteria")),
+            "end_criteria_default"  : escattr(end_criteria_default),
+            "end_eval_label"        : escape(right_arrow),
+            "end_criteria_eval"     : escape(end_criteria_evaluated),
             "descriptions_label"    : escape(_("Use descriptions from...")),
             "descriptions_list"     : "\n".join(descriptions_list),
             "format_label"          : escape(_("Summary format")),
@@ -91,21 +122,37 @@
         <td class="label"><label>%(start_label)s</label></td>
         <td>
             <select name="start-month">
-                %(month_list)s
+                %(start_month_list)s
             </select>
             <input name="start-year" type="text" value="%(start_year_default)s" size="4" />
         </td>
     </tr>
     <tr>
+        <td class="label"><label>%(start_criteria_label)s</label></td>
+        <td>
+            <input name="start" type="text" value="%(start_criteria_default)s" size="12" />
+            <input name="start-eval" type="submit" value="%(start_eval_label)s" />
+            %(start_criteria_eval)s
+        </td>
+    </tr>
+    <tr>
         <td class="label"><label>%(end_label)s</label></td>
         <td>
             <select name="end-month">
-                %(month_list)s
+                %(end_month_list)s
             </select>
             <input name="end-year" type="text" value="%(end_year_default)s" size="4" />
         </td>
     </tr>
     <tr>
+        <td class="label"><label>%(end_criteria_label)s</label></td>
+        <td>
+            <input name="end" type="text" value="%(end_criteria_default)s" size="12" />
+            <input name="end-eval" type="submit" value="%(end_eval_label)s" />
+            %(end_criteria_eval)s
+        </td>
+    </tr>
+    <tr>
         <td class="label"><label>%(descriptions_label)s</label></td>
         <td class="content">
             <select name="descriptions">
@@ -141,7 +188,7 @@
         "Write the iCalendar resource."
 
         _ = self._
-        form = self.request.form
+        form = self.get_form()
 
         # If no category names exist in the request, an error message is
         # returned.
@@ -179,7 +226,7 @@
     can be specified.
     """
 
-    form = request.form
+    form = EventAggregatorSupport.get_form(request)
 
     category_names = form.get("category", [])
     format = form.get("format", ["iCalendar"])[0]
@@ -206,10 +253,12 @@
 
     # Output summary data...
 
-    if EventAggregatorSupport.isMoin15():
+    if hasattr(request, "http_headers"):
         send_headers = request.http_headers
+    elif hasattr(request, "emit_http_headers"):
+        send_headers = request.emit_http_headers
     else:
-        send_headers = request.emit_http_headers
+        send_headers = EventAggregatorSupport.send_headers(request)
 
     # Define headers.
 
@@ -285,12 +334,19 @@
         # Using the page name and the page URL in the title, link and
         # description.
 
+        if hasattr(request, "getPathinfo"):
+            path_info = request.getPathinfo()
+        else:
+            path_info = request.path
+
         request.write('<rss version="2.0">\r\n')
         request.write('<channel>\r\n')
-        request.write('<title>%s</title>\r\n' % request.getPathinfo()[1:])
-        request.write('<link>%s%s</link>\r\n' % (request.getBaseURL(), request.getPathinfo()))
-        request.write('<description>Events published on %s%s</description>\r\n' % (request.getBaseURL(), request.getPathinfo()))
-        request.write('<lastBuildDate>%s</lastBuildDate>\r\n' % EventAggregatorSupport.getHTTPTimeString(latest_timestamp))
+        request.write('<title>%s</title>\r\n' % path_info[1:])
+        request.write('<link>%s%s</link>\r\n' % (request.getBaseURL(), path_info))
+        request.write('<description>Events published on %s%s</description>\r\n' % (request.getBaseURL(), path_info))
+
+        if latest_timestamp is not None:
+            request.write('<lastBuildDate>%s</lastBuildDate>\r\n' % EventAggregatorSupport.getHTTPTimeString(latest_timestamp))
  
         # Sort all_shown_events by start date, reversed:
         #
@@ -335,9 +391,6 @@
         request.write('</channel>\r\n')
         request.write('</rss>\r\n')
 
-    if EventAggregatorSupport.isMoin15():
-        raise MoinMoin.util.MoinMoinNoFooter
-
 def write_calendar_datetime(request, datetime):
 
     """
diff -r bb420cdfe360 -r 3c602433e6b5 css/event-aggregator.css
--- a/css/event-aggregator.css	Sun Feb 06 02:38:17 2011 +0100
+++ b/css/event-aggregator.css	Sat Feb 19 03:06:03 2011 +0100
@@ -21,6 +21,36 @@
 
 .event-download {
     padding-right: 2em;
+    position: relative;
+}
+
+.event-download a {
+    font-size: smaller;
+}
+
+.event-download-popup {
+    display: none;
+}
+
+.event-download:hover .event-download-popup {
+    display: block;
+    position: absolute;
+    top: 1.5em;
+    left: 0;
+    z-index: 3;
+    background-color: #fff;
+    color: #000;
+    padding: 0.5em;
+    border: 1px solid #000;
+}
+
+.event-download-period {
+    display: block;
+}
+
+.event-download-period-raw {
+    display: block;
+    font-size: smaller;
 }
 
 .event-view-controls {
@@ -31,6 +61,10 @@
     padding-right: 2em;
 }
 
+.event-view a {
+    font-size: smaller;
+}
+
 /* Calendar view. */
 
 .event-month {
diff -r bb420cdfe360 -r 3c602433e6b5 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sun Feb 06 02:38:17 2011 +0100
+++ b/macros/EventAggregator.py	Sat Feb 19 03:06:03 2011 +0100
@@ -24,7 +24,7 @@
 
     def __init__(self, page, calendar_name, raw_calendar_start, raw_calendar_end,
         calendar_start, calendar_end, first, last, category_names, template_name,
-        parent_name, mode):
+        parent_name, mode, name_usage):
 
         """
         Initialise the view with the current 'page', a 'calendar_name' (which
@@ -35,6 +35,9 @@
 
         The additional 'category_names', 'template_name', 'parent_name' and
         'mode' parameters are used to configure the links employed by the view.
+
+        The 'name_usage' parameter controls how names are shown on calendar mode
+        events.
         """
 
         self.page = page
@@ -46,6 +49,7 @@
         self.template_name = template_name
         self.parent_name = parent_name
         self.mode = mode
+        self.name_usage = name_usage
 
         self.category_name_parameters = "&".join([("category=%s" % name) for name in category_names])
 
@@ -66,9 +70,46 @@
             self.next_set_end = last.month_update(self.number_of_months)
 
     def getQualifiedParameterName(self, argname):
+
+        "Return the 'argname' qualified using the calendar name."
+
         return EventAggregatorSupport.getQualifiedParameterName(self.calendar_name, argname)
 
+    def getMonthYearQueryString(self, argname, year_month, prefix=1):
+
+        """
+        Return a query string fragment for the given 'argname', referring to the
+        month given by the specified 'year_month' object, appropriate for this
+        calendar.
+
+        If 'prefix' is specified and set to a false value, the parameters in the
+        query string will not be calendar-specific, but could be used with the
+        summary action.
+        """
+
+        if year_month is not None:
+            year, month = year_month.as_tuple()
+            month_argname = "%s-month" % argname
+            year_argname = "%s-year" % argname
+            if prefix:
+                month_argname = self.getQualifiedParameterName(month_argname)
+                year_argname = self.getQualifiedParameterName(year_argname)
+            return "%s=%s&%s=%s" % (month_argname, month, year_argname, year)
+        else:
+            return ""
+
     def getMonthQueryString(self, argname, month, prefix=1):
+
+        """
+        Return a query string fragment for the given 'argname', referring to the
+        month given by the specified 'month' value, appropriate for this
+        calendar.
+
+        If 'prefix' is specified and set to a false value, the parameters in the
+        query string will not be calendar-specific, but could be used with the
+        summary action.
+        """
+
         if month is not None:
             if prefix:
                 argname = self.getQualifiedParameterName(argname)
@@ -77,12 +118,24 @@
             return ""
 
     def getNavigationLink(self, start, end, mode=None):
+
+        """
+        Return a query string fragment for navigation to a view showing months
+        from 'start' to 'end' inclusive, with the optional 'mode' indicating the
+        view style.
+        """
+
         return "%s&%s&%s=%s" % (
             self.getMonthQueryString("start", start),
             self.getMonthQueryString("end", end),
             self.getQualifiedParameterName("mode"), mode or self.mode
             )
 
+    def getFullMonthLabel(self, year_month):
+        page = self.page
+        request = page.request
+        return EventAggregatorSupport.getFullMonthLabel(request, year_month)
+
     def writeDownloadControls(self):
         page = self.page
         request = page.request
@@ -93,13 +146,18 @@
 
         # Generate the links.
 
-        download_all_link = "action=EventAggregatorSummary&doit=1&parent=%s&%s" % (
+        download_dialogue_link = "action=EventAggregatorSummary&parent=%s&%s" % (
             self.parent_name or "", self.category_name_parameters
             )
+        download_all_link = download_dialogue_link + "&doit=1"
         download_link = download_all_link + ("&%s&%s" % (
-            self.getMonthQueryString("start", self.calendar_start, prefix=0),
-            self.getMonthQueryString("end", self.calendar_end, prefix=0)
+            self.getMonthYearQueryString("start", self.calendar_start, prefix=0),
+            self.getMonthYearQueryString("end", self.calendar_end, prefix=0)
             ))
+
+        # Subscription links just explicitly select the RSS format.
+
+        subscribe_dialogue_link = download_dialogue_link + "&format=RSS"
         subscribe_all_link = download_all_link + "&format=RSS"
         subscribe_link = download_link + "&format=RSS"
 
@@ -119,23 +177,76 @@
 
         period_limits = "".join(period_limits)
 
+        download_dialogue_link += period_limits
         download_all_link += period_limits
+        subscribe_dialogue_link += period_limits
         subscribe_all_link += period_limits
 
+        # Pop-up descriptions of the downloadable calendars.
+
+        calendar_period = "%s - %s" % (
+            self.getFullMonthLabel(self.calendar_start),
+            self.getFullMonthLabel(self.calendar_end)
+            )
+        raw_calendar_period = "%s - %s" % (self.raw_calendar_start, self.raw_calendar_end)
+
         # Write the controls.
 
+        # Download controls.
+
         output.append(fmt.div(on=1, css_class="event-download-controls"))
         output.append(fmt.span(on=1, css_class="event-download"))
         output.append(linkToPage(request, page, _("Download this view"), download_link))
+        output.append(fmt.span(on=1, css_class="event-download-popup"))
+        output.append(fmt.text(calendar_period))
         output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+
         output.append(fmt.span(on=1, css_class="event-download"))
         output.append(linkToPage(request, page, _("Download this calendar"), download_all_link))
+        output.append(fmt.span(on=1, css_class="event-download-popup"))
+        output.append(fmt.span(on=1, css_class="event-download-period"))
+        output.append(fmt.text(calendar_period))
         output.append(fmt.span(on=0))
+        output.append(fmt.span(on=1, css_class="event-download-period-raw"))
+        output.append(fmt.text(raw_calendar_period))
+        output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+
+        output.append(fmt.span(on=1, css_class="event-download"))
+        output.append(linkToPage(request, page, _("Download..."), download_dialogue_link))
+        output.append(fmt.span(on=1, css_class="event-download-popup"))
+        output.append(fmt.text(_("Edit download options")))
+        output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+
+        # Subscription controls.
+
         output.append(fmt.span(on=1, css_class="event-download"))
         output.append(linkToPage(request, page, _("Subscribe to this view"), subscribe_link))
+        output.append(fmt.span(on=1, css_class="event-download-popup"))
+        output.append(fmt.text(calendar_period))
         output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+
         output.append(fmt.span(on=1, css_class="event-download"))
         output.append(linkToPage(request, page, _("Subscribe to this calendar"), subscribe_all_link))
+        output.append(fmt.span(on=1, css_class="event-download-popup"))
+        output.append(fmt.span(on=1, css_class="event-download-period"))
+        output.append(fmt.text(calendar_period))
+        output.append(fmt.span(on=0))
+        output.append(fmt.span(on=1, css_class="event-download-period-raw"))
+        output.append(fmt.text(raw_calendar_period))
+        output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+        output.append(fmt.span(on=0))
+
+        output.append(fmt.span(on=1, css_class="event-download"))
+        output.append(linkToPage(request, page, _("Subscribe..."), subscribe_dialogue_link))
+        output.append(fmt.span(on=1, css_class="event-download-popup"))
+        output.append(fmt.text(_("Edit subscription options")))
+        output.append(fmt.span(on=0))
         output.append(fmt.span(on=0))
         output.append(fmt.div(on=0))
 
@@ -180,12 +291,10 @@
         request = page.request
         fmt = page.formatter
         _ = request.getText
+        full_month_label = self.getFullMonthLabel(year_month)
 
         output = []
 
-        year, month = year_month.as_tuple()
-        month_label = _(EventAggregatorSupport.getMonthLabel(month))
-
         # Prepare navigation links.
 
         if self.calendar_name is not None:
@@ -213,7 +322,6 @@
 
             # A link leading to this month being at the top of the calendar.
 
-            full_month_label = "%s %s" % (month_label, year)
             end_month = year_month.month_update(self.number_of_months - 1)
 
             month_link = self.getNavigationLink(year_month, end_month)
@@ -234,11 +342,7 @@
 
         else:
             output.append(fmt.span(on=1))
-            output.append(fmt.text(month_label))
-            output.append(fmt.span(on=0))
-            output.append(fmt.text(" "))
-            output.append(fmt.span(on=1))
-            output.append(fmt.text(unicode(year)))
+            output.append(fmt.text(full_month_label))
             output.append(fmt.span(on=0))
 
         return "".join(output)
@@ -275,6 +379,330 @@
 
         return "".join(output)
 
+    # Calendar layout methods.
+
+    def writeDayNumbers(self, first_day, number_of_days, month, busy_dates):
+        page = self.page
+        fmt = page.formatter
+
+        output = []
+        output.append(fmt.table_row(on=1))
+
+        for weekday in range(0, 7):
+            day = first_day + weekday
+            date = month.as_date(day)
+
+            # Output out-of-month days.
+
+            if day < 1 or day > number_of_days:
+                output.append(fmt.table_cell(on=1,
+                    attrs={"class" : "event-day-heading event-day-excluded", "colspan" : "3"}))
+                output.append(fmt.table_cell(on=0))
+
+            # Output normal days.
+
+            else:
+                if date in busy_dates:
+                    output.append(fmt.table_cell(on=1,
+                        attrs={"class" : "event-day-heading event-day-busy", "colspan" : "3"}))
+                else:
+                    output.append(fmt.table_cell(on=1,
+                        attrs={"class" : "event-day-heading event-day-empty", "colspan" : "3"}))
+
+                # Output the day number, making a link to a new event
+                # action.
+
+                output.append(self.writeDayNumberLinked(date))
+
+                # End of day.
+
+                output.append(fmt.table_cell(on=0))
+
+        # End of day numbers.
+
+        output.append(fmt.table_row(on=0))
+        return "".join(output)
+
+    def writeEmptyWeek(self, first_day, number_of_days):
+        page = self.page
+        fmt = page.formatter
+
+        output = []
+        output.append(fmt.table_row(on=1))
+
+        for weekday in range(0, 7):
+            day = first_day + weekday
+
+            # Output out-of-month days.
+
+            if day < 1 or day > number_of_days:
+                output.append(fmt.table_cell(on=1,
+                    attrs={"class" : "event-day-content event-day-excluded", "colspan" : "3"}))
+                output.append(fmt.table_cell(on=0))
+
+            # Output empty days.
+
+            else:
+                output.append(fmt.table_cell(on=1,
+                    attrs={"class" : "event-day-content event-day-empty", "colspan" : "3"}))
+
+        output.append(fmt.table_row(on=0))
+        return "".join(output)
+
+    def writeWeekSlots(self, first_day, number_of_days, month, week_end, week_slots):
+        output = []
+
+        locations = week_slots.keys()
+        locations.sort(EventAggregatorSupport.sort_none_first)
+
+        # Visit each slot corresponding to a location (or no location).
+
+        for location in locations:
+
+            # Visit each coverage span, presenting the events in the span.
+
+            for coverage, events in week_slots[location]:
+
+                # Output each set.
+
+                output.append(self.writeWeekSlot(first_day, number_of_days, month, week_end, coverage, events))
+
+                # Add a spacer.
+
+                output.append(self.writeSpacer(first_day, number_of_days))
+
+        return "".join(output)
+
+    def writeWeekSlot(self, first_day, number_of_days, month, week_end, coverage, events):
+        page = self.page
+        request = page.request
+        fmt = page.formatter
+
+        output = []
+        output.append(fmt.table_row(on=1))
+
+        # Then, output day details.
+
+        for weekday in range(0, 7):
+            day = first_day + weekday
+            date = month.as_date(day)
+
+            # Skip out-of-month days.
+
+            if day < 1 or day > number_of_days:
+                output.append(fmt.table_cell(on=1,
+                    attrs={"class" : "event-day-content event-day-excluded", "colspan" : "3"}))
+                output.append(fmt.table_cell(on=0))
+                continue
+
+            # Output the day.
+
+            if date not in coverage:
+                output.append(fmt.table_cell(on=1,
+                    attrs={"class" : "event-day-content event-day-empty", "colspan" : "3"}))
+
+            # Get event details for the current day.
+
+            for event in events:
+                event_page = event.getPage()
+                event_details = event.getDetails()
+
+                if not (event_details["start"] <= date <= event_details["end"]):
+                    continue
+
+                # Get basic properties of the event.
+
+                starts_today = event_details["start"] == date
+                ends_today = event_details["end"] == date
+                event_summary = event.getSummary(self.parent_name)
+                is_ambiguous = event_details["start"].ambiguous() or event_details["end"].ambiguous()
+
+                # Generate a colour for the event.
+
+                bg = getColour(event_summary)
+                fg = getBlackOrWhite(bg)
+                style = ("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + fg))
+
+                # Determine if the event name should be shown.
+
+                start_of_period = starts_today or weekday == 0 or day == 1
+
+                if self.name_usage == "daily" or start_of_period:
+                    hide_text = 0
+                else:
+                    hide_text = 1
+
+                # Output start of day gap and determine whether
+                # any event content should be explicitly output
+                # for this day.
+
+                if starts_today:
+
+                    # Single day events...
+
+                    if ends_today:
+                        colspan = 3
+                        event_day_type = "event-day-single"
+
+                    # Events starting today...
+
+                    else:
+                        output.append(fmt.table_cell(on=1, attrs={"class" : "event-day-start-gap"}))
+                        output.append(fmt.table_cell(on=0))
+
+                        # Calculate the span of this cell.
+                        # Events whose names appear on every day...
+
+                        if self.name_usage == "daily":
+                            colspan = 2
+                            event_day_type = "event-day-starting"
+
+                        # Events whose names appear once per week...
+
+                        else:
+                            if event_details["end"] <= week_end:
+                                event_length = event_details["end"].day() - day + 1
+                                colspan = (event_length - 2) * 3 + 4
+                            else:
+                                event_length = week_end.day() - day + 1
+                                colspan = (event_length - 1) * 3 + 2
+
+                            event_day_type = "event-day-multiple"
+
+                # Events continuing from a previous week...
+
+                elif start_of_period:
+
+                    # End of continuing event...
+
+                    if ends_today:
+                        colspan = 2
+                        event_day_type = "event-day-ending"
+
+                    # Events continuing for at least one more day...
+
+                    else:
+
+                        # Calculate the span of this cell.
+                        # Events whose names appear on every day...
+
+                        if self.name_usage == "daily":
+                            colspan = 3
+                            event_day_type = "event-day-full"
+
+                        # Events whose names appear once per week...
+
+                        else:
+                            if event_details["end"] <= week_end:
+                                event_length = event_details["end"].day() - day + 1
+                                colspan = (event_length - 1) * 3 + 2
+                            else:
+                                event_length = week_end.day() - day + 1
+                                colspan = event_length * 3
+
+                            event_day_type = "event-day-multiple"
+
+                # Continuing events whose names appear on every day...
+
+                elif self.name_usage == "daily":
+                    if ends_today:
+                        colspan = 2
+                        event_day_type = "event-day-ending"
+                    else:
+                        colspan = 3
+                        event_day_type = "event-day-full"
+
+                # Continuing events whose names appear once per week...
+
+                else:
+                    colspan = None
+
+                # Output the main content only if it is not
+                # continuing from a previous day.
+
+                if colspan is not None:
+
+                    # Colour the cell for continuing events.
+
+                    attrs={
+                        "class" : "event-day-content event-day-busy %s" % event_day_type,
+                        "colspan" : str(colspan)
+                        }
+
+                    if not (starts_today and ends_today):
+                        attrs["style"] = style
+
+                    output.append(fmt.table_cell(on=1, attrs=attrs))
+
+                    # Output the event.
+
+                    if starts_today and ends_today or not hide_text:
+
+                        # The event box contains the summary, alongside
+                        # other elements.
+
+                        output.append(fmt.div(on=1, css_class="event-summary-box"))
+                        output.append(fmt.div(on=1, css_class="event-summary", style=style))
+
+                        if is_ambiguous:
+                            output.append(fmt.icon("/!\\"))
+
+                        output.append(event_page.linkToPage(request, event_summary))
+                        output.append(fmt.div(on=0))
+
+                        # Add a pop-up element for long summaries.
+
+                        output.append(fmt.div(on=1, css_class="event-summary-popup", style=style))
+
+                        if is_ambiguous:
+                            output.append(fmt.icon("/!\\"))
+
+                        output.append(event_page.linkToPage(request, event_summary))
+                        output.append(fmt.div(on=0))
+
+                        output.append(fmt.div(on=0))
+
+                    # Output end of day content.
+
+                    output.append(fmt.div(on=0))
+
+                # Output end of day gap.
+
+                if ends_today and not starts_today:
+                    output.append(fmt.table_cell(on=1, attrs={"class" : "event-day-end-gap"}))
+                    output.append(fmt.table_cell(on=0))
+
+            # End of day.
+
+            output.append(fmt.table_cell(on=0))
+
+        # End of set.
+
+        output.append(fmt.table_row(on=0))
+        return "".join(output)
+
+    def writeSpacer(self, first_day, number_of_days):
+        page = self.page
+        fmt = page.formatter
+
+        output = []
+        output.append(fmt.table_row(on=1))
+
+        for weekday in range(0, 7):
+            day = first_day + weekday
+            css_classes = "event-day-spacer"
+
+            # Skip out-of-month days.
+
+            if day < 1 or day > number_of_days:
+                css_classes += " event-day-excluded"
+
+            output.append(fmt.table_cell(on=1, attrs={"class" : css_classes, "colspan" : "3"}))
+            output.append(fmt.table_cell(on=0))
+
+        output.append(fmt.table_row(on=0))
+        return "".join(output)
+
 # HTML-related functions.
 
 def getColour(s):
@@ -309,7 +737,7 @@
 
       mode=calendar     shows a calendar view of events
       mode=list         shows a list of events by month
-      mode=ics          provides iCalendar data for the events
+      mode=table        shows a table of events
 
       names=daily       shows the name of an event on every day of that event
       names=weekly      shows the name of an event once per week
@@ -398,7 +826,7 @@
     # Define a view of the calendar, retaining useful navigational information.
 
     view = View(page, calendar_name, raw_calendar_start, raw_calendar_end, calendar_start, calendar_end,
-        first, last, category_names, template_name, parent_name, mode)
+        first, last, category_names, template_name, parent_name, mode, name_usage)
 
     # Make a calendar.
 
@@ -555,295 +983,22 @@
                     week_start = month.as_date(max(first_day, 1))
                     week_end = month.as_date(min(first_day + 6, number_of_days))
 
-                    week_coverage, week_events = EventAggregatorSupport.getCoverage(
+                    full_coverage, week_slots = EventAggregatorSupport.getCoverage(
                         week_start, week_end, shown_events.get(month, []))
 
                     # Output a week, starting with the day numbers.
 
-                    output.append(fmt.table_row(on=1))
-
-                    for weekday in range(0, 7):
-                        day = first_day + weekday
-                        date = month.as_date(day)
-
-                        # Output out-of-month days.
-
-                        if day < 1 or day > number_of_days:
-                            output.append(fmt.table_cell(on=1,
-                                attrs={"class" : "event-day-heading event-day-excluded", "colspan" : "3"}))
-                            output.append(fmt.table_cell(on=0))
-
-                        # Output normal days.
-
-                        else:
-                            if date in week_coverage:
-                                output.append(fmt.table_cell(on=1,
-                                    attrs={"class" : "event-day-heading event-day-busy", "colspan" : "3"}))
-                            else:
-                                output.append(fmt.table_cell(on=1,
-                                    attrs={"class" : "event-day-heading event-day-empty", "colspan" : "3"}))
-
-                            # Output the day number, making a link to a new event
-                            # action.
-
-                            output.append(view.writeDayNumberLinked(date))
-
-                            # End of day.
-
-                            output.append(fmt.table_cell(on=0))
-
-                    # End of day numbers.
-
-                    output.append(fmt.table_row(on=0))
+                    output.append(view.writeDayNumbers(first_day, number_of_days, month, full_coverage))
 
                     # Either generate empty days...
 
-                    if not week_events:
-                        output.append(fmt.table_row(on=1))
-
-                        for weekday in range(0, 7):
-                            day = first_day + weekday
-
-                            # Output out-of-month days.
+                    if not week_slots:
+                        output.append(view.writeEmptyWeek(first_day, number_of_days))
 
-                            if day < 1 or day > number_of_days:
-                                output.append(fmt.table_cell(on=1,
-                                    attrs={"class" : "event-day-content event-day-excluded", "colspan" : "3"}))
-                                output.append(fmt.table_cell(on=0))
-
-                            # Output empty days.
-
-                            else:
-                                output.append(fmt.table_cell(on=1,
-                                    attrs={"class" : "event-day-content event-day-empty", "colspan" : "3"}))
-
-                        output.append(fmt.table_row(on=0))
-
-                    # Or visit each set of scheduled events...
+                    # Or generate each set of scheduled events...
 
                     else:
-                        for coverage, events in week_events:
-
-                            # Output each set.
-
-                            output.append(fmt.table_row(on=1))
-
-                            # Then, output day details.
-
-                            for weekday in range(0, 7):
-                                day = first_day + weekday
-                                date = month.as_date(day)
-
-                                # Skip out-of-month days.
-
-                                if day < 1 or day > number_of_days:
-                                    output.append(fmt.table_cell(on=1,
-                                        attrs={"class" : "event-day-content event-day-excluded", "colspan" : "3"}))
-                                    output.append(fmt.table_cell(on=0))
-                                    continue
-
-                                # Output the day.
-
-                                if date not in coverage:
-                                    output.append(fmt.table_cell(on=1,
-                                        attrs={"class" : "event-day-content event-day-empty", "colspan" : "3"}))
-
-                                # Get event details for the current day.
-
-                                for event in events:
-                                    event_page = event.getPage()
-                                    event_details = event.getDetails()
-
-                                    if not (event_details["start"] <= date <= event_details["end"]):
-                                        continue
-
-                                    # Get basic properties of the event.
-
-                                    starts_today = event_details["start"] == date
-                                    ends_today = event_details["end"] == date
-                                    event_summary = event.getSummary(parent_name)
-                                    is_ambiguous = event_details["start"].ambiguous() or event_details["end"].ambiguous()
-
-                                    # Generate a colour for the event.
-
-                                    bg = getColour(event_summary)
-                                    fg = getBlackOrWhite(bg)
-                                    style = ("background-color: rgb(%d, %d, %d); color: rgb(%d, %d, %d);" % (bg + fg))
-
-                                    # Determine if the event name should be shown.
-
-                                    start_of_period = starts_today or weekday == 0 or day == 1
-
-                                    if name_usage == "daily" or start_of_period:
-                                        hide_text = 0
-                                    else:
-                                        hide_text = 1
-
-                                    # Output start of day gap and determine whether
-                                    # any event content should be explicitly output
-                                    # for this day.
-
-                                    if starts_today:
-
-                                        # Single day events...
-
-                                        if ends_today:
-                                            colspan = 3
-                                            event_day_type = "event-day-single"
-
-                                        # Events starting today...
-
-                                        else:
-                                            output.append(fmt.table_cell(on=1, attrs={"class" : "event-day-start-gap"}))
-                                            output.append(fmt.table_cell(on=0))
-
-                                            # Calculate the span of this cell.
-                                            # Events whose names appear on every day...
-
-                                            if name_usage == "daily":
-                                                colspan = 2
-                                                event_day_type = "event-day-starting"
-
-                                            # Events whose names appear once per week...
-
-                                            else:
-                                                if event_details["end"] <= week_end:
-                                                    event_length = event_details["end"].day() - day + 1
-                                                    colspan = (event_length - 2) * 3 + 4
-                                                else:
-                                                    event_length = week_end.day() - day + 1
-                                                    colspan = (event_length - 1) * 3 + 2
-
-                                                event_day_type = "event-day-multiple"
-
-                                    # Events continuing from a previous week...
-
-                                    elif start_of_period:
-
-                                        # End of continuing event...
-
-                                        if ends_today:
-                                            colspan = 2
-                                            event_day_type = "event-day-ending"
-
-                                        # Events continuing for at least one more day...
-
-                                        else:
-
-                                            # Calculate the span of this cell.
-                                            # Events whose names appear on every day...
-
-                                            if name_usage == "daily":
-                                                colspan = 3
-                                                event_day_type = "event-day-full"
-
-                                            # Events whose names appear once per week...
-
-                                            else:
-                                                if event_details["end"] <= week_end:
-                                                    event_length = event_details["end"].day() - day + 1
-                                                    colspan = (event_length - 1) * 3 + 2
-                                                else:
-                                                    event_length = week_end.day() - day + 1
-                                                    colspan = event_length * 3
-
-                                                event_day_type = "event-day-multiple"
-
-                                    # Continuing events whose names appear on every day...
-
-                                    elif name_usage == "daily":
-                                        if ends_today:
-                                            colspan = 2
-                                            event_day_type = "event-day-ending"
-                                        else:
-                                            colspan = 3
-                                            event_day_type = "event-day-full"
-
-                                    # Continuing events whose names appear once per week...
-
-                                    else:
-                                        colspan = None
-
-                                    # Output the main content only if it is not
-                                    # continuing from a previous day.
-
-                                    if colspan is not None:
-
-                                        # Colour the cell for continuing events.
-
-                                        attrs={
-                                            "class" : "event-day-content event-day-busy %s" % event_day_type,
-                                            "colspan" : str(colspan)
-                                            }
-
-                                        if not (starts_today and ends_today):
-                                            attrs["style"] = style
-
-                                        output.append(fmt.table_cell(on=1, attrs=attrs))
-
-                                        # Output the event.
-
-                                        if starts_today and ends_today or not hide_text:
-
-                                            # The event box contains the summary, alongside
-                                            # other elements.
-
-                                            output.append(fmt.div(on=1, css_class="event-summary-box"))
-                                            output.append(fmt.div(on=1, css_class="event-summary", style=style))
-
-                                            if is_ambiguous:
-                                                output.append(fmt.icon("/!\\"))
-
-                                            output.append(event_page.linkToPage(request, event_summary))
-                                            output.append(fmt.div(on=0))
-
-                                            # Add a pop-up element for long summaries.
-
-                                            output.append(fmt.div(on=1, css_class="event-summary-popup", style=style))
-
-                                            if is_ambiguous:
-                                                output.append(fmt.icon("/!\\"))
-
-                                            output.append(event_page.linkToPage(request, event_summary))
-                                            output.append(fmt.div(on=0))
-
-                                            output.append(fmt.div(on=0))
-
-                                        # Output end of day content.
-
-                                        output.append(fmt.div(on=0))
-
-                                    # Output end of day gap.
-
-                                    if ends_today and not starts_today:
-                                        output.append(fmt.table_cell(on=1, attrs={"class" : "event-day-end-gap"}))
-                                        output.append(fmt.table_cell(on=0))
-
-                                # End of day.
-
-                                output.append(fmt.table_cell(on=0))
-
-                            # End of set.
-
-                            output.append(fmt.table_row(on=0))
-
-                            # Add a spacer.
-
-                            output.append(fmt.table_row(on=1))
-
-                            for weekday in range(0, 7):
-                                day = first_day + weekday
-                                css_classes = "event-day-spacer"
-
-                                # Skip out-of-month days.
-
-                                if day < 1 or day > number_of_days:
-                                    css_classes += " event-day-excluded"
-
-                                output.append(fmt.table_cell(on=1, attrs={"class" : css_classes, "colspan" : "3"}))
-                                output.append(fmt.table_cell(on=0))
-
-                            output.append(fmt.table_row(on=0))
+                        output.append(view.writeWeekSlots(first_day, number_of_days, month, week_end, week_slots))
 
                     # Process the next week...
 
diff -r bb420cdfe360 -r 3c602433e6b5 pages/HelpOnEventAggregator
--- a/pages/HelpOnEventAggregator	Sun Feb 06 02:38:17 2011 +0100
+++ b/pages/HelpOnEventAggregator	Sat Feb 19 03:06:03 2011 +0100
@@ -108,6 +108,8 @@
 
 To start a distinct event, just define a property that has already been recorded for the previous event on the page, if any. Usually, the start and end dates will be the most suitable properties for this purpose.
 
+Be careful ''not'' to start a distinct event with a property that was ''not'' recorded for the previous event: the result will be the property being added to the previous event, even if the property appears adjacent to the rest of the new event definition.
+
 <<Anchor(TimeProblems)>>
 === Occasional Problems with Times ===
 
diff -r bb420cdfe360 -r 3c602433e6b5 setup.py
--- a/setup.py	Sun Feb 06 02:38:17 2011 +0100
+++ b/setup.py	Sat Feb 19 03:06:03 2011 +0100
@@ -8,6 +8,6 @@
     author       = "Paul Boddie",
     author_email = "paul@boddie.org.uk",
     url          = "http://moinmo.in/MacroMarket/EventAggregator",
-    version      = "0.6.1",
+    version      = "0.6.2",
     py_modules   = ["EventAggregatorSupport", "MoinMoin.script.import.eventfeed"]
     )