[Moin-devel] CVS: MoinMoin PageEditor.py,1.21,1.22

[J?rgen Hermann]

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

Modified Files:
	PageEditor.py 
Log Message:
editor shows page size


Index: PageEditor.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** PageEditor.py	18 Jun 2002 19:42:17 -0000	1.21
--- PageEditor.py	20 Jun 2002 21:01:21 -0000	1.22
***************
*** 76,91 ****
              title % {'pagename': self.split_title(),},
              pagename=self.page_name, body_class="editor")
-         template_param = ''
-         if form.has_key('template'):
-             template_param = '&template=' + form['template'].value
-         print '<a href="%s?action=edit&rows=10&cols=60%s">%s</a>' % (
-             wikiutil.quoteWikiname(self.page_name), template_param,
-             _('Reduce editor size'))
-         print "|", wikiutil.getSysPage('HelpOnFormatting').link_to()
-         print "|", wikiutil.getSysPage('InterWiki').link_to(target='_blank')
-         if preview:
-             print '| <a href="#preview">%s</a>' % _('Skip to preview')
  
!         # send form
          try:
              text_rows = int(form['rows'].value)
--- 76,81 ----
              title % {'pagename': self.split_title(),},
              pagename=self.page_name, body_class="editor")
  
!         # get request parameters
          try:
              text_rows = int(form['rows'].value)
***************
*** 99,114 ****
              if request.user.valid: text_cols = int(request.user.edit_cols)
  
-         print '<form method="post" action="%s/%s%s">' % (
-             webapi.getScriptname(),
-             wikiutil.quoteWikiname(self.page_name),
-             '#preview',
-             )
-         print '<input type="hidden" name="action" value="savepage">'
-         if os.path.isfile(self._text_filename()):
-             mtime = os.path.getmtime(self._text_filename())
-         else:
-             mtime = 0
-         print '<input type="hidden" name="datestamp" value="%d">' % (mtime,)
- 
          # get the text body for the editor field
          if form.has_key('template'):
--- 89,92 ----
***************
*** 122,125 ****
--- 100,129 ----
          else:
              raw_body = self.get_raw_body()
+ 
+         # send text above text area
+         template_param = ''
+         if form.has_key('template'):
+             template_param = '&template=' + form['template'].value
+         print '<a href="%s?action=edit&rows=10&cols=60%s">%s</a>' % (
+             wikiutil.quoteWikiname(self.page_name), template_param,
+             _('Reduce editor size'))
+         print "|", wikiutil.getSysPage('HelpOnFormatting').link_to()
+         print "|", wikiutil.getSysPage('InterWiki').link_to(target='_blank')
+         if preview:
+             print '| <a href="#preview">%s</a>' % _('Skip to preview')
+         request.write(_('   [current page size <b>%(size)d</b> bytes]') % {'size': len(raw_body)})
+ 
+         # send form
+         print '<form method="post" action="%s/%s%s">' % (
+             webapi.getScriptname(),
+             wikiutil.quoteWikiname(self.page_name),
+             '#preview',
+             )
+         print '<input type="hidden" name="action" value="savepage">'
+         if os.path.isfile(self._text_filename()):
+             mtime = os.path.getmtime(self._text_filename())
+         else:
+             mtime = 0
+         print '<input type="hidden" name="datestamp" value="%d">' % (mtime,)
  
          # generate default content