[Moin-devel] CVS: MoinMoin Page.py,1.117,1.118 request.py,1.5,1.6 wikiaction.py,1.70,1.71 wikiutil.py,1.94,1.95

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv21370

Modified Files:
	Page.py request.py wikiaction.py wikiutil.py 
Log Message:
Moved wikiutil._footer_fragments to request instance


Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -r1.117 -r1.118
*** Page.py	17 Apr 2002 21:58:16 -0000	1.117
--- Page.py	24 Apr 2002 19:36:53 -0000	1.118
***************
*** 391,395 ****
              # send the page footer
              if self.default_formatter and not print_mode:
!                 wikiutil.send_footer(self.page_name, self._last_modified(),
                      print_mode=print_mode)
  
--- 391,395 ----
              # send the page footer
              if self.default_formatter and not print_mode:
!                 wikiutil.send_footer(request, self.page_name, self._last_modified(),
                      print_mode=print_mode)
  

Index: request.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/request.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** request.py	13 Feb 2002 21:13:52 -0000	1.5
--- request.py	24 Apr 2002 19:36:54 -0000	1.6
***************
*** 1,4 ****
  """
!     MoinMoin - HTTP Request Data
  
      Copyright (c) 2001, 2002 by Jürgen Hermann <jh at web.de>
--- 1,4 ----
  """
!     MoinMoin - Data associated with a single Request
  
      Copyright (c) 2001, 2002 by Jürgen Hermann <jh at web.de>
***************
*** 58,61 ****
--- 58,70 ----
          self.lang = i18n.getLang()
          i18n.adaptCharset(self.lang)
+ 
+         self._footer_fragments = {}
+ 
+ 
+     def add2footer(self, key, htmlcode):
+         """ Add a named HTML fragment to the footer, after the default links
+         """
+         self._footer_fragments[key] = htmlcode
+ 
  
      def getPragma(self, key, defval=None):

Index: wikiaction.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** wikiaction.py	17 Apr 2002 22:13:28 -0000	1.70
--- wikiaction.py	24 Apr 2002 19:36:54 -0000	1.71
***************
*** 77,81 ****
  
      print_search_stats(len(hits), pagecount, start)
!     wikiutil.send_footer(pagename, editable=0, showactions=0, form=request.form)
  
  
--- 77,81 ----
  
      print_search_stats(len(hits), pagecount, start)
!     wikiutil.send_footer(request, pagename, editable=0, showactions=0, form=request.form)
  
  
***************
*** 106,110 ****
  
      print_search_stats(len(hits), len(all_pages), start)
!     wikiutil.send_footer(pagename, editable=0, showactions=0, form=request.form)
  
  
--- 106,110 ----
  
      print_search_stats(len(hits), len(all_pages), start)
!     wikiutil.send_footer(request, pagename, editable=0, showactions=0, form=request.form)
  
  
***************
*** 266,270 ****
          print '</pre>'
  
!     wikiutil.send_footer(pagename, showpage=1)
  
  
--- 266,270 ----
          print '</pre>'
  
!     wikiutil.send_footer(request, pagename, showpage=1)
  
  
***************
*** 360,364 ****
      print '</table>\n'
  
!     wikiutil.send_footer(pagename, showpage=1)
  
  
--- 360,364 ----
      print '</table>\n'
  
!     wikiutil.send_footer(request, pagename, showpage=1)
  
  

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** wikiutil.py	27 Mar 2002 23:13:11 -0000	1.94
--- wikiutil.py	24 Apr 2002 19:36:54 -0000	1.95
***************
*** 614,626 ****
  
  
! _footer_fragments = {}
! 
! def add2footer(key, htmlcode):
!     """ Add a named HTML fragment to the footer, after the default links
!     """
!     _footer_fragments[key] = htmlcode
! 
! 
! def send_footer(pagename, mod_string=None, **keywords):
      """ Print the page footer.
  
--- 614,618 ----
  
  
! def send_footer(request, pagename, mod_string=None, **keywords):
      """ Print the page footer.
  
***************
*** 678,683 ****
  
      # output HTML code added by the page formatters
!     if _footer_fragments:
!         print string.join(_footer_fragments.values(), '')
  
      # list user actions that start with an uppercase letter
--- 670,675 ----
  
      # output HTML code added by the page formatters
!     if request._footer_fragments:
!         print string.join(request._footer_fragments.values(), '')
  
      # list user actions that start with an uppercase letter