1.1 --- a/css/event-aggregator.css Fri Apr 29 00:23:34 2011 +0200
1.2 +++ b/css/event-aggregator.css Mon May 02 00:30:37 2011 +0200
1.3 @@ -463,5 +463,10 @@
1.4 padding: 0.25em 0 0.25em 0;
1.5 }
1.6
1.7 +.event-map-period {
1.8 + display: block;
1.9 + font-size: smaller;
1.10 +}
1.11 +
1.12 /* vim: tabstop=4 expandtab shiftwidth=4
1.13 */
2.1 --- a/macros/EventAggregator.py Fri Apr 29 00:23:34 2011 +0200
2.2 +++ b/macros/EventAggregator.py Mon May 02 00:30:37 2011 +0200
2.3 @@ -167,7 +167,7 @@
2.4 output = []
2.5 if start_label:
2.6 output.append(start_label)
2.7 - if self.calendar_end and start_label != end_label:
2.8 + if end_label and start_label != end_label:
2.9 if output:
2.10 output.append(" - ")
2.11 output.append(end_label)
2.12 @@ -1174,6 +1174,45 @@
2.13
2.14 return "".join(output)
2.15
2.16 + def writeMapEventSummaries(self, events):
2.17 + page = self.page
2.18 + fmt = page.formatter
2.19 + request = page.request
2.20 +
2.21 + output = []
2.22 + output.append(fmt.bullet_list(on=1, attr={"class" : "event-map-description-events"}))
2.23 +
2.24 + for event in events:
2.25 +
2.26 + # Get the event details.
2.27 +
2.28 + event_page = event.getPage()
2.29 + event_summary = event.getSummary(self.parent_name)
2.30 + start, end = event.as_limits()
2.31 + event_period = self._getCalendarPeriod(
2.32 + start and self.getFullDateLabel(start),
2.33 + end and self.getFullDateLabel(end),
2.34 + "")
2.35 +
2.36 + output.append(fmt.listitem(on=1))
2.37 +
2.38 + # Link to the page using the summary.
2.39 +
2.40 + output.append(event_page.linkToPage(request, event_summary))
2.41 +
2.42 + # Add the event period.
2.43 +
2.44 + output.append(fmt.text(" "))
2.45 + output.append(fmt.span(on=1, css_class="event-map-period"))
2.46 + output.append(fmt.text(event_period))
2.47 + output.append(fmt.span(on=0))
2.48 +
2.49 + output.append(fmt.listitem(on=0))
2.50 +
2.51 + output.append(fmt.bullet_list(on=0))
2.52 +
2.53 + return "".join(output)
2.54 +
2.55 # HTML-related functions.
2.56
2.57 def getColour(s):
2.58 @@ -1588,19 +1627,7 @@
2.59 output.append(fmt.text(location))
2.60 output.append(fmt.paragraph(on=0))
2.61
2.62 - output.append(fmt.bullet_list(on=1, attr={"class" : "event-map-description-events"}))
2.63 -
2.64 - for event in events:
2.65 - event_page = event.getPage()
2.66 - event_summary = event.getSummary(parent_name)
2.67 -
2.68 - # Link to the page using the summary.
2.69 -
2.70 - output.append(fmt.listitem(on=1))
2.71 - output.append(event_page.linkToPage(request, event_summary))
2.72 - output.append(fmt.listitem(on=0))
2.73 -
2.74 - output.append(fmt.bullet_list(on=0))
2.75 + output.append(view.writeMapEventSummaries(events))
2.76
2.77 output.append(fmt.div(on=0))
2.78 output.append(fmt.div(on=0))