1.1 --- a/css/event-aggregator-print.css Sat May 07 15:07:07 2011 +0200
1.2 +++ b/css/event-aggregator-print.css Mon May 09 00:38:13 2011 +0200
1.3 @@ -83,15 +83,6 @@
1.4 display: inline-block; /* not relying on list-item since the counter doesn't get incremented when the list is displayed inline */
1.5 }
1.6
1.7 -.event-map-container > ol > li.event-map-unpositioned {
1.8 - display: block; /* permit the content to flow across pages */
1.9 - page-break-before: always; /* let the user exclude the unpositioned events easily */
1.10 -}
1.11 -
1.12 -.event-map-container > ol > li.event-map-unpositioned:before {
1.13 - display: none; /* unpositioned events do not refer to a marker */
1.14 -}
1.15 -
1.16 .event-map-container > ol > li:before {
1.17 vertical-align: top;
1.18 content: counter(marker);
1.19 @@ -117,13 +108,13 @@
1.20 vertical-align: top;
1.21 }
1.22
1.23 -.event-map-unpositioned .event-map-details,
1.24 div.event-map-label .event-map-details {
1.25 position: static !important;
1.26 display: block;
1.27 visibility: visible;
1.28 }
1.29
1.30 +.event-map-unpositioned .event-map-location-events > li,
1.31 div.event-map-label .event-map-details {
1.32 padding: 0.5em;
1.33 border: 1px solid #ddd;
1.34 @@ -138,5 +129,18 @@
1.35 background-color: transparent;
1.36 }
1.37
1.38 +tr.event-map-unpositioned > td {
1.39 + text-align: left;
1.40 +}
1.41 +
1.42 +tr.event-map-unpositioned {
1.43 + page-break-before: always; /* make sure unpositioned events can be omitted from the printout */
1.44 +}
1.45 +
1.46 +.event-map-unpositioned .event-map-location-events > li {
1.47 + margin: 1em;
1.48 + display: inline-block;
1.49 +}
1.50 +
1.51 /* vim: tabstop=4 expandtab shiftwidth=4
1.52 */
2.1 --- a/css/event-aggregator.css Sat May 07 15:07:07 2011 +0200
2.2 +++ b/css/event-aggregator.css Mon May 09 00:38:13 2011 +0200
2.3 @@ -447,9 +447,9 @@
2.4 background-color: #fff;
2.5 }
2.6
2.7 -.event-map-location p {
2.8 - font-weight: bold;
2.9 - font-size: larger;
2.10 +.event-map-unpositioned h2,
2.11 +.event-map-location h2 {
2.12 + font-size: inherit !important;
2.13 text-align: center;
2.14 }
2.15
3.1 --- a/macros/EventAggregator.py Sat May 07 15:07:07 2011 +0200
3.2 +++ b/macros/EventAggregator.py Mon May 09 00:38:13 2011 +0200
3.3 @@ -1636,9 +1636,9 @@
3.4 output.append(fmt.div(on=1, css_class="event-map-shadow"))
3.5 output.append(fmt.div(on=1, css_class="event-map-location"))
3.6
3.7 - output.append(fmt.paragraph(on=1))
3.8 + output.append(fmt.heading(on=1, depth=2))
3.9 output.append(fmt.text(location))
3.10 - output.append(fmt.paragraph(on=0))
3.11 + output.append(fmt.heading(on=0, depth=2))
3.12
3.13 output.append(view.writeMapEventSummaries(events))
3.14
3.15 @@ -1648,26 +1648,24 @@
3.16 output.append(fmt.div(on=0))
3.17 output.append(fmt.listitem(on=0))
3.18
3.19 + output.append(fmt.number_list(on=0))
3.20 + output.append(fmt.div(on=0))
3.21 + output.append(fmt.table_cell(on=0))
3.22 + output.append(fmt.table_row(on=0))
3.23 +
3.24 # Write unpositioned events.
3.25
3.26 - output.append(fmt.listitem(on=1, css_class="event-map-unpositioned"))
3.27 - output.append(fmt.div(on=1, css_class="event-map-details"))
3.28 - output.append(fmt.div(on=1, css_class="event-map-location"))
3.29 -
3.30 - output.append(fmt.paragraph(on=1))
3.31 + output.append(fmt.table_row(on=1, css_class="event-map-unpositioned"))
3.32 + output.append(fmt.table_cell(on=1))
3.33 +
3.34 + output.append(fmt.heading(on=1, depth=2))
3.35 output.append(fmt.text(_("Events not shown on the map")))
3.36 - output.append(fmt.paragraph(on=0))
3.37 + output.append(fmt.heading(on=0, depth=2))
3.38
3.39 output.append(view.writeMapEventSummaries(unpositioned_events))
3.40
3.41 - output.append(fmt.div(on=0))
3.42 - output.append(fmt.div(on=0))
3.43 - output.append(fmt.listitem(on=0))
3.44 -
3.45 # End of map view output.
3.46
3.47 - output.append(fmt.number_list(on=0))
3.48 - output.append(fmt.div(on=0))
3.49 output.append(fmt.table_cell(on=0))
3.50 output.append(fmt.table_row(on=0))
3.51 output.append(fmt.table(on=0))