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

Fixed missing person in class EventListPage. Hyperlinked the grampsid to the to its EventPage as I didn't have the event type to hyperlink with.

Browse Source 
svn: r13681
This commit is contained in:
Rob G. Healey 2009-11-28 10:07:20 +00:00
parent e8c0ee032d
commit 086c297975
2 changed files with 115 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/data/Web_Visually.css
View File

@ -590,6 +590,9 @@ div#IndividualDetail div.subsection table tr td:first-child {
#Places table.infolist tbody tr td.ColumnLetter { #Places table.infolist tbody tr td.ColumnLetter {
background-color: #D8F3D6; background-color: #D8F3D6;
} }
#Places table.infolist tbody tr td.ColumnLetter a:hover {
background: none;
}
#Places table.infolist tbody tr td.ColumnName { #Places table.infolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
@ -658,21 +661,28 @@ div#EventList table.alphaevent tbody tr td {
background-color: #D8F3D6; background-color: #D8F3D6;
border-bottom: dashed 1px #5D835F; border-bottom: dashed 1px #5D835F;
} }
div#EventList table.alphaevent tbody tr td:hover {
background: none;
}
div#EventList table.alphaevent tbody tr td.ColumnType { div#EventList table.alphaevent tbody tr td.ColumnType {
width: 15%; width: 15%;
} }
div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
background: none;
}
div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID { div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
width: 15%; background-color: #FFF;
width: 12%;
} }
div#EventList table.alphaevent tbody tr td.ColumnDate { div#EventList table.alphaevent tbody tr td.ColumnDate {
width: 15%; width: 20%;
} }
div#EventList table.alphaevent tbody tr td.ColumnPerson { div#EventList table.alphaevent tbody tr td.ColumnPerson {
background-color: #FFF; width: 60%;
width: 50%; }
div#EventList table.alphaevent tbody tr td.ColumnPerson span.father,
div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
display:block;
}
div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
content:"+ ";
} }
div#EventDetail h3 { div#EventDetail h3 {
font-size: xxx-large; font-size: xxx-large;

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

