MoinMoin: attachment:StyleableDataBrowserTables.patch of MoinMoinBugs/StyleableDataBrowserTables

   1 diff -r 7e18782d09b2 MoinMoin/action/AttachFile.py
   2 --- a/MoinMoin/action/AttachFile.py	Fri Mar 19 20:23:50 2010 +0100
   3 +++ b/MoinMoin/action/AttachFile.py	Mon Mar 22 00:40:39 2010 +0100
   4 @@ -1163,10 +1163,12 @@
   5  
   6      if data:
   7          from MoinMoin.widget.browser import DataBrowserWidget
   8 -
   9 +        div = ['<div id="attachment-admin">']
  10          browser = DataBrowserWidget(request)
  11          browser.setData(data, sort_columns=[0, 1])
  12 -        return browser.render(method="GET")
  13 +        div.append(browser.render(method="GET"))
  14 +        div.append('</div>')
  15 +        return '\n'.join(div)
  16  
  17      return ''
  18  
  19 diff -r 7e18782d09b2 MoinMoin/action/Despam.py
  20 --- a/MoinMoin/action/Despam.py	Fri Mar 19 20:23:50 2010 +0100
  21 +++ b/MoinMoin/action/Despam.py	Mon Mar 22 00:40:39 2010 +0100
  22 @@ -89,7 +89,7 @@
  23      macro = tmp()
  24      macro.request = request
  25      macro.formatter = request.html_formatter
  26 -
  27 +    request.write('<div id="despam">')
  28      request.write("<table>")
  29      for line in log.reverse():
  30          if line.ed_time_usecs < timestamp:
  31 @@ -106,6 +106,7 @@
  32  
  33      request.write('''
  34  </table>
  35 +</div>
  36  <p>
  37  <form method="post" action="%(url)s">
  38  <input type="hidden" name="action" value="Despam">
  39 diff -r 7e18782d09b2 MoinMoin/action/language_setup.py
  40 --- a/MoinMoin/action/language_setup.py	Fri Mar 19 20:23:50 2010 +0100
  41 +++ b/MoinMoin/action/language_setup.py	Mon Mar 22 00:40:39 2010 +0100
  42 @@ -74,7 +74,9 @@
  43  
  44      table = DataBrowserWidget(request)
  45      table.setData(data)
  46 -    page_table = ''.join(table.format(method='GET'))
  47 +    div = ['<div id="language-setup">']
  48 +    div.append(table.format(method='GET'))
  49 +    div.append('</div>')
  50  
  51      fmt = request.formatter
  52      lang_links = [request.page.link_to_raw(request, _lang,
  53 @@ -90,7 +92,7 @@
  54      request.theme.send_title(title, page=request.page, pagename=pagename)
  55      request.write(request.formatter.startContent("content"))
  56      request.write(lang_selector)
  57 -    request.write(page_table)
  58 +    request.write(''.join(div))
  59      request.write(request.formatter.endContent())
  60      request.theme.send_footer(pagename)
  61      request.theme.send_closing_html()
  62 diff -r 7e18782d09b2 MoinMoin/macro/ShowSmileys.py
  63 --- a/MoinMoin/macro/ShowSmileys.py	Fri Mar 19 20:23:50 2010 +0100
  64 +++ b/MoinMoin/macro/ShowSmileys.py	Mon Mar 22 00:40:39 2010 +0100
  65 @@ -49,7 +49,10 @@
  66      if data:
  67          browser = DataBrowserWidget(macro.request)
  68          browser.setData(data)
  69 -        return browser.render(method="GET")
  70 +        div = ['<div id="smileys">']
  71 +        div.append(browser.render(method="GET"))
  72 +        div.append('</div>')
  73 +        return '\n'.join(div)
  74  
  75      return ''
  76  
  77 diff -r 7e18782d09b2 MoinMoin/parser/text_csv.py
  78 --- a/MoinMoin/parser/text_csv.py	Fri Mar 19 20:23:50 2010 +0100
  79 +++ b/MoinMoin/parser/text_csv.py	Mon Mar 22 00:40:39 2010 +0100
  80 @@ -185,4 +185,7 @@
  81      def format(self, formatter):
  82          browser = DataBrowserWidget(self.request, show_header=self._show_header)
  83          browser.setData(self.data)
  84 -        self.request.write(browser.render(method="GET"))
  85 +        div = ['<div id="csv">']
  86 +        div.append(browser.render(method="GET"))
  87 +        div.append('</div>')
  88 +        self.request.write('\n'.join(div))
  89 diff -r 7e18782d09b2 MoinMoin/stats/hitcounts.py
  90 --- a/MoinMoin/stats/hitcounts.py	Fri Mar 19 20:23:50 2010 +0100
  91 +++ b/MoinMoin/stats/hitcounts.py	Mon Mar 22 00:40:39 2010 +0100
  92 @@ -187,7 +187,10 @@
  93  
  94      table = DataBrowserWidget(request)
  95      table.setData(hits)
  96 -    return table.render(method="GET")
  97 +    div = ['<div id="hitcounts">']
  98 +    div.append(table.render(method="GET"))
  99 +    div.append('</div>')
 100 +    return '\n'.join(div)
 101  
 102  
 103  def draw(pagename, request):
 104 diff -r 7e18782d09b2 MoinMoin/stats/languages.py
 105 --- a/MoinMoin/stats/languages.py	Fri Mar 19 20:23:50 2010 +0100
 106 +++ b/MoinMoin/stats/languages.py	Mon Mar 22 00:40:39 2010 +0100
 107 @@ -87,5 +87,8 @@
 108  
 109      table = DataBrowserWidget(request)
 110      table.setData(languages)
 111 -    return table.render(method="GET")
 112 +    div = ['<div id="languages">']
 113 +    div.append(table.render(method="GET"))
 114 +    div.append('</div>')
 115 +    return '\n'.join(div)
 116  
 117 diff -r 7e18782d09b2 MoinMoin/stats/useragents.py
 118 --- a/MoinMoin/stats/useragents.py	Fri Mar 19 20:23:50 2010 +0100
 119 +++ b/MoinMoin/stats/useragents.py	Mon Mar 22 00:40:39 2010 +0100
 120 @@ -116,7 +116,10 @@
 121  
 122      table = DataBrowserWidget(request)
 123      table.setData(agents)
 124 -    return table.render(method="GET")
 125 +    div = ['<div id="useragents">']
 126 +    div.append(table.render(method="GET"))
 127 +    div.append('</div>')
 128 +    return '\n'.join(div)
 129  
 130  def draw(pagename, request):
 131      import shutil, cStringIO
 132 diff -r 7e18782d09b2 MoinMoin/userform/admin.py
 133 --- a/MoinMoin/userform/admin.py	Fri Mar 19 20:23:50 2010 +0100
 134 +++ b/MoinMoin/userform/admin.py	Mon Mar 22 00:40:39 2010 +0100
 135 @@ -106,8 +106,10 @@
 136  
 137          browser = DataBrowserWidget(request)
 138          browser.setData(data, sort_columns=[0])
 139 -        return browser.render()
 140 -
 141 +        div = ['<div id="admin">']
 142 +        div.append(browser.render())
 143 +        div.append('</div>')
 144 +        return '\n'.join(div)
 145      # No data
 146      return ''
 147