1.1 --- a/macros/EventAggregator.py Fri Apr 15 00:14:04 2011 +0200
1.2 +++ b/macros/EventAggregator.py Mon Apr 18 01:06:30 2011 +0200
1.3 @@ -1517,10 +1517,9 @@
1.4 output.append(fmt.table_row(on=1))
1.5 output.append(fmt.table_cell(on=1))
1.6
1.7 - output.append(fmt.div(on=1, css_class="event-map-container",
1.8 - style="width: %spx; height: %spx; background-image: url('%s')" % (
1.9 - escattr(map_width), escattr(map_height), map_image_url)
1.10 - ))
1.11 + output.append(fmt.div(on=1, css_class="event-map-container"))
1.12 + output.append(fmt.image(map_image_url))
1.13 + output.append(fmt.number_list(on=1))
1.14
1.15 # Show the events in the map.
1.16
1.17 @@ -1549,14 +1548,26 @@
1.18 # NOTE: Use one degree as the marker size.
1.19
1.20 marker_x, marker_y = getPositionForCentrePoint(
1.21 - getPositionForReference(latitude, longitude, map_bottom_left_latitude, map_bottom_left_longitude,
1.22 + getPositionForReference(map_top_right_latitude, longitude, latitude, map_bottom_left_longitude,
1.23 map_x_scale, map_y_scale),
1.24 map_x_scale, map_y_scale)
1.25
1.26 # Put a marker on the map.
1.27
1.28 + output.append(fmt.listitem(on=1, css_class="event-map-label"))
1.29 +
1.30 + # Have a positioned marker for the print mode.
1.31 +
1.32 + output.append(fmt.div(on=1, css_class="event-map-label-only",
1.33 + style="left:%dpx; top:%dpx; min-width:%dpx; min-height:%dpx") % (
1.34 + marker_x, marker_y, map_x_scale, map_y_scale))
1.35 + output.append(fmt.div(on=0))
1.36 +
1.37 + # Have a marker containing a pop-up when using the screen mode,
1.38 + # providing a normal block when using the print mode.
1.39 +
1.40 output.append(fmt.div(on=1, css_class="event-map-label",
1.41 - style="left:%dpx; bottom:%dpx; min-width:%dpx; min-height:%dpx") % (
1.42 + style="left:%dpx; top:%dpx; min-width:%dpx; min-height:%dpx") % (
1.43 marker_x, marker_y, map_x_scale, map_y_scale))
1.44 output.append(fmt.div(on=1, css_class="event-map-details"))
1.45 output.append(fmt.div(on=1, css_class="event-map-shadow"))
1.46 @@ -1584,9 +1595,11 @@
1.47 output.append(fmt.div(on=0))
1.48 output.append(fmt.div(on=0))
1.49 output.append(fmt.div(on=0))
1.50 + output.append(fmt.listitem(on=0))
1.51
1.52 # End of map view output.
1.53
1.54 + output.append(fmt.number_list(on=0))
1.55 output.append(fmt.div(on=0))
1.56 output.append(fmt.table_cell(on=0))
1.57 output.append(fmt.table_row(on=0))