1.1 --- a/EventAggregatorSupport/View.py Sat Jun 15 02:28:13 2013 +0200
1.2 +++ b/EventAggregatorSupport/View.py Mon Jun 17 00:33:34 2013 +0200
1.3 @@ -453,7 +453,7 @@
1.4 append(fmt.div(on=1, css_class="event-download-controls"))
1.5
1.6 append(fmt.span(on=1, css_class="event-download"))
1.7 - append(fmt.text(_("Download...")))
1.8 + append(linkToPage(request, page, _("Download..."), download_dialogue_link, title=_("Edit download options...")))
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 @@ -462,7 +462,7 @@
1.13 append(linkToResource(full_url.replace("http", "webcal", 1), request, _("webcal"), download_link))
1.14 append(fmt.span(on=0))
1.15 append(fmt.span(on=1, css_class="event-download-http"))
1.16 - append(linkToPage(request, page, _("http"), download_link))
1.17 + append(linkToPage(request, page, _("http"), download_link, title=_("Download this view in the browser")))
1.18 append(fmt.span(on=0))
1.19 append(fmt.span(on=0)) # end types
1.20 append(fmt.span(on=1, css_class="event-download-label"))
1.21 @@ -479,7 +479,7 @@
1.22 append(linkToResource(full_url.replace("http", "webcal", 1), request, _("webcal"), download_all_link))
1.23 append(fmt.span(on=0))
1.24 append(fmt.span(on=1, css_class="event-download-http"))
1.25 - append(linkToPage(request, page, _("http"), download_all_link))
1.26 + append(linkToPage(request, page, _("http"), download_all_link, title=_("Download this calendar in the browser")))
1.27 append(fmt.span(on=0))
1.28 append(fmt.span(on=0)) # end types
1.29 append(fmt.span(on=1, css_class="event-download-label"))
1.30 @@ -505,7 +505,7 @@
1.31 # Subscription controls.
1.32
1.33 append(fmt.span(on=1, css_class="event-download"))
1.34 - append(fmt.text(_("Subscribe...")))
1.35 + append(linkToPage(request, page, _("Subscribe..."), subscribe_dialogue_link, title=_("Edit subscription options...")))
1.36 append(fmt.div(on=1, css_class="event-download-popup"))
1.37
1.38 append(fmt.div(on=1, css_class="event-download-item"))
1.39 @@ -772,18 +772,18 @@
1.40 date_update_link = self.getUpdateLink(start, end)
1.41
1.42 append(fmt.span(on=1, css_class="previous"))
1.43 - append(linkToPage(request, page, "<<", previous_set_link, onclick=previous_set_update_link))
1.44 + append(linkToPage(request, page, "<<", previous_set_link, onclick=previous_set_update_link, title=_("Previous set")))
1.45 append(fmt.text(" "))
1.46 - append(linkToPage(request, page, "<", previous_link, onclick=previous_update_link))
1.47 + append(linkToPage(request, page, "<", previous_link, onclick=previous_update_link, title=_("Previous")))
1.48 append(fmt.span(on=0))
1.49
1.50 append(fmt.span(on=1, css_class="next"))
1.51 - append(linkToPage(request, page, ">", next_link, onclick=next_update_link))
1.52 + append(linkToPage(request, page, ">", next_link, onclick=next_update_link, title=_("Next")))
1.53 append(fmt.text(" "))
1.54 - append(linkToPage(request, page, ">>", next_set_link, onclick=next_set_update_link))
1.55 + append(linkToPage(request, page, ">>", next_set_link, onclick=next_set_update_link, title=_("Next set")))
1.56 append(fmt.span(on=0))
1.57
1.58 - append(linkToPage(request, page, label, date_link, onclick=date_update_link))
1.59 + append(linkToPage(request, page, label, date_link, onclick=date_update_link, title=_("Show this period first")))
1.60
1.61 else:
1.62 append(fmt.span(on=1))
1.63 @@ -839,8 +839,10 @@
1.64 append(fmt.span(on=0))
1.65 append(fmt.span(on=0))
1.66
1.67 + # Link the number to the day view.
1.68 +
1.69 append(fmt.span(on=1, css_class="event-day-number"))
1.70 - append(fmt.text(unicode(day)))
1.71 + append(linkToPage(request, page, unicode(day), day_view_link, onclick=day_view_update_link, title=_("View day")))
1.72 append(fmt.span(on=0))
1.73
1.74 append(fmt.div(on=0))
1.75 @@ -913,13 +915,11 @@
1.76 output = []
1.77 append = output.append
1.78
1.79 - append(fmt.table_row(on=1))
1.80 - append(fmt.table_cell(on=1, attrs={"class" : "event-month-heading", "colspan" : "21"}))
1.81 -
1.82 + # Using a caption for accessibility reasons.
1.83 +
1.84 + append(fmt.rawHTML('<caption class="event-month-heading">'))
1.85 append(self.writeMonthHeading(year_month))
1.86 -
1.87 - append(fmt.table_cell(on=0))
1.88 - append(fmt.table_row(on=0))
1.89 + append(fmt.rawHTML("</caption>"))
1.90
1.91 return "".join(output)
1.92
1.93 @@ -1247,13 +1247,12 @@
1.94 output = []
1.95 append = output.append
1.96
1.97 - append(fmt.table_row(on=1))
1.98 -
1.99 - append(fmt.table_cell(on=1, attrs={"class" : "event-full-day-heading", "colspan" : str(colspan)}))
1.100 + # Using a caption for accessibility reasons.
1.101 +
1.102 + append(fmt.rawHTML('<caption class="event-full-day-heading">'))
1.103 append(self.writeDayHeading(date))
1.104 - append(fmt.table_cell(on=0))
1.105 -
1.106 - append(fmt.table_row(on=0))
1.107 + append(fmt.rawHTML("</caption>"))
1.108 +
1.109 return "".join(output)
1.110
1.111 def writeEmptyDay(self, date):
1.112 @@ -1492,9 +1491,11 @@
1.113 output = []
1.114 append = output.append
1.115
1.116 - append(fmt.table_cell(on=1, attrs={"class" : "event-map-heading"}))
1.117 + # Using a caption for accessibility reasons.
1.118 +
1.119 + append(fmt.rawHTML('<caption class="event-map-heading">'))
1.120 append(self.writeMapHeading())
1.121 - append(fmt.table_cell(on=0))
1.122 + append(fmt.rawHTML("</caption>"))
1.123
1.124 return "".join(output)
1.125
1.126 @@ -1839,9 +1840,7 @@
1.127
1.128 append(fmt.table(on=1))
1.129
1.130 - append(fmt.table_row(on=1))
1.131 append(self.writeMapTableHeading())
1.132 - append(fmt.table_row(on=0))
1.133
1.134 append(fmt.table_row(on=1))
1.135 append(fmt.table_cell(on=1))
1.136 @@ -1947,18 +1946,19 @@
1.137 append(fmt.bullet_list(on=1, attr={"class" : "event-listings"}))
1.138
1.139 # Output a list.
1.140 + # NOTE: Make the heading depth configurable.
1.141
1.142 for period in self.first.until(self.last):
1.143
1.144 append(fmt.listitem(on=1, attr={"class" : "event-listings-period"}))
1.145 - append(fmt.div(on=1, attr={"class" : "event-listings-heading"}))
1.146 + append(fmt.heading(on=1, depth=2, attr={"class" : "event-listings-heading"}))
1.147
1.148 # Either write a date heading or produce links for navigable
1.149 # calendars.
1.150
1.151 append(self.writeDateHeading(period))
1.152
1.153 - append(fmt.div(on=0))
1.154 + append(fmt.heading(on=0, depth=2))
1.155
1.156 append(fmt.bullet_list(on=1, attr={"class" : "event-period-listings"}))
1.157