1.1 --- a/macros/EventAggregator.py Fri Apr 29 00:23:34 2011 +0200
1.2 +++ b/macros/EventAggregator.py Mon May 02 00:30:37 2011 +0200
1.3 @@ -167,7 +167,7 @@
1.4 output = []
1.5 if start_label:
1.6 output.append(start_label)
1.7 - if self.calendar_end and start_label != end_label:
1.8 + if end_label and start_label != end_label:
1.9 if output:
1.10 output.append(" - ")
1.11 output.append(end_label)
1.12 @@ -1174,6 +1174,45 @@
1.13
1.14 return "".join(output)
1.15
1.16 + def writeMapEventSummaries(self, events):
1.17 + page = self.page
1.18 + fmt = page.formatter
1.19 + request = page.request
1.20 +
1.21 + output = []
1.22 + output.append(fmt.bullet_list(on=1, attr={"class" : "event-map-description-events"}))
1.23 +
1.24 + for event in events:
1.25 +
1.26 + # Get the event details.
1.27 +
1.28 + event_page = event.getPage()
1.29 + event_summary = event.getSummary(self.parent_name)
1.30 + start, end = event.as_limits()
1.31 + event_period = self._getCalendarPeriod(
1.32 + start and self.getFullDateLabel(start),
1.33 + end and self.getFullDateLabel(end),
1.34 + "")
1.35 +
1.36 + output.append(fmt.listitem(on=1))
1.37 +
1.38 + # Link to the page using the summary.
1.39 +
1.40 + output.append(event_page.linkToPage(request, event_summary))
1.41 +
1.42 + # Add the event period.
1.43 +
1.44 + output.append(fmt.text(" "))
1.45 + output.append(fmt.span(on=1, css_class="event-map-period"))
1.46 + output.append(fmt.text(event_period))
1.47 + output.append(fmt.span(on=0))
1.48 +
1.49 + output.append(fmt.listitem(on=0))
1.50 +
1.51 + output.append(fmt.bullet_list(on=0))
1.52 +
1.53 + return "".join(output)
1.54 +
1.55 # HTML-related functions.
1.56
1.57 def getColour(s):
1.58 @@ -1588,19 +1627,7 @@
1.59 output.append(fmt.text(location))
1.60 output.append(fmt.paragraph(on=0))
1.61
1.62 - output.append(fmt.bullet_list(on=1, attr={"class" : "event-map-description-events"}))
1.63 -
1.64 - for event in events:
1.65 - event_page = event.getPage()
1.66 - event_summary = event.getSummary(parent_name)
1.67 -
1.68 - # Link to the page using the summary.
1.69 -
1.70 - output.append(fmt.listitem(on=1))
1.71 - output.append(event_page.linkToPage(request, event_summary))
1.72 - output.append(fmt.listitem(on=0))
1.73 -
1.74 - output.append(fmt.bullet_list(on=0))
1.75 + output.append(view.writeMapEventSummaries(events))
1.76
1.77 output.append(fmt.div(on=0))
1.78 output.append(fmt.div(on=0))