1.1 --- a/macros/EventAggregator.py Thu Jul 08 02:17:12 2010 +0200
1.2 +++ b/macros/EventAggregator.py Thu Jul 08 22:15:54 2010 +0200
1.3 @@ -93,13 +93,18 @@
1.4
1.5 # Generate the links.
1.6
1.7 - download_all_link = "action=EventAggregatorSummary&doit=1&parent=%s&%s" % (
1.8 + download_dialogue_link = "action=EventAggregatorSummary&parent=%s&%s" % (
1.9 self.parent_name or "", self.category_name_parameters
1.10 )
1.11 + download_all_link = download_dialogue_link + "&doit=1"
1.12 download_link = download_all_link + ("&%s&%s" % (
1.13 self.getMonthQueryString("start", self.calendar_start, prefix=0),
1.14 self.getMonthQueryString("end", self.calendar_end, prefix=0)
1.15 ))
1.16 +
1.17 + # Subscription links just explicitly select the RSS format.
1.18 +
1.19 + subscribe_dialogue_link = download_dialogue_link + "&format=RSS"
1.20 subscribe_all_link = download_all_link + "&format=RSS"
1.21 subscribe_link = download_link + "&format=RSS"
1.22
1.23 @@ -119,23 +124,54 @@
1.24
1.25 period_limits = "".join(period_limits)
1.26
1.27 + download_dialogue_link += period_limits
1.28 download_all_link += period_limits
1.29 + subscribe_dialogue_link += period_limits
1.30 subscribe_all_link += period_limits
1.31
1.32 + # Pop-up descriptions of the downloadable calendars.
1.33 +
1.34 + calendar_period = "%s - %s" % (self.calendar_start, self.calendar_end)
1.35 + raw_calendar_period = "%s - %s" % (self.raw_calendar_start, self.raw_calendar_end)
1.36 +
1.37 # Write the controls.
1.38
1.39 output.append(fmt.div(on=1, css_class="event-download-controls"))
1.40 output.append(fmt.span(on=1, css_class="event-download"))
1.41 output.append(linkToPage(request, page, _("Download this view"), download_link))
1.42 + output.append(fmt.span(on=1, css_class="event-download-popup"))
1.43 + output.append(fmt.text(calendar_period))
1.44 + output.append(fmt.span(on=0))
1.45 output.append(fmt.span(on=0))
1.46 output.append(fmt.span(on=1, css_class="event-download"))
1.47 output.append(linkToPage(request, page, _("Download this calendar"), download_all_link))
1.48 + output.append(fmt.span(on=1, css_class="event-download-popup"))
1.49 + output.append(fmt.text(raw_calendar_period))
1.50 + output.append(fmt.span(on=0))
1.51 + output.append(fmt.span(on=0))
1.52 + output.append(fmt.span(on=1, css_class="event-download"))
1.53 + output.append(linkToPage(request, page, _("Download..."), download_dialogue_link))
1.54 + output.append(fmt.span(on=1, css_class="event-download-popup"))
1.55 + output.append(fmt.text(_("Edit download options")))
1.56 + output.append(fmt.span(on=0))
1.57 output.append(fmt.span(on=0))
1.58 output.append(fmt.span(on=1, css_class="event-download"))
1.59 output.append(linkToPage(request, page, _("Subscribe to this view"), subscribe_link))
1.60 + output.append(fmt.span(on=1, css_class="event-download-popup"))
1.61 + output.append(fmt.text(calendar_period))
1.62 + output.append(fmt.span(on=0))
1.63 output.append(fmt.span(on=0))
1.64 output.append(fmt.span(on=1, css_class="event-download"))
1.65 output.append(linkToPage(request, page, _("Subscribe to this calendar"), subscribe_all_link))
1.66 + output.append(fmt.span(on=1, css_class="event-download-popup"))
1.67 + output.append(fmt.text(raw_calendar_period))
1.68 + output.append(fmt.span(on=0))
1.69 + output.append(fmt.span(on=0))
1.70 + output.append(fmt.span(on=1, css_class="event-download"))
1.71 + output.append(linkToPage(request, page, _("Subscribe..."), subscribe_dialogue_link))
1.72 + output.append(fmt.span(on=1, css_class="event-download-popup"))
1.73 + output.append(fmt.text(_("Edit subscription options")))
1.74 + output.append(fmt.span(on=0))
1.75 output.append(fmt.span(on=0))
1.76 output.append(fmt.div(on=0))
1.77