# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1322779376 -3600
# Node ID 2d9d07c0f3b405772c7567c71f810f4d523292cb
# Parent  1267cee936ad84c26baa658f32d27eb496cb67f1
Removed the redundant labels for the editable download and subscription links.

diff -r 1267cee936ad -r 2d9d07c0f3b4 css/event-aggregator.css
--- a/css/event-aggregator.css	Thu Dec 01 23:26:55 2011 +0100
+++ b/css/event-aggregator.css	Thu Dec 01 23:42:56 2011 +0100
@@ -107,10 +107,14 @@
     margin-right: 0.25em;
 }
 
+.event-download-link,
 .event-download-period {
     display: block;
+    text-align: right;
+}
+
+.event-download-period {
     margin-top: 0.5em;
-    text-align: right;
 }
 
 .event-download-period-raw {
diff -r 1267cee936ad -r 2d9d07c0f3b4 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Thu Dec 01 23:26:55 2011 +0100
+++ b/macros/EventAggregator.py	Thu Dec 01 23:42:56 2011 +0100
@@ -349,12 +349,9 @@
         output.append(fmt.div(on=0))
 
         output.append(fmt.div(on=1, css_class="event-download-item"))
-        output.append(fmt.span(on=1, css_class="event-download-label"))
-        output.append(linkToPage(request, page, _("Download..."), download_dialogue_link))
+        output.append(fmt.span(on=1, css_class="event-download-link"))
+        output.append(linkToPage(request, page, _("Edit download options..."), download_dialogue_link))
         output.append(fmt.span(on=0)) # end label
-        output.append(fmt.span(on=1, css_class="event-download-period"))
-        output.append(fmt.text(_("Edit download options")))
-        output.append(fmt.span(on=0))
         output.append(fmt.div(on=0))
 
         output.append(fmt.div(on=0)) # end of pop-up
@@ -388,12 +385,9 @@
         output.append(fmt.div(on=0))
 
         output.append(fmt.div(on=1, css_class="event-download-item"))
-        output.append(fmt.span(on=1, css_class="event-download-label"))
-        output.append(linkToPage(request, page, _("Subscribe..."), subscribe_dialogue_link))
+        output.append(fmt.span(on=1, css_class="event-download-link"))
+        output.append(linkToPage(request, page, _("Edit subscription options..."), subscribe_dialogue_link))
         output.append(fmt.span(on=0)) # end label
-        output.append(fmt.span(on=1, css_class="event-download-period"))
-        output.append(fmt.text(_("Edit subscription options")))
-        output.append(fmt.span(on=0))
         output.append(fmt.div(on=0))
 
         output.append(fmt.div(on=0)) # end of pop-up