1.1 --- a/EventAggregatorSupport/View.py Mon Jun 17 16:25:48 2013 +0200
1.2 +++ b/EventAggregatorSupport/View.py Mon Jun 17 16:37:42 2013 +0200
1.3 @@ -450,10 +450,14 @@
1.4
1.5 # Download controls.
1.6
1.7 - append(fmt.div(on=1, css_class="event-download-controls"))
1.8 -
1.9 - append(fmt.span(on=1, css_class="event-download"))
1.10 - append(linkToPage(request, page, _("Download..."), download_dialogue_link, title=_("Edit download options...")))
1.11 + controls_target = "%s-controls" % self.getIdentifier()
1.12 +
1.13 + append(fmt.div(on=1, css_class="event-download-controls", id=controls_target))
1.14 +
1.15 + download_target = "%s-download" % self.getIdentifier()
1.16 +
1.17 + append(fmt.span(on=1, css_class="event-download", id=download_target))
1.18 + append(linkToPage(request, page, _("Download..."), "#%s" % download_target))
1.19 append(fmt.div(on=1, css_class="event-download-popup"))
1.20
1.21 append(fmt.div(on=1, css_class="event-download-item"))
1.22 @@ -499,13 +503,21 @@
1.23 append(fmt.span(on=0)) # end label
1.24 append(fmt.div(on=0))
1.25
1.26 + append(fmt.div(on=1, css_class="event-download-item"))
1.27 + append(fmt.span(on=1, css_class="event-download-link"))
1.28 + append(linkToPage(request, page, _("Cancel"), "#%s" % controls_target))
1.29 + append(fmt.span(on=0)) # end label
1.30 + append(fmt.div(on=0))
1.31 +
1.32 append(fmt.div(on=0)) # end of pop-up
1.33 append(fmt.span(on=0)) # end of download
1.34
1.35 # Subscription controls.
1.36
1.37 - append(fmt.span(on=1, css_class="event-download"))
1.38 - append(linkToPage(request, page, _("Subscribe..."), subscribe_dialogue_link, title=_("Edit subscription options...")))
1.39 + subscribe_target = "%s-subscribe" % self.getIdentifier()
1.40 +
1.41 + append(fmt.span(on=1, css_class="event-download", id=subscribe_target))
1.42 + append(linkToPage(request, page, _("Subscribe..."), "#%s" % subscribe_target))
1.43 append(fmt.div(on=1, css_class="event-download-popup"))
1.44
1.45 append(fmt.div(on=1, css_class="event-download-item"))
1.46 @@ -535,6 +547,12 @@
1.47 append(fmt.span(on=0)) # end label
1.48 append(fmt.div(on=0))
1.49
1.50 + append(fmt.div(on=1, css_class="event-download-item"))
1.51 + append(fmt.span(on=1, css_class="event-download-link"))
1.52 + append(linkToPage(request, page, _("Cancel"), "#%s" % controls_target))
1.53 + append(fmt.span(on=0)) # end label
1.54 + append(fmt.div(on=0))
1.55 +
1.56 append(fmt.div(on=0)) # end of pop-up
1.57 append(fmt.span(on=0)) # end of download
1.58
2.1 --- a/css/event-aggregator.css Mon Jun 17 16:25:48 2013 +0200
2.2 +++ b/css/event-aggregator.css Mon Jun 17 16:37:42 2013 +0200
2.3 @@ -45,6 +45,7 @@
2.4 }
2.5
2.6 .event-download:hover .event-download-popup,
2.7 +.event-download:target .event-download-popup,
2.8 .event-day-box:hover .event-day-number-popup {
2.9 display: block;
2.10 position: absolute;
2.11 @@ -55,7 +56,8 @@
2.12 border: 1px solid #000;
2.13 }
2.14
2.15 -.event-download:hover .event-download-popup {
2.16 +.event-download:hover .event-download-popup,
2.17 +.event-download:target .event-download-popup {
2.18 top: 1em; /* negligible top padding + 1em, leaving 0.5em bottom padding */
2.19 padding: 0.5em 0.5em 0 0.5em;
2.20 }
2.21 @@ -82,11 +84,13 @@
2.22 }
2.23
2.24 .event-download-webcal a:hover,
2.25 +.event-download-webcal a:focus,
2.26 .event-download-webcal a:active {
2.27 background-color: #00d;
2.28 }
2.29
2.30 .event-download-http a:hover,
2.31 +.event-download-http a:focus,
2.32 .event-download-http a:active {
2.33 background-color: #d00;
2.34 }
2.35 @@ -94,11 +98,13 @@
2.36 .event-download-webcal a,
2.37 .event-download-webcal a:link,
2.38 .event-download-webcal a:hover,
2.39 +.event-download-webcal a:focus,
2.40 .event-download-webcal a:active,
2.41 .event-download-webcal a:visited,
2.42 .event-download-http a,
2.43 .event-download-http a:link,
2.44 .event-download-http a:hover,
2.45 +.event-download-http a:focus,
2.46 .event-download-http a:active,
2.47 .event-download-http a:visited {
2.48 font-size: inherit;