Header and Footer notes were not formatted

svn: r15358
This commit is contained in:
Doug Blank 2010-05-08 13:05:28 +00:00
parent c1ce7ace3f
commit 937af27eaf

View File

@ -938,13 +938,14 @@ class BasePage(object):
footer_note = self.report.options['footernote'] footer_note = self.report.options['footernote']
if footer_note: if footer_note:
note = db.get_note_from_gramps_id(footer_note) note = self.get_note_format(
db.get_note_from_gramps_id(footer_note)
)
user_footer = Html("div", id = 'user_footer') user_footer = Html("div", id = 'user_footer')
footer += user_footer footer += user_footer
# attach note # attach note
user_footer += note.get() user_footer += note
msg = _('Generated by <a href = "%(homepage)s">' msg = _('Generated by <a href = "%(homepage)s">'
'Gramps</a> %(version)s on %(date)s') % { 'Gramps</a> %(version)s on %(date)s') % {
@ -1055,13 +1056,14 @@ class BasePage(object):
header_note = self.report.options['headernote'] header_note = self.report.options['headernote']
if header_note: if header_note:
note = db.get_note_from_gramps_id(header_note) note = self.get_note_format(
self.report.database.get_note_from_gramps_id(header_note)
)
user_header = Html("div", id = 'user_header') user_header = Html("div", id = 'user_header')
headerdiv += user_header headerdiv += user_header
# attach note # attach note
user_header += note.get() user_header += note
# Begin Navigation Menu # Begin Navigation Menu
body += self.display_nav_links(title) body += self.display_nav_links(title)