Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #2693 - regression; places in events were being ignored

Browse Source 
svn: r11912
This commit is contained in:
Stéphane Charette 2009-02-08 09:42:19 +00:00
parent 4eb5eebfb8
commit 0b2394fbd9
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/webreport/NarrativeWeb.py
View File

@ -346,25 +346,25 @@ class BasePage:
# Link to css behaviours # Link to css behaviours
fname = os.path.join("styles", "behaviour.css") fname = os.path.join("styles", "behaviour.css")
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
of.write('\t<link href="%s" rel="stylesheet" \n' of.write('\t<link href="%s" rel="stylesheet" '
'\t\ttype="text/css" media="screen">\n' % url) 'type="text/css" media="screen">\n' % url)
# Link to screen stylesheet # Link to screen stylesheet
fname = os.path.join("styles", self.report.css) fname = os.path.join("styles", self.report.css)
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
of.write('\t<link href="%s" rel="stylesheet" \n' of.write('\t<link href="%s" rel="stylesheet" '
'\t\ttype="text/css" media="screen" />\n' % url) 'type="text/css" media="screen" />\n' % url)
# Link to printer stylesheet # Link to printer stylesheet
fname = os.path.join("styles", "Web_Print-Default.css") fname = os.path.join("styles", "Web_Print-Default.css")
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
of.write('\t<link href="%s" rel="stylesheet" \n' of.write('\t<link href="%s" rel="stylesheet" '
'\t\ttype="text/css" media="print" />\n' % url) 'type="text/css" media="print" />\n' % url)
# Link to GRAMPS favicon # Link to GRAMPS favicon
url = self.report.build_url_image('favicon.ico', 'images', self.up) url = self.report.build_url_image('favicon.ico', 'images', self.up)
of.write('\t<link href="%s" rel="Shortcut Icon"\n' of.write('\t<link href="%s" rel="Shortcut Icon" '
'\t\ttype="image/icon">\n' % url) 'type="image/icon">\n' % url)
of.write('</head>\n\n') of.write('</head>\n\n')
of.write('<body id="NarrativeWeb">\n') # Terminated in write_footer() of.write('<body id="NarrativeWeb">\n') # Terminated in write_footer()
@ -1047,17 +1047,14 @@ class PlaceListPage(BasePage):
last_letter = letter last_letter = letter
of.write('\t\t<tr class="BeginLetter">\n') of.write('\t\t<tr class="BeginLetter">\n')
of.write('\t\t\t<td class="ColumnLetter">%s</td>\n' % last_letter) of.write('\t\t\t<td class="ColumnLetter">%s</td>\n' % last_letter)
of.write('\t\t\t<td class="ColumnName">')
self.place_link(of, place.handle, n, place.gramps_id)
of.write('</td>\n')
of.write('\t\t</tr>\n')
else: else:
of.write('\t\t<tr>\n') of.write('\t\t<tr>\n')
of.write('\t\t\t<td class="ColumnLetter">&nbsp;</td>\n') of.write('\t\t\t<td class="ColumnLetter">&nbsp;</td>\n')
of.write('\t\t\t<td class="ColumnName">')
self.place_link(of, place.handle, n, place.gramps_id) of.write('\t\t\t<td class="ColumnName">')
of.write('</td>\n') self.place_link(of, place.handle, n, place.gramps_id)
of.write('\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t</tr>\n')
of.write('\t</tbody>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n') of.write('\t</table>\n')
@ -2196,12 +2193,13 @@ class IndividualPage(BasePage):
# Place # Place
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
# TODO. Figure out what this is for.
#if place_handle in self.place_list: lnk = (self.report.cur_fname, self.page_title, self.gid)
# if lnk not in self.place_list[place_handle]: if place_handle in self.place_list:
# self.place_list[place_handle].append(lnk) if lnk not in self.place_list[place_handle]:
#else: self.place_list[place_handle].append(lnk)
# self.place_list[place_handle] = [lnk] else:
self.place_list[place_handle] = [lnk]
place = self.place_link_str(place_handle, place = self.place_link_str(place_handle,
ReportUtils.place_name(self.report.database, place_handle), ReportUtils.place_name(self.report.database, place_handle),