# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1323351000 -3600
# Node ID 6510654269a6c4481f66a3ace78b99aad0d898dd
# Parent  8311cc3b472a466c1733ea463829e880d9c7541f
[ajax] make navigation component appear both above and below the view (closes #2110266)

diff -r 8311cc3b472a -r 6510654269a6 web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Thu Dec 08 13:17:25 2011 +0100
+++ b/web/views/basecontrollers.py	Thu Dec 08 14:30:00 2011 +0100
@@ -349,8 +349,10 @@
             if vtitle:
                 stream.write(u'<h1 class="vtitle">%s</h1>\n' % vtitle)
             paginate = True
+        nav_html = UStringIO()
         if paginate and not view.handle_pagination:
-            view.paginate()
+            view.paginate(w=nav_html.write)
+        stream.write(nav_html.getvalue())
         if divid == 'pageContent':
             stream.write(u'<div id="contentmain">')
         view.render(**kwargs)
@@ -360,7 +362,7 @@
             stream.write(extresources)
             stream.write(u'</div>\n')
         if divid == 'pageContent':
-            stream.write(u'</div></div>')
+            stream.write(u'</div>%s</div>' % nav_html.getvalue())
         return stream.getvalue()
 
     @xhtmlize