merge fix for bug #2736 from 310 to trunk

svn: r12089

src/plugins/webreport/NarrativeWeb.py

@@ -306,7 +306,7 @@ class BasePage:
             of.write('\t<div id="navigation">\n')
             of.write('\t\t<ul>\n')
             for ltr in  sorted_first_letter:
-                of.write('\t\t\t<li><a href="#%s">%s</a> </li>' % (ltr, ltr))
+                of.write('\t\t\t<li><a href="#%s">%s</a> </li>\n' % (ltr, ltr))
             of.write('\t\t</ul>\n')
             of.write('\t</div>\n')
         else:
@@ -343,6 +343,15 @@ class BasePage:
         msg = _('Generated by <a href="http://gramps-project.org">'
                 'GRAMPS</a> on %(date)s') % {'date' : value}
 
+        # optional "link-home" feature; see bug report #2736
+        if self.report.options['linkhome']:
+            home_person = self.report.database.get_default_person()
+            if home_person:
+                home_person_url = self.report.build_url_fname_html(home_person.handle, 'ppl', self.up)
+                home_person_name = home_person.get_primary_name().get_regular_name()
+                msg += '<br />'
+                msg += _('Created for <a href="%s">%s</a>') % (home_person_url, home_person_name)
+
         of.write('\t<p id="createdate">%s</p>\n' % msg)
 
         copy_nr = self.report.copyright
@@ -417,16 +426,6 @@ class BasePage:
         if header:
             note = self.report.database.get_note_from_gramps_id(header)
             of.write('\t<p id="user_header">%s</p>\n' % note.get())
-
-        linkhome = self.report.options['linkhome']
-        if linkhome:
-            home_person = self.report.database.get_default_person()
-            if home_person:
-                home_person_url = self.report.build_url_fname_html(home_person.handle, 'ppl', self.up)
-                home_person_name = home_person.get_primary_name().get_regular_name()
-                msg = _('Created for <a href="%s">%s</a>') % (home_person_url, home_person_name)
-                of.write('\t<p id="CreatorInfo">%s</p>\n' % msg)
-
         of.write('</div>\n')
 
         # Begin Navigation Menu