1.1 --- a/ImprovedTableParser.py Sun Feb 19 18:48:42 2012 +0100
1.2 +++ b/ImprovedTableParser.py Sun Feb 19 19:20:53 2012 +0100
1.3 @@ -395,14 +395,17 @@
1.4
1.5 write(fmt.span(1, css_class="sortcolumn-container"))
1.6 write(fmt.span(1, css_class="newsortcolumn"))
1.7 - write(fmt.text(newlabel))
1.8 + write(formatText(newlabel, request, fmt))
1.9 write(fmt.span(0))
1.10 write(fmt.span(0))
1.11
1.12 # Link for selection of the modified sort criteria.
1.13
1.14 - write(fmt.url(1, "?%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))))
1.15 - write(fmt.text(label))
1.16 + write(fmt.url(1, "?%s#%s" % (
1.17 + wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))),
1.18 + fmt.qualify_id(fmt.sanitize_to_id(table_name))
1.19 + )))
1.20 + write(formatText(label, request, fmt))
1.21 write(fmt.url(0))
1.22
1.23 else:
1.24 @@ -414,16 +417,19 @@
1.25 if just_had_this_column:
1.26 just_had_this_column = False
1.27 write(fmt.span(1, css_class="unlinkedcolumn"))
1.28 - write(fmt.text(label))
1.29 + write(formatText(label, request, fmt))
1.30 write(fmt.span(0))
1.31
1.32 # Or show the column with a link for its removal.
1.33
1.34 else:
1.35 just_had_this_column = True
1.36 - write(fmt.url(1, "?%s-sortcolumns=%s" % (table_name, get_sort_column_output(revised_sort_columns)),
1.37 + write(fmt.url(1, "?%s#%s" % (
1.38 + wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, get_sort_column_output(revised_sort_columns))),
1.39 + fmt.qualify_id(fmt.sanitize_to_id(table_name))
1.40 + ),
1.41 css_class="removecolumn"))
1.42 - write(fmt.text(label))
1.43 + write(formatText(label, request, fmt))
1.44 write(fmt.url(0))
1.45
1.46 write(fmt.listitem(0))
1.47 @@ -441,11 +447,14 @@
1.48
1.49 write(fmt.span(1, css_class="sortcolumn-container"))
1.50 write(fmt.span(1, css_class="newsortcolumn"))
1.51 - write(fmt.text(newlabel))
1.52 + write(formatText(newlabel, request, fmt))
1.53 write(fmt.span(0))
1.54 write(fmt.span(0))
1.55
1.56 - write(fmt.url(1, "?%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))))
1.57 + write(fmt.url(1, "?%s#%s" % (
1.58 + wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))),
1.59 + fmt.qualify_id(fmt.sanitize_to_id(table_name))
1.60 + )))
1.61 write(fmt.text(_("...")))
1.62 write(fmt.url(0))
1.63
1.64 @@ -489,6 +498,7 @@
1.65 # Override any region arguments with request parameters.
1.66
1.67 table_name = attrs.get("name")
1.68 + table_attrs["tableid"] = table_attrs.get("tableid", table_name)
1.69
1.70 # Get sorting criteria from the region and the request.
1.71