From cc2a9b39fb95e041d1ca3e1ca2fc3f1c4893b2d4 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 18 Apr 2010 11:03:46 +0000 Subject: [PATCH] 3863: Narrative Web report : role not displayed when not primary; moved associations above sources to include assoc sources svn: r15208 --- src/plugins/webreport/NarrativeWeb.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index b8b56f3bf..cc512c9f2 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -485,6 +485,9 @@ class BasePage(object): # get event type and hyperlink to it or not? etype = str(evt.type) + if (not evt_ref.get_role().is_primary() and + not evt_ref.get_role().is_family()): + etype += " (%s)" % evt_ref.get_role() evt_hyper = self.event_link(etype, evt_ref.ref, evt.gramps_id, subdirs) if hyp else etype trow += Html("td", evt_hyper, class_ = "ColumnEvent") @@ -3713,16 +3716,16 @@ class IndividualPage(BasePage): if sect10 is not None: individualdetail += sect10 - # display sources - sect11 = self.display_ind_sources(self.person) - if sect11 is not None: - individualdetail += sect11 - # display associations assocs = self.person.get_person_ref_list() if assocs: individualdetail += self.display_ind_associations(assocs) + # display sources + sect11 = self.display_ind_sources(self.person) + if sect11 is not None: + individualdetail += sect11 + # display pedigree sect13 = self.display_ind_pedigree() if sect13 is not None: