1.1 --- a/EventAggregatorSupport/View.py Sat Feb 15 16:46:49 2014 +0100
1.2 +++ b/EventAggregatorSupport/View.py Sun Mar 09 21:02:11 2014 +0100
1.3 @@ -2,7 +2,7 @@
1.4 """
1.5 MoinMoin - EventAggregator user interface library
1.6
1.7 - @copyright: 2008, 2009, 2010, 2011, 2012, 2013 by Paul Boddie <paul@boddie.org.uk>
1.8 + @copyright: 2008, 2009, 2010, 2011, 2012, 2013, 2014 by Paul Boddie <paul@boddie.org.uk>
1.9 @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.10 """
1.11
1.12 @@ -1679,7 +1679,7 @@
1.13 output = []
1.14 append = output.append
1.15
1.16 - append(fmt.div(on=1, css_class="event-calendar", id=("EventAggregator-%s" % self.getIdentifier())))
1.17 + append(fmt.div(on=1, css_class="event-calendar-region", id=("EventAggregator-%s" % self.getIdentifier())))
1.18
1.19 # Output download controls.
1.20
1.21 @@ -1687,6 +1687,8 @@
1.22 append(self.writeDownloadControls())
1.23 append(fmt.div(on=0))
1.24
1.25 + append(fmt.div(on=1, css_class="event-display"))
1.26 +
1.27 # Output a table.
1.28
1.29 if self.mode == "table":
1.30 @@ -2184,6 +2186,8 @@
1.31 append(fmt.table(on=0))
1.32 append(fmt.div(on=0))
1.33
1.34 + append(fmt.div(on=0)) # end of event-display
1.35 +
1.36 # Output view controls.
1.37
1.38 append(fmt.div(on=1, css_class="event-controls"))
2.1 --- a/css/event-aggregator.css Sat Feb 15 16:46:49 2014 +0100
2.2 +++ b/css/event-aggregator.css Sun Mar 09 21:02:11 2014 +0100
2.3 @@ -6,10 +6,18 @@
2.4
2.5 ...before any rules.
2.6
2.7 -Copyright (c) 2009, 2010, 2011, 2012, 2013 by Paul Boddie
2.8 +Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 by Paul Boddie
2.9 Licensed under the GNU GPL (v2 or later), see COPYING.txt for details.
2.10 */
2.11
2.12 +.event-display {
2.13 + text-align: center; /* to put the actual calendar details in the centre */
2.14 +}
2.15 +
2.16 +.event-display > * {
2.17 + text-align: left;
2.18 +}
2.19 +
2.20 /* Controls. */
2.21
2.22 .event-controls {
2.23 @@ -146,9 +154,7 @@
2.24 text-align: right;
2.25 }
2.26
2.27 -/* Calendar view. */
2.28 -
2.29 -.event-calendar {
2.30 +.event-calendar-navigation {
2.31 position: relative;
2.32 }
2.33
2.34 @@ -167,6 +173,8 @@
2.35 right: 1em;
2.36 }
2.37
2.38 +/* Calendar view. */
2.39 +
2.40 .event-month {
2.41 width: 98%;
2.42 border-bottom: 1px solid #dddddd;
2.43 @@ -530,11 +538,12 @@
2.44 /* Map view. */
2.45
2.46 .event-map {
2.47 - text-align: center;
2.48 + display: inline-block; /* confines the navigation controls to the map width */
2.49 }
2.50
2.51 .event-map table {
2.52 - display: inline-block;
2.53 + margin-top: 0; /* confines the navigation controls to the map header */
2.54 + text-align: center;
2.55 }
2.56
2.57 caption.event-map-heading {