[gen] Bigfixees in cleaning of XHTML fields.

gen/mixins/ToolMixin.py

@@ -1067,6 +1067,12 @@ class ToolMixin(BaseMixin):
            names are normalized.'''
         tool = self.appy()
         if not login: login = tool.user.getId()
+        # Manage the special case of an anonymous user.
+        if login == 'Anonymous User':
+            name = self.translate('anonymous')
+            if normalized: name = normalizeString(name)
+            return name
+        # Manage the case of a "real" user.
         user = tool.search1('User', noSecurity=True, login=login)
         if not user: return login
         firstName = user.firstName

gen/po.py

@@ -29,7 +29,7 @@ appyLabels = [
  ('appy_title', 'Title'),
  ('data_change', 'Data change'),
  ('modified_field', 'Modified field'),
- ('previous_value', 'Previous value'),
+ ('previous_value', 'Previous value or modification'),
  ('phase', 'phase'),
  ('choose_a_value', ' - '),
  ('choose_a_doc', '[ Documents ]'),
@@ -200,6 +200,7 @@ appyLabels = [
  ('history_delete', 'Deleted by ${userName}'),
  ('changes_show', 'Show changes'),
  ('changes_hide', 'Hide changes'),
+ ('anonymous', 'an anonymous user'),
 ]
 
 # Some default values for labels whose ids are not fixed (so they can't be

gen/ui/page.pt

@@ -190,7 +190,7 @@
             </tal:accessHistory>
 
             <tal:comment replace="nothing">Document creator</tal:comment>
-            <tal:creator condition="python: creator != 'Anonymous User'">
+            <tal:creator>
              <tal:by replace="python: _('object_created_by')"/>
              <tal:creator replace="python: tool.getUserName(creator)"/>
             </tal:creator>

shared/xml_parser.py

@@ -1085,10 +1085,12 @@ class XhtmlCleaner(XmlParser):
             # This is the end of a sub-tag within a region that we must ignore.
             pass
         else:
+            if self.env.currentContent:
                 self.res.append(self.env.currentContent)
             # Add a line break after the end tag if required (ie: xhtml differ
             # needs to get paragraphs and other elements on separate lines).
-            if elem in self.lineBreakTags:
+            if (elem in self.lineBreakTags) and self.res and \
+               (self.res[-1][-1] != '\n'):
                 suffix = '\n'
             else:
                 suffix = ''
@@ -1098,10 +1100,11 @@ class XhtmlCleaner(XmlParser):
     def characters(self, content):
         if self.env.ignoreContent: return
         # Remove blanks that ckeditor may add just after a start tag
-        if not self.env.currentContent or (self.env.currentContent == ' '):
-            toAdd = ' ' + content.lstrip()
+        if not self.env.currentContent or \
+           self.env.currentContent[-1] in ('\n', ' '):
+            toAdd = content.lstrip()
         else:
             toAdd = content
         # Re-transform XML special chars to entities.
-        self.env.currentContent += cgi.escape(content)
+        self.env.currentContent += cgi.escape(toAdd)
 # ------------------------------------------------------------------------------