1.1 --- a/EventAggregatorSupport/View.py Mon Jun 17 18:07:52 2013 +0200
1.2 +++ b/EventAggregatorSupport/View.py Mon Jun 17 23:25:55 2013 +0200
1.3 @@ -457,7 +457,7 @@
1.4 download_target = "%s-download" % self.getIdentifier()
1.5
1.6 append(fmt.span(on=1, css_class="event-download", id=download_target))
1.7 - append(linkToPage(request, page, _("Download..."), "#%s" % download_target))
1.8 + append(linkToPage(request, page, _("Download..."), anchor=download_target))
1.9 append(fmt.div(on=1, css_class="event-download-popup"))
1.10
1.11 append(fmt.div(on=1, css_class="event-download-item"))
1.12 @@ -505,7 +505,7 @@
1.13
1.14 append(fmt.div(on=1, css_class="event-download-item"))
1.15 append(fmt.span(on=1, css_class="event-download-link"))
1.16 - append(linkToPage(request, page, _("Cancel"), "#%s" % controls_target))
1.17 + append(linkToPage(request, page, _("Cancel"), anchor=controls_target))
1.18 append(fmt.span(on=0)) # end label
1.19 append(fmt.div(on=0))
1.20
1.21 @@ -517,7 +517,7 @@
1.22 subscribe_target = "%s-subscribe" % self.getIdentifier()
1.23
1.24 append(fmt.span(on=1, css_class="event-download", id=subscribe_target))
1.25 - append(linkToPage(request, page, _("Subscribe..."), "#%s" % subscribe_target))
1.26 + append(linkToPage(request, page, _("Subscribe..."), anchor=subscribe_target))
1.27 append(fmt.div(on=1, css_class="event-download-popup"))
1.28
1.29 append(fmt.div(on=1, css_class="event-download-item"))
1.30 @@ -549,7 +549,7 @@
1.31
1.32 append(fmt.div(on=1, css_class="event-download-item"))
1.33 append(fmt.span(on=1, css_class="event-download-link"))
1.34 - append(linkToPage(request, page, _("Cancel"), "#%s" % controls_target))
1.35 + append(linkToPage(request, page, _("Cancel"), anchor=controls_target))
1.36 append(fmt.span(on=0)) # end label
1.37 append(fmt.div(on=0))
1.38
1.39 @@ -862,7 +862,7 @@
1.40 # Link the number to the day view.
1.41
1.42 append(fmt.span(on=1, css_class="event-day-number"))
1.43 - append(linkToPage(request, page, unicode(day), "#%s" % day_target, title=_("View day options")))
1.44 + append(linkToPage(request, page, unicode(day), anchor=day_target, title=_("View day options")))
1.45 append(fmt.span(on=0))
1.46
1.47 append(fmt.div(on=0))
1.48 @@ -1560,9 +1560,20 @@
1.49 # Have a marker containing a pop-up when using the screen mode,
1.50 # providing a normal block when using the print mode.
1.51
1.52 - append(fmt.div(on=1, css_class="event-map-label",
1.53 + location_text = to_plain_text(location, request)
1.54 + label_target = "%s-maplabel-%s" % (self.getIdentifier(), location_text)
1.55 +
1.56 + append(fmt.div(on=1, css_class="event-map-label", id=label_target,
1.57 style="left:%dpx; top:%dpx; min-width:%dpx; min-height:%dpx") % (
1.58 marker_x, marker_y, map_x_scale, map_y_scale))
1.59 +
1.60 + label_target_url = page.url(request, anchor=label_target, relative=True)
1.61 + append(fmt.url(1, label_target_url, "event-map-label-link"))
1.62 + append(fmt.span(1))
1.63 + append(fmt.text(location_text))
1.64 + append(fmt.span(0))
1.65 + append(fmt.url(0))
1.66 +
1.67 append(fmt.div(on=1, css_class="event-map-details"))
1.68 append(fmt.div(on=1, css_class="event-map-shadow"))
1.69 append(fmt.div(on=1, css_class="event-map-location"))
1.70 @@ -1571,7 +1582,7 @@
1.71 # be usable in a heading, so it must be first converted to plain text.
1.72
1.73 append(fmt.heading(on=1, depth=2))
1.74 - append(fmt.text(to_plain_text(location, request)))
1.75 + append(fmt.text(location_text))
1.76 append(fmt.heading(on=0, depth=2))
1.77
1.78 append(self.writeMapEventSummaries(events))