Moved CreatorInfo from write_footer() back to write_header(). Removed maximum calendars years, and fixed display_year_nav().
svn: r11972
This commit is contained in:
src/plugins/webreport
@@ -295,7 +295,7 @@ class BasePage:
|
||||
sorted_first_letter.sort(locale.strcoll)
|
||||
|
||||
num_ltrs = len(sorted_first_letter)
|
||||
if num_ltrs <= 25:
|
||||
if num_ltrs <= 26:
|
||||
of.write('\t<div id="navigation">\n')
|
||||
of.write('\t\t<ul>\n')
|
||||
for ltr in sorted_first_letter:
|
||||
@@ -303,20 +303,19 @@ class BasePage:
|
||||
of.write('\t\t</ul>\n')
|
||||
of.write('\t</div>\n')
|
||||
else:
|
||||
nrows = (num_ltrs / 25)
|
||||
nrows = (num_ltrs / 26)
|
||||
index = 0
|
||||
for rows in range(0, nrows):
|
||||
of.write('\t<div id="navigation">\n')
|
||||
of.write('\t\t<ul>\n')
|
||||
cols = 0
|
||||
while (cols <= 24 and index <= num_ltrs):
|
||||
while (cols <= 26 and index <= num_ltrs):
|
||||
of.write('\t\t\t<li><a href="#%s">%s</a></li>\n'
|
||||
% (sorted_first_letter[index], sorted_first_letter[index]))
|
||||
cols += 1
|
||||
index += 1
|
||||
of.write('\t\t<ul>\n')
|
||||
of.write('\t</div>\n')
|
||||
return of
|
||||
|
||||
def write_footer(self, of):
|
||||
|
||||
@@ -337,13 +336,6 @@ class BasePage:
|
||||
msg = _('Generated by <a href="http://gramps-project.org">'
|
||||
'GRAMPS</a> on %(date)s') % {'date' : value}
|
||||
|
||||
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 />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,9 +409,17 @@ class BasePage:
|
||||
header = self.report.options['headernote']
|
||||
if header:
|
||||
note = self.report.database.get_note_from_gramps_id(header)
|
||||
of.write('\t<p id="user_header">')
|
||||
of.write(note.get())
|
||||
of.write('</p>\n')
|
||||
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
|
||||
|
Reference in New Issue
Block a user