1.1 --- a/macros/EventAggregator.py Thu Jan 28 23:57:15 2010 +0100
1.2 +++ b/macros/EventAggregator.py Fri Jan 29 01:05:53 2010 +0100
1.3 @@ -410,9 +410,10 @@
1.4
1.5 # Show the events in order.
1.6
1.7 - for event_page in ordered_events:
1.8 - event_summary = event_page.getEventSummary(parent_name)
1.9 - event_details = event_page.getEventDetails()
1.10 + for event in ordered_events:
1.11 + event_page = event.getPage()
1.12 + event_summary = event.getSummary(parent_name)
1.13 + event_details = event.getDetails()
1.14
1.15 # Prepare CSS classes with category-related styling.
1.16
1.17 @@ -623,8 +624,9 @@
1.18
1.19 # Get event details for the current day.
1.20
1.21 - for event_page in events:
1.22 - event_details = event_page.getEventDetails()
1.23 + for event in events:
1.24 + event_page = event.getPage()
1.25 + event_details = event.getDetails()
1.26
1.27 if not (event_details["start"] <= date <= event_details["end"]):
1.28 continue
1.29 @@ -633,7 +635,7 @@
1.30
1.31 starts_today = event_details["start"] == date
1.32 ends_today = event_details["end"] == date
1.33 - event_summary = event_page.getEventSummary(parent_name)
1.34 + event_summary = event.getSummary(parent_name)
1.35
1.36 # Generate a colour for the event.
1.37
1.38 @@ -837,9 +839,10 @@
1.39
1.40 # Show the events in order.
1.41
1.42 - for event_page in ordered_events:
1.43 - event_details = event_page.getEventDetails()
1.44 - event_summary = event_page.getEventSummary(parent_name)
1.45 + for event in ordered_events:
1.46 + event_page = event.getPage()
1.47 + event_details = event.getDetails()
1.48 + event_summary = event.getSummary(parent_name)
1.49
1.50 output.append(fmt.listitem(on=1, attr={"class" : "event-listing"}))
1.51