1.1 --- a/README.txt Tue Apr 26 23:14:31 2011 +0200
1.2 +++ b/README.txt Fri Apr 29 00:23:34 2011 +0200
1.3 @@ -225,6 +225,9 @@
1.4
1.5 * Added a day view which shows events ordered according to their timespans
1.6 within each day.
1.7 + * Added a map view which shows events according to their location. This
1.8 + requires map images to be uploaded to a designated page, and map locations
1.9 + to be defined on a designated page.
1.10 * Switched to using moinsetup for the installation procedure.
1.11 * Introduced formatting of description, location and topic information in
1.12 the list and table views and in RSS format summaries.
2.1 --- a/css/event-aggregator.css Tue Apr 26 23:14:31 2011 +0200
2.2 +++ b/css/event-aggregator.css Fri Apr 29 00:23:34 2011 +0200
2.3 @@ -16,14 +16,22 @@
2.4 display: block;
2.5 }
2.6
2.7 +.event-view-controls,
2.8 .event-download-controls {
2.9 + text-align: center;
2.10 +}
2.11 +
2.12 +.event-view,
2.13 +.event-download {
2.14 + margin-left: 1em;
2.15 + margin-right: 1em;
2.16 }
2.17
2.18 .event-download {
2.19 - padding-right: 2em;
2.20 position: relative;
2.21 }
2.22
2.23 +.event-view a,
2.24 .event-download a {
2.25 font-size: smaller;
2.26 }
2.27 @@ -54,18 +62,6 @@
2.28 font-size: smaller;
2.29 }
2.30
2.31 -.event-view-controls {
2.32 - text-align: right;
2.33 -}
2.34 -
2.35 -.event-view {
2.36 - padding-right: 2em;
2.37 -}
2.38 -
2.39 -.event-view a {
2.40 - font-size: smaller;
2.41 -}
2.42 -
2.43 /* Calendar view. */
2.44
2.45 .event-month {
3.1 --- a/macros/EventAggregator.py Tue Apr 26 23:14:31 2011 +0200
3.2 +++ b/macros/EventAggregator.py Fri Apr 29 00:23:34 2011 +0200
3.3 @@ -10,6 +10,7 @@
3.4
3.5 from MoinMoin import wikiutil
3.6 from MoinMoin.action import AttachFile
3.7 +from MoinMoin.Page import Page
3.8 from EventAggregatorSupport import *
3.9 import calendar
3.10
3.11 @@ -335,6 +336,7 @@
3.12 start = self.calendar_start
3.13 end = self.calendar_end
3.14
3.15 + help_page = Page(request, "HelpOnEventAggregator")
3.16 calendar_link = self.getNavigationLink(start and start.as_month(), end and end.as_month(), "calendar", "month")
3.17 list_link = self.getNavigationLink(start, end, "list")
3.18 table_link = self.getNavigationLink(start, end, "table")
3.19 @@ -344,6 +346,10 @@
3.20
3.21 output.append(fmt.div(on=1, css_class="event-view-controls"))
3.22
3.23 + output.append(fmt.span(on=1, css_class="event-view"))
3.24 + output.append(linkToPage(request, help_page, _("Help")))
3.25 + output.append(fmt.span(on=0))
3.26 +
3.27 if self.mode != "calendar":
3.28 output.append(fmt.span(on=1, css_class="event-view"))
3.29 output.append(linkToPage(request, page, _("View as calendar"), calendar_link))