@ -484,7 +484,6 @@ class BasePage(object):
url = self.report.build_url_fname_html(handle, "evt", up) url = self.report.build_url_fname_html(handle, "evt", up)
# if event pages are being created, then hyperlink the event type # if event pages are being created, then hyperlink the event type
if self.inc_events: if self.inc_events:
evt_hyper = Html("a", eventtype, href = url, title = eventtype) evt_hyper = Html("a", eventtype, href = url, title = eventtype)
@ -1292,8 +1291,18 @@ class BasePage(object):
# return web links to its caller # return web links to its caller
return section return section
# Only used in IndividualPage.display_ind_sources def display_ind_sources(self, srcobj):
# and MediaPage.display_media_sources """
will create the "Source References" section for an object
"""
map(self.bibli.add_reference, srcobj.get_source_references())
sourcerefs = self.display_source_refs(self.bibli)
# return to its callers
return sourcerefs
# Only used in IndividualPage.display_ind_sources(), and MediaPage.display_media_sources()
def display_source_refs(self, bibli): def display_source_refs(self, bibli):
if bibli.get_citation_count() == 0: if bibli.get_citation_count() == 0:
return None return None
@ -2152,7 +2161,6 @@ class EventListPage(BasePage):
first_event = True first_event = True
for (gid, date, event_handle) in datalist: for (gid, date, event_handle) in datalist:
event = db.get_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
trow = Html("tr") trow = Html("tr")
@ -2163,17 +2171,15 @@ class EventListPage(BasePage):
trow += tcell trow += tcell
if first_event: if first_event:
trow.attr = 'class = "BeginEvent"' trow.attr = 'class = "BeginEvent"'
tcell += Html("a", evt_type, name = "%s" % evt_type, inline = True) tcell += Html("a", evt_type, name = "%s" % evt_type,
title = _("Event types beginning with %s" % evt_type), inline = True)
else: else:
tcell += " " tcell += " "
# GRAMPS ID # GRAMPS ID
tcell = Html("td", class_ = "ColumnGRAMPSID", inline = True) trow += ( Html("td", class_ = "ColumnGRAMPSID") +
trow += tcell self.event_grampsid_link(event_handle, gid, None)
if not self.noid and gid: )
tcell += gid
else:
tcell += " "
# event date # event date
tcell = Html("td", class_ = "ColumnDate", inline = True) tcell = Html("td", class_ = "ColumnDate", inline = True)
@ -2183,33 +2189,55 @@ class EventListPage(BasePage):
else: else:
tcell += " " tcell += " "
# Person # Person
if evt_type in ["Divorce", "Marriage"]: if evt_type in ["Divorce", "Marriage"]:
handle_list = db.find_backlink_handles(event_handle, handle_list = db.find_backlink_handles(event_handle,
include_classes = ['Person', 'Family']) include_classes = ['Person', 'Family'])
else: else:
handle_list = db.find_backlink_handles(event_handle, include_classes=['Person']) handle_list = db.find_backlink_handles(event_handle, include_classes=['Person'])
tcell = Html("td", class_ = "ColumnPerson")
trow += tcell
if handle_list:
first_person = True first_person = True
tcell = Html("td", class_ = "ColumnPerson") # clasname can be either Person or Family
trow += tcell for (classname, handle) in handle_list:
for handle in handle_list: if classname == "Person":
person = db.get_person_from_handle(handle)
if person:
person_name = self.get_name(person)
person = db.get_person_from_handle(handle) if not first_person:
if person: tcell += ", "
person_name = self.get_name(person)
if not first_person:
tcell += ", "
if handle in ind_list:
url = self.report.build_url_fname_html(handle, "ppl", True)
tcell += self.person_link(url, person, True)
else:
tcell += person_name tcell += person_name
else: else:
tcell += " " family = db.get_family_from_handle(handle)
first_person = False if family:
# husband and spouse in this example, are called father and mother
husband_handle = family.get_father_handle()
spouse_handle = family.get_mother_handle()
husband = db.get_person_from_handle(husband_handle)
spouse = db.get_person_from_handle(spouse_handle)
if husband:
husband_name = self.get_name(husband)
if spouse:
spouse_name = self.get_name(spouse)
if spouse and husband:
tcell += ( Html("span", husband_name, class_ = "father fatherNmother") +
Html("span", spouse_name, class_ = "mother")
)
elif spouse:
tcell += Html("span", spouse_name, class_ = "mother")
elif husband:
tcell += Html("span", husband_name, class_ = "father")
first_person = False
else:
tcell += " "
first_event = False first_event = False
# add clearline for proper styling # add clearline for proper styling
@ -2221,6 +2249,16 @@ class EventListPage(BasePage):
# and close the file # and close the file
self.XHTMLWriter(eventslistpage, of) self.XHTMLWriter(eventslistpage, of)
def event_grampsid_link(self, handle, grampsid, up):
"""
create a hyperlink from event handle, but show grampsid
"""
url = self.report.build_url_fname_html(handle, "evt", up)
# return hyperlink to its caller
return Html("a", grampsid, href = url, alt = grampsid)
class EventPage(BasePage): class EventPage(BasePage):
def __init__(self, report, title, person, partner, evt_type, event, evt_ref): def __init__(self, report, title, person, partner, evt_type, event, evt_ref):
@ -2298,14 +2336,23 @@ class EventPage(BasePage):
# Narrative subsection # Narrative subsection
if shownote: if shownote:
notelist = event_data[(len(event_data) - 1)][2] notelist = self.display_note_list( event_data[(len(event_data) - 1)][2] )
eventdetail += self.display_note_list(notelist) if notelist is not None:
eventdetail += notelist
# get attribute list # get attribute list
attrlist = event.get_attribute_list() attrlist = event.get_attribute_list()
attrlist.extend(evt_ref.get_attribute_list() ) attrlist.extend(evt_ref.get_attribute_list() )
if attrlist: attrlist = self.display_attr_list(attrlist, False)
eventdetail += self.display_attr_list(attrlist, False) if attrlist is not None:
eventdetail += attrlist
# get event source references
srcrefs = event.get_source_references()
self.bibli = Bibliography()
srcrefs = self.display_ind_sources(event)
if srcrefs is not None:
eventdetail += srcrefs
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section
@ -2477,7 +2524,8 @@ class MediaPage(BasePage):
if initial_image_path != newpath: if initial_image_path != newpath:
scalemsg = Html("p", "(%d x %d)" % (width, height), inline = True) scalemsg = Html("p", "(%d x %d)" % (width, height), inline = True)
summaryarea += scalemsg summaryarea += scalemsg
with Html("div", style = 'width: %dpx; height: %dpx' % (new_width, new_height)) as mediadisplay: with Html("div", style = 'width: %dpx; height: %dpx' % (new_width,
new_height)) as mediadisplay:
summaryarea += mediadisplay summaryarea += mediadisplay
# Feature #2634; display the mouse-selectable regions. # Feature #2634; display the mouse-selectable regions.
@ -2647,7 +2695,7 @@ class MediaPage(BasePage):
map(self.bibli.add_reference, photo.get_source_references()) map(self.bibli.add_reference, photo.get_source_references())
sourcerefs = self.display_source_refs(self.bibli) sourcerefs = self.display_source_refs(self.bibli)
# return source references to its callers # return source references to its caller
return sourcerefs return sourcerefs
def copy_source_file(self, handle, photo): def copy_source_file(self, handle, photo):
@ -3415,7 +3463,7 @@ class IndividualPage(BasePage):
individualdetail += sect10 individualdetail += sect10
# display sources # display sources
sect11 = self.display_ind_sources() sect11 = self.display_ind_sources(self.person)
if sect11 is not None: if sect11 is not None:
individualdetail += sect11 individualdetail += sect11
@ -3578,17 +3626,6 @@ class IndividualPage(BasePage):
new_center, m_center, m_handle) new_center, m_center, m_handle)
return tree return tree
def display_ind_sources(self):
"""
will create the "Source References" section for a person
"""
map(self.bibli.add_reference, self.person.get_source_references())
sourcerefs = self.display_source_refs(self.bibli)
# return to its callers
return sourcerefs
def display_ind_associations(self, assoclist): def display_ind_associations(self, assoclist):
""" """
display an individual's associations display an individual's associations
@ -5281,14 +5318,15 @@ class NavWebReport(Report):
self.progress.set_pass(_("Creating event pages"), len(event_dict)) self.progress.set_pass(_("Creating event pages"), len(event_dict))
for (person, event_list) in event_dict: for (person, event_list) in event_dict:
self.progress.step()
for (evt_type, sort_date, sort_name, event, evt_ref, partner) in event_list: for (evt_type, sort_date, sort_name, event, evt_ref, partner) in event_list:
self.progress.step()
# create individual event page # create individual event page
EventPage(self, self.title, person, partner, evt_type, event, evt_ref) EventPage(self, self.title, person, partner, evt_type, event, evt_ref)
# increment the progress bar
self.progress.step()
def gallery_pages(self, source_list): def gallery_pages(self, source_list):
import gc import gc
@ -5444,14 +5482,21 @@ class NavWebReport(Report):
too many entries. too many entries.
For example, this may return "8/1/aec934857df74d36618" For example, this may return "8/1/aec934857df74d36618"
*** up = None = [./] for use in EventListPage
""" """
subdirs = [] subdirs = []
if subdir: if subdir:
subdirs.append(subdir) subdirs.append(subdir)
subdirs.append(fname[-1].lower()) subdirs.append(fname[-1].lower())
subdirs.append(fname[-2].lower()) subdirs.append(fname[-2].lower())
if up:
if up == True:
subdirs = ['..']*3 + subdirs subdirs = ['..']*3 + subdirs
# added for use in class EventListPage
elif up == None:
subdirs = ['.'] + subdirs
return subdirs return subdirs
def build_path(self, subdir, fname, up = False): def build_path(self, subdir, fname, up = False):