[Moin-devel] CVS: MoinMoin Page.py,1.104,1.105 cgimain.py,1.44,1.45 wikiutil.py,1.80,1.81

[J?rgen Hermann]

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

Modified Files:
	Page.py cgimain.py wikiutil.py 
Log Message:
No extra footer stuff in print mode


Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** Page.py	14 Feb 2002 22:17:49 -0000	1.104
--- Page.py	27 Feb 2002 21:27:24 -0000	1.105
***************
*** 393,397 ****
              # send the page footer
              if self.default_formatter and not print_mode:
!                 wikiutil.send_footer(self.page_name, self._last_modified())
  
              sys.stdout.write(doc_trailer)
--- 393,398 ----
              # 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)
  
              sys.stdout.write(doc_trailer)

Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** cgimain.py	13 Feb 2002 21:13:52 -0000	1.44
--- cgimain.py	27 Feb 2002 21:27:24 -0000	1.45
***************
*** 190,194 ****
          request.clock.stop('total')
  
!         if config.show_timings:
              print '<pre><font size="1" face="Verdana">',
              request.clock.dump(sys.stdout)
--- 190,194 ----
          request.clock.stop('total')
  
!         if config.show_timings and request.form.getvalue('action', None) != 'print':
              print '<pre><font size="1" face="Verdana">',
              request.clock.dump(sys.stdout)

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** wikiutil.py	27 Feb 2002 21:02:53 -0000	1.80
--- wikiutil.py	27 Feb 2002 21:27:24 -0000	1.81
***************
*** 533,536 ****
--- 533,537 ----
              **editable** -- true, when page is editable (default: true)
              **showpage** -- true, when link back to page is wanted (default: false)
+             **print_mode** -- true, when page is displayed in print mode
      """
      import cgi
***************
*** 599,603 ****
  
      # end of footer
!     if config.show_version:
          print '<p><font size="1" face="Verdana">MoinMoin %s, Copyright © 2000, 2001, 2002 by Jürgen Hermann</font></p>' % (version.revision,)
  
--- 600,604 ----
  
      # end of footer
!     if config.show_version and not keywords.get('print_mode', 0):
          print '<p><font size="1" face="Verdana">MoinMoin %s, Copyright © 2000, 2001, 2002 by Jürgen Hermann</font></p>' % (version.revision,)