# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1304894293 -7200
# Node ID bfe0018145757d6d558f205afea86074d514e683
# Parent  dc16c9ee050080ba823ea8c606186d0a8a88b4ed
Moved the unpositioned events into a separate table cell which can be more
easily put onto a separate page in the print view.
Made unpositioned events appear inline in the print view so that they are
arranged like words in a paragraph.
Changed heading paragraphs to be real headings.

diff -r dc16c9ee0500 -r bfe001814575 css/event-aggregator-print.css
--- a/css/event-aggregator-print.css	Sat May 07 15:07:07 2011 +0200
+++ b/css/event-aggregator-print.css	Mon May 09 00:38:13 2011 +0200
@@ -83,15 +83,6 @@
     display: inline-block; /* not relying on list-item since the counter doesn't get incremented when the list is displayed inline */
 }
 
-.event-map-container > ol > li.event-map-unpositioned {
-    display: block; /* permit the content to flow across pages */
-    page-break-before: always; /* let the user exclude the unpositioned events easily */
-}
-
-.event-map-container > ol > li.event-map-unpositioned:before {
-    display: none; /* unpositioned events do not refer to a marker */
-}
-
 .event-map-container > ol > li:before {
     vertical-align: top;
     content: counter(marker);
@@ -117,13 +108,13 @@
     vertical-align: top;
 }
 
-.event-map-unpositioned .event-map-details,
 div.event-map-label .event-map-details {
     position: static !important;
     display: block;
     visibility: visible;
 }
 
+.event-map-unpositioned .event-map-location-events > li,
 div.event-map-label .event-map-details {
     padding: 0.5em;
     border: 1px solid #ddd;
@@ -138,5 +129,18 @@
     background-color: transparent;
 }
 
+tr.event-map-unpositioned > td {
+    text-align: left;
+}
+
+tr.event-map-unpositioned {
+    page-break-before: always; /* make sure unpositioned events can be omitted from the printout */
+}
+
+.event-map-unpositioned .event-map-location-events > li {
+    margin: 1em;
+    display: inline-block;
+}
+
 /* vim: tabstop=4 expandtab shiftwidth=4
  */
diff -r dc16c9ee0500 -r bfe001814575 css/event-aggregator.css
--- a/css/event-aggregator.css	Sat May 07 15:07:07 2011 +0200
+++ b/css/event-aggregator.css	Mon May 09 00:38:13 2011 +0200
@@ -447,9 +447,9 @@
     background-color: #fff;
 }
 
-.event-map-location p {
-    font-weight: bold;
-    font-size: larger;
+.event-map-unpositioned h2,
+.event-map-location h2 {
+    font-size: inherit !important;
     text-align: center;
 }
 
diff -r dc16c9ee0500 -r bfe001814575 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sat May 07 15:07:07 2011 +0200
+++ b/macros/EventAggregator.py	Mon May 09 00:38:13 2011 +0200
@@ -1636,9 +1636,9 @@
                 output.append(fmt.div(on=1, css_class="event-map-shadow"))
                 output.append(fmt.div(on=1, css_class="event-map-location"))
 
-                output.append(fmt.paragraph(on=1))
+                output.append(fmt.heading(on=1, depth=2))
                 output.append(fmt.text(location))
-                output.append(fmt.paragraph(on=0))
+                output.append(fmt.heading(on=0, depth=2))
 
                 output.append(view.writeMapEventSummaries(events))
 
@@ -1648,26 +1648,24 @@
                 output.append(fmt.div(on=0))
                 output.append(fmt.listitem(on=0))
 
+            output.append(fmt.number_list(on=0))
+            output.append(fmt.div(on=0))
+            output.append(fmt.table_cell(on=0))
+            output.append(fmt.table_row(on=0))
+
             # Write unpositioned events.
 
-            output.append(fmt.listitem(on=1, css_class="event-map-unpositioned"))
-            output.append(fmt.div(on=1, css_class="event-map-details"))
-            output.append(fmt.div(on=1, css_class="event-map-location"))
-
-            output.append(fmt.paragraph(on=1))
+            output.append(fmt.table_row(on=1, css_class="event-map-unpositioned"))
+            output.append(fmt.table_cell(on=1))
+
+            output.append(fmt.heading(on=1, depth=2))
             output.append(fmt.text(_("Events not shown on the map")))
-            output.append(fmt.paragraph(on=0))
+            output.append(fmt.heading(on=0, depth=2))
 
             output.append(view.writeMapEventSummaries(unpositioned_events))
 
-            output.append(fmt.div(on=0))
-            output.append(fmt.div(on=0))
-            output.append(fmt.listitem(on=0))
-
             # End of map view output.
 
-            output.append(fmt.number_list(on=0))
-            output.append(fmt.div(on=0))
             output.append(fmt.table_cell(on=0))
             output.append(fmt.table_row(on=0))
             output.append(fmt.table(on=0))