1.1 --- a/macros/EventAggregator.py Tue Mar 31 00:43:20 2009 +0200
1.2 +++ b/macros/EventAggregator.py Thu Apr 02 00:59:53 2009 +0200
1.3 @@ -12,6 +12,8 @@
1.4 import EventAggregatorSupport
1.5 import calendar
1.6
1.7 +linkToPage = EventAggregatorSupport.linkToPage
1.8 +
1.9 try:
1.10 set
1.11 except NameError:
1.12 @@ -163,10 +165,10 @@
1.13
1.14 output.append(fmt.div(on=1, css_class="event-controls"))
1.15 output.append(fmt.span(on=1, css_class="event-download-calendar"))
1.16 - output.append(page.link_to_raw(request, wikiutil.escape(_("Download this calendar in iCalendar format")), download_link))
1.17 + output.append(linkToPage(request, page, _("Download this calendar in iCalendar format"), download_link))
1.18 output.append(fmt.span(on=0))
1.19 output.append(fmt.span(on=1, css_class="event-download-all"))
1.20 - output.append(page.link_to_raw(request, wikiutil.escape(_("Download all events in iCalendar format")), download_all_link))
1.21 + output.append(linkToPage(request, page, _("Download all events in iCalendar format"), download_all_link))
1.22 output.append(fmt.span(on=0))
1.23 output.append(fmt.div(on=0))
1.24
1.25 @@ -210,9 +212,9 @@
1.26 )
1.27
1.28 output.append(fmt.span(on=1, css_class="previous-month"))
1.29 - output.append(page.link_to_raw(request, wikiutil.escape("<<"), previous_set_link))
1.30 + output.append(linkToPage(request, page, "<<", previous_set_link))
1.31 output.append(fmt.text(" "))
1.32 - output.append(page.link_to_raw(request, wikiutil.escape("<"), previous_month_link))
1.33 + output.append(linkToPage(request, page, "<", previous_month_link))
1.34 output.append(fmt.span(on=0))
1.35
1.36 # Links to the next set of months and to a calendar shifted
1.37 @@ -228,9 +230,9 @@
1.38 )
1.39
1.40 output.append(fmt.span(on=1, css_class="next-month"))
1.41 - output.append(page.link_to_raw(request, wikiutil.escape(">"), next_month_link))
1.42 + output.append(linkToPage(request, page, ">", next_month_link))
1.43 output.append(fmt.text(" "))
1.44 - output.append(page.link_to_raw(request, wikiutil.escape(">>"), next_set_link))
1.45 + output.append(linkToPage(request, page, ">>", next_set_link))
1.46 output.append(fmt.span(on=0))
1.47
1.48 # A link leading to this month being at the top of the calendar.
1.49 @@ -242,7 +244,7 @@
1.50 getMonthQueryString(calendar_name, "start", (year, month)),
1.51 getMonthQueryString(calendar_name, "end", end_month)
1.52 )
1.53 - output.append(page.link_to_raw(request, wikiutil.escape(full_month_label), month_link))
1.54 + output.append(linkToPage(request, page, full_month_label, month_link))
1.55
1.56 else:
1.57 output.append(fmt.span(on=1))
1.58 @@ -411,7 +413,7 @@
1.59
1.60 if not hide_text:
1.61 output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=style))
1.62 - output.append(event_page.link_to_raw(request, wikiutil.escape(event_summary)))
1.63 + output.append(linkToPage(request, event_page, event_summary))
1.64 else:
1.65 output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=hidden_style))
1.66 output.append(fmt.text(event_summary))
1.67 @@ -467,7 +469,7 @@
1.68 # Link to the page using the summary.
1.69
1.70 output.append(fmt.paragraph(on=1))
1.71 - output.append(event_page.link_to_raw(request, wikiutil.escape(event_summary)))
1.72 + output.append(linkToPage(request, event_page, event_summary))
1.73 output.append(fmt.paragraph(on=0))
1.74
1.75 # Start and end dates.