[ZWeb] CVS: Products/ZWiki - ZWikiPage.py:1.66

[Ken Manheimer]

Update of /cvs-zopeorg/Products/ZWiki
In directory cvs.zope.org:/tmp/cvs-serv6142

Modified Files:
	ZWikiPage.py 
Log Message:
Cosmetic notification message refinements.


=== Products/ZWiki/ZWikiPage.py 1.65 => 1.66 ===
 cite_prefixexp = re.compile('([\s>]*>)?([\s]*)')
 
+SECTION_DELIM = 50 * '-'
+
 # intl. regexps - won't work because we convert intl. chars to
 # entities to protect them from browser textareas
 #IU = intlupper        = '\300\302\311\312\316\324\333'
@@ -778,7 +780,8 @@
             diff = self.textDiff(a=oldtext,b=(self._st_data or self.xread()))
             changes = "Changes:\n\n%s" % diff
             if log:
-                changes = "Log message:\n%s\n\n%s" % (log, changes)
+                changes = "Log message:\n%s\n%s\n%s" % (log, SECTION_DELIM,
+                                                          changes)
             send_probs = self.sendMailToSubscribers(changes, REQUEST)
 
         # catalog code
@@ -1375,6 +1378,7 @@
         mailouttext = re.sub(r'(?s)(<hr>)?<b>(.*?)</b><br>\n',r'',text)
         mailouttext = re.sub(r'(?m)^<br>><i>(.*?)</i>',r'>\1',mailouttext)
         mailouttext = html_unquote(mailouttext)
+        mailouttext = string.rstrip(mailouttext)
 
         # from SendMailTag.py
         if not hasattr(self, 'MailHost'):
@@ -1411,11 +1415,11 @@
 Wiki page change notification - %s:
   %s
 
---
 %s
---
-(To change your subscription, visit:
-  %s/subscribeform )
+%s
+%s
+To change your page subscription, visit:
+  %s/subscribeform
 """ % (wiki_host,
        sender_email,
        addrs,
@@ -1423,7 +1427,9 @@
        self.id(),
        qualifier,
        self.absolute_url(),
+       SECTION_DELIM,
        mailouttext,
+       SECTION_DELIM,
        self.absolute_url(),
        ))
                 return None