# HG changeset patch
# User Katia Saurfelt <katia.saurfelt@logilab.fr>
# Date 1240395625 -7200
# Node ID e3a2c31ae897bac09a2fcc8c671631f012976751
# Parent  b31f7abc3fdc4ded1d2be769f0bdfa8c0c225408# Parent  71807bfd14c173b550ddcd34c43bc8163b85bad4
merge

diff -r 71807bfd14c1 -r e3a2c31ae897 web/views/baseviews.py
--- a/web/views/baseviews.py	Tue Apr 21 20:13:03 2009 -0700
+++ b/web/views/baseviews.py	Wed Apr 22 12:20:25 2009 +0200
@@ -734,13 +734,13 @@
            
     def render_entity_creator(self, entity):
         if entity.creator:
-            self._marker('dc:creator', entity.creator.name())
             email = entity.creator.get_email()
             if email:
-                self.w(u'<author>')
-                self.w(email)
-                self.w(u'</author>')       
-        
+                self._marker('author', email + ' (%s)' %  entity.creator.name())
+            else:
+                self._marker('dc:creator', entity.creator.name())
+       
+                
     def _marker(self, marker, value):
         if value:
             self.w(u'  <%s>%s</%s>\n' % (marker, html_escape(value), marker))