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

Added event.get_media_list() and Notes, urls, source references, and media to FamilyPage.

Browse Source 
svn: r18070
This commit is contained in:
Rob G. Healey 2011-08-27 00:26:33 +00:00
parent 860d946652
commit c942a8bee6
1 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2768,9 +2768,12 @@ class FamilyPage(BasePage):
with Html("div", class_ ="content", id ="RelationshipDetail") as familydetail: with Html("div", class_ ="content", id ="RelationshipDetail") as familydetail:
body += familydetail body += familydetail
thumbnail = self.display_first_image_as_thumbnail(family.get_media_list(), family) # family media list
if thumbnail: if self.create_media:
familydetail += thumbnail family_media_list = family.get_media_list()
thumbnail = self.display_first_image_as_thumbnail(family_media_list, family)
if thumbnail:
familydetail += thumbnail
url = self.report.build_url_fname_html(person.handle, 'ppl', up =self.up) url = self.report.build_url_fname_html(person.handle, 'ppl', up =self.up)
person_link = self.person_link(url, person, _NAME_STYLE_DEFAULT, gid = person.get_gramps_id()) person_link = self.person_link(url, person, _NAME_STYLE_DEFAULT, gid = person.get_gramps_id())
@ -2890,6 +2893,29 @@ class FamilyPage(BasePage):
if disp_fam_lds: if disp_fam_lds:
familydetail += disp_fam_lds familydetail += disp_fam_lds
# Narrative subsection
notelist = family.get_note_list()
notelist = self.display_note_list(notelist)
if notelist:
familydetail += notelist
# get attribute list
attrlist = family.get_attribute_list()
attrlist = self.display_attr_list(attrlist)
if attrlist:
familydetail += attrlist
# source references
srcrefs = self.display_ind_sources(family)
if srcrefs:
familydetail += srcrefs
# display additional images as gallery
if self.create_media:
addgallery = self.display_additional_images_as_gallery(family_media_list, family)
if addgallery:
familydetail += addgallery
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section
footer = self.write_footer() footer = self.write_footer()
@ -3326,8 +3352,11 @@ class EventPage(BasePage):
db = report.database db = report.database
event = db.get_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
evt_gid = event.gramps_id if not event:
BasePage.__init__(self, report, title, evt_gid) return None
event_media_list = event.get_media_list()
BasePage.__init__(self, report, title, event.get_gramps_id())
self.up = True self.up = True
subdirs = True subdirs = True
@ -3340,9 +3369,13 @@ class EventPage(BasePage):
with Html("div", class_ = "content", id = "EventDetail") as eventdetail: with Html("div", class_ = "content", id = "EventDetail") as eventdetail:
body += eventdetail body += eventdetail
thumbnail = self.display_first_image_as_thumbnail(event_media_list, event)
if thumbnail:
eventdetail += thumbnail
# display page title # display page title
evt_type = str(event.type) evt_type = str(event.get_type())
title = "%(eventtype)s --> %(eventtype)s" % {'eventtype' : evt_type } title = "%(eventtype)s --> %(eventtype)s" % {'eventtype' : evt_type}
eventdetail += Html("h3", title, inline = True) eventdetail += Html("h3", title, inline = True)
# begin eventdetail table # begin eventdetail table
@ -3352,9 +3385,10 @@ class EventPage(BasePage):
tbody = Html("tbody") tbody = Html("tbody")
table += tbody table += tbody
evt_gid = event.get_gramps_id()
if not self.noid and evt_gid: if not self.noid and evt_gid:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", GRAMPSID, class_ = "ColumnAttribute", inline = True), Html("td", _("Gramps ID"), class_ = "ColumnAttribute", inline = True),
Html("td", evt_gid, class_ = "ColumnGRAMPSID", inline = True) Html("td", evt_gid, class_ = "ColumnGRAMPSID", inline = True)
) )
tbody += trow tbody += trow
@ -3407,6 +3441,12 @@ class EventPage(BasePage):
if srcrefs is not None: if srcrefs is not None:
eventdetail += srcrefs eventdetail += srcrefs
# display additional images as gallery
if self.create_media:
addgallery = self.display_additional_images_as_gallery(event_media_list, event)
if addgallery:
eventdetail += addgallery
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section
footer = self.write_footer() footer = self.write_footer()