[Moin-devel] CVS: MoinMoin/formatter base.py,1.22,1.23 text_html.py,1.41,1.42 text_plain.py,1.18,1.19 text_xml.py,1.27,1.28

[J?rgen Hermann]

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

Modified Files:
	base.py text_html.py text_plain.py text_xml.py 
Log Message:
config.allow_xslt


Index: base.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/base.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** base.py	17 Apr 2002 19:54:35 -0000	1.22
--- base.py	10 May 2002 11:39:01 -0000	1.23
***************
*** 37,40 ****
--- 37,48 ----
          self.page = page
  
+     def sysmsg(self, text, **kw):
+         """ Emit a system message (embed it into the page).
+ 
+             Normally used to indicate disabled options, or invalid
+             markup.
+         """
+         return text
+ 
      def startDocument(self, pagename):
          return ""

Index: text_html.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_html.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** text_html.py	24 Apr 2002 20:11:21 -0000	1.41
--- text_html.py	10 May 2002 11:39:01 -0000	1.42
***************
*** 49,52 ****
--- 49,54 ----
              request._fmt_hd_counters = []
  
+     def sysmsg(self, text, **kw):
+         return '<div class="message"><b>%s</b></div>' % cgi.escape(text)
  
      def pagelink(self, pagename, text=None, **kw):

Index: text_plain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_plain.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** text_plain.py	17 Apr 2002 19:54:35 -0000	1.18
--- text_plain.py	10 May 2002 11:39:01 -0000	1.19
***************
*** 34,37 ****
--- 34,40 ----
          return '\n'
  
+     def sysmsg(self, text, **kw):
+         return '\n\n*** %s ***\n\n' % text
+ 
      def pagelink(self, pagename, text=None, **kw):
          apply(FormatterBase.pagelink, (self, pagename, text), kw)

Index: text_xml.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_xml.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** text_xml.py	17 Apr 2002 19:54:35 -0000	1.27
--- text_xml.py	10 May 2002 11:39:01 -0000	1.28
***************
*** 52,55 ****
--- 52,58 ----
          return result + '</s1>'
  
+     def sysmsg(self, text, **kw):
+         return '<!-- %s -->' % self._escape(text).replace('--', '==')
+ 
      def rawHTML(self, markup):
          return '<![CDATA[' + string.replace(markup, ']]>', ']]>]]><![CDATA[') + ']]>'