# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1238808872 -7200
# Node ID 401d548102a09dda907ae7f9fe6afa91565d90da
# Parent  9704153661637d3869c08c98c2d6e51a48966890
Added subscription (RSS) links.

diff -r 970415366163 -r 401d548102a0 css/event-aggregator.css
--- a/css/event-aggregator.css	Sat Apr 04 03:11:37 2009 +0200
+++ b/css/event-aggregator.css	Sat Apr 04 03:34:32 2009 +0200
@@ -11,11 +11,7 @@
 
 /* Controls. */
 
-.event-download-calendar {
-    padding-right: 2em;
-}
-
-.event-download-all {
+.event-download {
     padding-right: 2em;
 }
 
diff -r 970415366163 -r 401d548102a0 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sat Apr 04 03:11:37 2009 +0200
+++ b/macros/EventAggregator.py	Sat Apr 04 03:34:32 2009 +0200
@@ -162,13 +162,21 @@
         getMonthActionQueryString("start", calendar_start),
         getMonthActionQueryString("end", calendar_end)
         ))
+    subscribe_all_link = download_all_link + "&format=RSS"
+    subscribe_link = download_link + "&format=RSS"
 
     output.append(fmt.div(on=1, css_class="event-controls"))
-    output.append(fmt.span(on=1, css_class="event-download-calendar"))
-    output.append(linkToPage(request, page, _("Download this calendar in iCalendar format"), download_link))
+    output.append(fmt.span(on=1, css_class="event-download"))
+    output.append(linkToPage(request, page, _("Download this view"), download_link))
+    output.append(fmt.span(on=0))
+    output.append(fmt.span(on=1, css_class="event-download"))
+    output.append(linkToPage(request, page, _("Download this calendar"), download_all_link))
     output.append(fmt.span(on=0))
-    output.append(fmt.span(on=1, css_class="event-download-all"))
-    output.append(linkToPage(request, page, _("Download all events in iCalendar format"), download_all_link))
+    output.append(fmt.span(on=1, css_class="event-download"))
+    output.append(linkToPage(request, page, _("Subscribe to this view"), subscribe_link))
+    output.append(fmt.span(on=0))
+    output.append(fmt.span(on=1, css_class="event-download"))
+    output.append(linkToPage(request, page, _("Subscribe to this calendar"), subscribe_all_link))
     output.append(fmt.span(on=0))
     output.append(fmt.div(on=0))