# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1329675653 -3600
# Node ID 40e0295da2b79509eff5e8bfb10ed25af3036324
# Parent  a285ae825ba32a1dcb4c739a66a737c259e34bc5
Introduced formatting of the headings in the pop-up elements.
Added table anchors and links to those anchors.

diff -r a285ae825ba3 -r 40e0295da2b7 ImprovedTableParser.py
--- a/ImprovedTableParser.py	Sun Feb 19 18:48:42 2012 +0100
+++ b/ImprovedTableParser.py	Sun Feb 19 19:20:53 2012 +0100
@@ -395,14 +395,17 @@
 
             write(fmt.span(1, css_class="sortcolumn-container"))
             write(fmt.span(1, css_class="newsortcolumn"))
-            write(fmt.text(newlabel))
+            write(formatText(newlabel, request, fmt))
             write(fmt.span(0))
             write(fmt.span(0))
 
             # Link for selection of the modified sort criteria.
 
-            write(fmt.url(1, "?%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))))
-            write(fmt.text(label))
+            write(fmt.url(1, "?%s#%s" % (
+                wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))),
+                fmt.qualify_id(fmt.sanitize_to_id(table_name))
+                )))
+            write(formatText(label, request, fmt))
             write(fmt.url(0))
 
         else:
@@ -414,16 +417,19 @@
             if just_had_this_column:
                 just_had_this_column = False
                 write(fmt.span(1, css_class="unlinkedcolumn"))
-                write(fmt.text(label))
+                write(formatText(label, request, fmt))
                 write(fmt.span(0))
 
             # Or show the column with a link for its removal.
 
             else:
                 just_had_this_column = True
-                write(fmt.url(1, "?%s-sortcolumns=%s" % (table_name, get_sort_column_output(revised_sort_columns)),
+                write(fmt.url(1, "?%s#%s" % (
+                    wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, get_sort_column_output(revised_sort_columns))),
+                    fmt.qualify_id(fmt.sanitize_to_id(table_name))
+                    ),
                     css_class="removecolumn"))
-                write(fmt.text(label))
+                write(formatText(label, request, fmt))
                 write(fmt.url(0))
 
         write(fmt.listitem(0))
@@ -441,11 +447,14 @@
 
         write(fmt.span(1, css_class="sortcolumn-container"))
         write(fmt.span(1, css_class="newsortcolumn"))
-        write(fmt.text(newlabel))
+        write(formatText(newlabel, request, fmt))
         write(fmt.span(0))
         write(fmt.span(0))
 
-        write(fmt.url(1, "?%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))))
+        write(fmt.url(1, "?%s#%s" % (
+            wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, get_sort_column_output(new_sort_columns))),
+            fmt.qualify_id(fmt.sanitize_to_id(table_name))
+            )))
         write(fmt.text(_("...")))
         write(fmt.url(0))
 
@@ -489,6 +498,7 @@
     # Override any region arguments with request parameters.
 
     table_name = attrs.get("name")
+    table_attrs["tableid"] = table_attrs.get("tableid", table_name)
 
     # Get sorting criteria from the region and the request.