1.1 --- a/actions/EventAggregatorSummary.py Thu Jul 08 02:17:12 2010 +0200
1.2 +++ b/actions/EventAggregatorSummary.py Thu Jul 08 22:15:54 2010 +0200
1.3 @@ -32,40 +32,50 @@
1.4 form = self.get_form()
1.5
1.6 category_list = []
1.7 + category_pagenames = form.get("category", [])
1.8
1.9 for category_name, category_pagename in \
1.10 EventAggregatorSupport.getCategoryMapping(
1.11 EventAggregatorSupport.getCategories(request),
1.12 request):
1.13
1.14 - category_list.append('<option value="%s">%s</option>' % (category_pagename, category_name))
1.15 + selected = self._get_selected_for_list(category_pagename, category_pagenames)
1.16 +
1.17 + category_list.append('<option value="%s" %s>%s</option>' % (category_pagename, selected, category_name))
1.18 +
1.19 + # Initialise month lists.
1.20
1.21 - month_list = []
1.22 - month_list.append('<option value=""></option>')
1.23 + start_month_list, end_month_list = self.get_month_lists()
1.24 + start_year_default, end_year_default = self.get_year_defaults()
1.25
1.26 - for month in range(1, 13):
1.27 - month_label = _(EventAggregatorSupport.getMonthLabel(month))
1.28 - month_list.append('<option value="%02d">%s</option>' % (month, month_label))
1.29 + # Descriptions.
1.30 +
1.31 + descriptions = form.get("descriptions", [None])[0]
1.32
1.33 descriptions_list = [
1.34 - '<option value="%s">%s</option>' % ("page", _("page")),
1.35 - '<option value="%s">%s</option>' % ("comment", _("comment"))
1.36 + '<option value="%s" %s>%s</option>' % ("page", self._get_selected("page", descriptions), _("page")),
1.37 + '<option value="%s" %s>%s</option>' % ("comment", self._get_selected("comment", descriptions), _("comment"))
1.38 ]
1.39
1.40 + # Format.
1.41 +
1.42 + format = form.get("format", [None])[0]
1.43 +
1.44 format_list = [
1.45 - '<option value="%s">%s</option>' % ("iCalendar", _("iCalendar")),
1.46 - '<option value="%s">%s</option>' % ("RSS", _("RSS 2.0"))
1.47 + '<option value="%s" %s>%s</option>' % ("iCalendar", self._get_selected("iCalendar", format), _("iCalendar")),
1.48 + '<option value="%s" %s>%s</option>' % ("RSS", self._get_selected("RSS", format), _("RSS 2.0"))
1.49 ]
1.50
1.51 d = {
1.52 "buttons_html" : buttons_html,
1.53 "category_label" : _("Categories"),
1.54 "category_list" : "\n".join(category_list),
1.55 - "month_list" : "\n".join(month_list),
1.56 + "start_month_list" : "\n".join(start_month_list),
1.57 "start_label" : _("Start year and month"),
1.58 - "start_year_default" : "",
1.59 + "start_year_default" : start_year_default,
1.60 + "end_month_list" : "\n".join(end_month_list),
1.61 "end_label" : _("End year and month"),
1.62 - "end_year_default" : "",
1.63 + "end_year_default" : end_year_default,
1.64 "descriptions_label" : _("Use descriptions from..."),
1.65 "descriptions_list" : "\n".join(descriptions_list),
1.66 "format_label" : _("Summary format"),
1.67 @@ -88,7 +98,7 @@
1.68 <td class="label"><label>%(start_label)s</label></td>
1.69 <td>
1.70 <select name="start-month">
1.71 - %(month_list)s
1.72 + %(start_month_list)s
1.73 </select>
1.74 <input name="start-year" type="text" value="%(start_year_default)s" size="4" />
1.75 </td>
1.76 @@ -97,7 +107,7 @@
1.77 <td class="label"><label>%(end_label)s</label></td>
1.78 <td>
1.79 <select name="end-month">
1.80 - %(month_list)s
1.81 + %(end_month_list)s
1.82 </select>
1.83 <input name="end-year" type="text" value="%(end_year_default)s" size="4" />
1.84 </td>