changeset 2754:907b9e60c232

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 23 Aug 2007 10:34:28 +0200
parents 94d4f531bcf6 (current diff) ddb2d19684d7 (diff)
children 7c8e3ce74202
files MoinMoin/PageEditor.py MoinMoin/PageGraphicalEditor.py MoinMoin/action/AttachFile.py MoinMoin/formatter/__init__.py MoinMoin/formatter/text_docbook.py MoinMoin/formatter/text_html.py MoinMoin/macro/AttachInfo.py
diffstat 16 files changed, 99 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/PageEditor.py	Thu Aug 23 10:34:28 2007 +0200
@@ -405,7 +405,7 @@
 
         request.write(
             u'''\
-<textarea id="editor-textarea" name="savetext" lang="%(lang)s" dir="%(dir)s" rows="%(rows)d"
+<textarea id="editor-textarea" name="savetext" lang="%(lang)s" dir="%(dir)s" rows="%(rows)d" cols="80"
           onChange="flgChange = true;" onKeyPress="flgChange = true;">\
 %(text)s\
 </textarea>''' % {
@@ -417,7 +417,7 @@
 
         request.write("<p>")
         request.write(_("Comment:"),
-            ' <input id="editor-comment" type="text" name="comment" value="%s" maxlength="200"'
+            ' <input id="editor-comment" type="text" name="comment" value="%s" size="80" maxlength="200"'
             ' onChange="flgChange = true;" onKeyPress="flgChange = true;">' % (
                 wikiutil.escape(kw.get('comment', ''), 1), ))
         request.write("</p>")
--- a/MoinMoin/PageGraphicalEditor.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/PageGraphicalEditor.py	Thu Aug 23 10:34:28 2007 +0200
@@ -339,7 +339,7 @@
 """)
         request.write("<p>")
         request.write(_("Comment:"),
-            ' <input id="editor-comment" type="text" name="comment" value="%s" maxlength="200">' % (
+            ' <input id="editor-comment" type="text" name="comment" value="%s" size="80" maxlength="200">' % (
                 wikiutil.escape(kw.get('comment', ''), 1), ))
         request.write("</p>")
 
--- a/MoinMoin/action/AttachFile.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/action/AttachFile.py	Thu Aug 23 10:34:28 2007 +0200
@@ -822,13 +822,13 @@
     <tr>
         <td class="label"><label>%(newname_label)s</label></td>
         <td class="content">
-            <input type="text" name="newpagename" value="%(pagename)s">
+            <input type="text" name="newpagename" value="%(pagename)s" size="80">
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(attachment_label)s</label></td>
         <td class="content">
-            <input type="text" name="newattachmentname" value="%(attachment_name)s">
+            <input type="text" name="newattachmentname" value="%(attachment_name)s" size="80">
         </td>
     </tr>
     <tr>
--- a/MoinMoin/action/CopyPage.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/action/CopyPage.py	Thu Aug 23 10:34:28 2007 +0200
@@ -116,13 +116,13 @@
     <tr>
         <td class="label"><label>%(newname_label)s</label></td>
         <td class="content">
-            <input type="text" name="newpagename" value="%(pagename)s">
+            <input type="text" name="newpagename" value="%(pagename)s" size="80">
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(comment_label)s</label></td>
         <td class="content">
-            <input type="text" name="comment" maxlength="200">
+            <input type="text" name="comment" size="80" maxlength="200">
         </td>
     </tr>
     <tr>
@@ -146,13 +146,13 @@
     <tr>
         <td class="label"><label>%(newname_label)s</label></td>
         <td class="content">
-            <input type="text" name="newpagename" value="%(pagename)s">
+            <input type="text" name="newpagename" value="%(pagename)s" size="80">
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(comment_label)s</label></td>
         <td class="content">
-            <input type="text" name="comment" maxlength="200">
+            <input type="text" name="comment" size="80" maxlength="200">
         </td>
     </tr>
     <tr>
--- a/MoinMoin/action/DeletePage.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/action/DeletePage.py	Thu Aug 23 10:34:28 2007 +0200
@@ -101,7 +101,7 @@
     <tr>
         <td class="label"><label>%(comment_label)s</label></td>
         <td class="content">
-            <input type="text" name="comment" maxlength="200">
+            <input type="text" name="comment" size="80" maxlength="200">
         </td>
     </tr>
     <tr>
@@ -127,7 +127,7 @@
     <tr>
         <td class="label"><label>%(comment_label)s</label></td>
         <td class="content">
-            <input type="text" name="comment" maxlength="200">
+            <input type="text" name="comment" size="80" maxlength="200">
         </td>
     </tr>
     <tr>
--- a/MoinMoin/action/PackagePages.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/action/PackagePages.py	Thu Aug 23 10:34:28 2007 +0200
@@ -153,13 +153,13 @@
     <tr>
         <td class="label"><label>%(newname_label)s</label></td>
         <td class="content">
-            <input type="text" name="packagename" value="package.zip">
+            <input type="text" name="packagename" value="package.zip" size="80">
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(list_label)s</label></td>
         <td class="content">
-            <input type="text" name="pagelist" maxlength="200" value=%(pagename)s>
+            <input type="text" name="pagelist" size="80" maxlength="200" value=%(pagename)s>
         </td>
     </tr>
     <tr>
--- a/MoinMoin/action/RenamePage.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/action/RenamePage.py	Thu Aug 23 10:34:28 2007 +0200
@@ -115,13 +115,13 @@
     <tr>
         <td class="label"><label>%(newname_label)s</label></td>
         <td class="content">
-            <input type="text" name="newpagename" value="%(pagename)s">
+            <input type="text" name="newpagename" value="%(pagename)s" size="80">
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(comment_label)s</label></td>
         <td class="content">
-            <input type="text" name="comment" maxlength="200">
+            <input type="text" name="comment" size="80" maxlength="200">
         </td>
     </tr>
     <tr>
@@ -145,13 +145,13 @@
     <tr>
         <td class="label"><label>%(newname_label)s</label></td>
         <td class="content">
-            <input type="text" name="newpagename" value="%(pagename)s">
+            <input type="text" name="newpagename" value="%(pagename)s" size="80">
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(comment_label)s</label></td>
         <td class="content">
-            <input type="text" name="comment" maxlength="200">
+            <input type="text" name="comment" size="80" maxlength="200">
         </td>
     </tr>
     <tr>
--- a/MoinMoin/formatter/__init__.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/__init__.py	Thu Aug 23 10:34:28 2007 +0200
@@ -171,6 +171,12 @@
             return '[Image:%s]' % title
         return '[Image]'
 
+    # generic transclude/include:
+    def transclusion(self, on, **kw):
+        raise NotImplementedError
+    def transclusion_param(self, **kw):
+        raise NotImplementedError
+
     def smiley(self, text):
         return text
 
--- a/MoinMoin/formatter/dom_xml.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/dom_xml.py	Thu Aug 23 10:34:28 2007 +0200
@@ -357,6 +357,12 @@
             kw['src'] = src
         return self._add_tag('img', **kw)
 
+    def transclusion(self, on, **kw):
+        return self._set_tag('object', on, **kw)
+
+    def transclusion_param(self, **kw):
+        return self._add_tag('param', **kw)
+
     def escapedText(self, text, **kw):
         return wikiutil.escape(text)
 
--- a/MoinMoin/formatter/pagelinks.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/pagelinks.py	Thu Aug 23 10:34:28 2007 +0200
@@ -27,4 +27,5 @@
     number_list = bullet_list = listitem = definition_list = null
     definition_term = definition_desc = heading = table = null
     table_row = table_cell = attachment_link = attachment_image = attachment_drawing = null
+    transclusion = transclusion_param = null
 
--- a/MoinMoin/formatter/text_docbook.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/text_docbook.py	Thu Aug 23 10:34:28 2007 +0200
@@ -470,6 +470,14 @@
         self.cur.appendChild(media)
         return ""
 
+    def transclusion(self, on, **kw):
+        # TODO, see text_html formatter
+        return ""
+
+    def transclusion_param(self, **kw):
+        # TODO, see text_html formatter
+        return ""
+
     def smiley(self, text):
         return self.request.theme.make_icon(text)
 
--- a/MoinMoin/formatter/text_html.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/text_html.py	Thu Aug 23 10:34:28 2007 +0200
@@ -1044,6 +1044,8 @@
             return self._open('hr', newline=1, attr={'class': 'hr%d' % size}, **kw)
         return self._open('hr', newline=1, **kw)
 
+    # Images / Transclusion ##############################################
+
     def icon(self, type):
         return self.request.theme.make_icon(type)
 
@@ -1058,6 +1060,24 @@
             kw['src'] = src
         return self._open('img', **kw)
 
+    def transclusion(self, on, **kw):
+        """Transcludes (includes/embeds) another object."""
+        if on:
+            return self._open('object',
+                              allowed_attrs=['archive', 'classid', 'codebase',
+                                             'codetype', 'data', 'declare',
+                                             'height', 'name', 'standby',
+                                             'type', 'width', ],
+                              **kw)
+        else:
+            return self._close('object')
+
+    def transclusion_param(self, **kw):
+        """Give a parameter to a transcluded object."""
+        return self._open('param',
+                          allowed_attrs=['name', 'type', 'value', 'valuetype', ],
+                          **kw)
+
     # Lists ##############################################################
 
     def number_list(self, on, type=None, start=None, **kw):
--- a/MoinMoin/formatter/text_plain.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/text_plain.py	Thu Aug 23 10:34:28 2007 +0200
@@ -250,6 +250,12 @@
                 return kw[a]
         return u''
 
+    def transclusion(self, on, **kw):
+        return u''
+
+    def transclusion_param(self, **kw):
+        return u''
+
     def lang(self, on, lang_name):
         return ''
 
--- a/MoinMoin/formatter/text_xml.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/formatter/text_xml.py	Thu Aug 23 10:34:28 2007 +0200
@@ -213,6 +213,14 @@
                 attrs[key] = value
         return FormatterBase.image(self, **attrs) + '</img>'
 
+    def transclusion(self, on, **kw):
+        # TODO, see text_html formatter
+        return ''
+
+    def transclusion_param(self, **kw):
+        # TODO, see text_html formatter
+        return ''
+
     def code_area(self, on, code_id, code_type='code', show=0, start=-1, step=-1):
         return ('<codearea id="%s">' % code_id, '</codearea')[not on]
 
--- a/MoinMoin/macro/AttachInfo.py	Thu Aug 23 05:07:25 2007 +0200
+++ b/MoinMoin/macro/AttachInfo.py	Thu Aug 23 10:34:28 2007 +0200
@@ -1,5 +1,5 @@
 """
-    MoinMoin - AttachList Macro
+    MoinMoin - AttachInfo Macro
 
     A macro to produce information about attached pages
 
--- a/docs/CHANGES	Thu Aug 23 05:07:25 2007 +0200
+++ b/docs/CHANGES	Thu Aug 23 10:34:28 2007 +0200
@@ -28,6 +28,30 @@
     and improving it and after having made a backup with some other, proven
     method. USE BOTH ON YOUR OWN RISK!
 
+  * For the jabber notification bot, you need a development version 
+    of pyxmpp, 1.0 won't work. You can get it directly from svn repository:
+
+    svn checkout http://pyxmpp.jajcus.net/svn/pyxmpp/trunk pyxmpp
+
+    Add the resulting `pyxmpp` directory to your PYTHONPATH or perform
+    a "full installation" as described on http://pyxmpp.jajcus.net/:
+
+    To build the package just invoke:
+    python setup.py build
+
+    To install it:
+    python setup.py install
+
+    If you had some older version of PyXMPP it is better to uninstall it 
+    (delete pyxmpp subdirectory of your site-packages directory) before 
+    installing this one or things may not work correctly.
+
+    You may also try:
+    make
+
+    and:
+    make install
+
 Version 1.7.current:
     This is the active development branch. All changes get done here and
     critical stuff gets committed with -m "... (backport needed)" and then
@@ -46,6 +70,8 @@
     * cfg.password_checker (default: use some simple builtin checks for too
       easy passwords and, if available, python-crack).
       Use password_checker = None to disable password checking.
+    * jabber notification support; for more information see:
+      http://moinmo.in/MoinMoinTodo/Release_1.7/HelpOnNotification
 
   Bugfixes:
     * ...