# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1304029414 -7200
# Node ID 31694e4f43261010a3cc98b52ffd70478922614d
# Parent  b34a98336537dc1007031558c4d82f0935e2cc63
Added a help link in the macro output, switching the formatting of controls to
use centre-justified blocks and text.
Updated the release notes to include mentions of the day and map views.

diff -r b34a98336537 -r 31694e4f4326 README.txt
--- a/README.txt	Tue Apr 26 23:14:31 2011 +0200
+++ b/README.txt	Fri Apr 29 00:23:34 2011 +0200
@@ -225,6 +225,9 @@
 
   * Added a day view which shows events ordered according to their timespans
     within each day.
+  * Added a map view which shows events according to their location. This
+    requires map images to be uploaded to a designated page, and map locations
+    to be defined on a designated page.
   * Switched to using moinsetup for the installation procedure.
   * Introduced formatting of description, location and topic information in
     the list and table views and in RSS format summaries.
diff -r b34a98336537 -r 31694e4f4326 css/event-aggregator.css
--- a/css/event-aggregator.css	Tue Apr 26 23:14:31 2011 +0200
+++ b/css/event-aggregator.css	Fri Apr 29 00:23:34 2011 +0200
@@ -16,14 +16,22 @@
     display: block;
 }
 
+.event-view-controls,
 .event-download-controls {
+    text-align: center;
+}
+
+.event-view,
+.event-download {
+    margin-left: 1em;
+    margin-right: 1em;
 }
 
 .event-download {
-    padding-right: 2em;
     position: relative;
 }
 
+.event-view a,
 .event-download a {
     font-size: smaller;
 }
@@ -54,18 +62,6 @@
     font-size: smaller;
 }
 
-.event-view-controls {
-    text-align: right;
-}
-
-.event-view {
-    padding-right: 2em;
-}
-
-.event-view a {
-    font-size: smaller;
-}
-
 /* Calendar view. */
 
 .event-month {
diff -r b34a98336537 -r 31694e4f4326 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Tue Apr 26 23:14:31 2011 +0200
+++ b/macros/EventAggregator.py	Fri Apr 29 00:23:34 2011 +0200
@@ -10,6 +10,7 @@
 
 from MoinMoin import wikiutil
 from MoinMoin.action import AttachFile
+from MoinMoin.Page import Page
 from EventAggregatorSupport import *
 import calendar
 
@@ -335,6 +336,7 @@
         start = self.calendar_start
         end = self.calendar_end
 
+        help_page = Page(request, "HelpOnEventAggregator")
         calendar_link = self.getNavigationLink(start and start.as_month(), end and end.as_month(), "calendar", "month")
         list_link = self.getNavigationLink(start, end, "list")
         table_link = self.getNavigationLink(start, end, "table")
@@ -344,6 +346,10 @@
 
         output.append(fmt.div(on=1, css_class="event-view-controls"))
 
+        output.append(fmt.span(on=1, css_class="event-view"))
+        output.append(linkToPage(request, help_page, _("Help")))
+        output.append(fmt.span(on=0))
+
         if self.mode != "calendar":
             output.append(fmt.span(on=1, css_class="event-view"))
             output.append(linkToPage(request, page, _("View as calendar"), calendar_link))