From a57257415ca38fdaed90ed93e400c706db2b3dd9 Mon Sep 17 00:00:00 2001 From: SNoiraud Date: Sat, 5 Dec 2015 11:35:46 +0100 Subject: [PATCH] 8048 : Narrative web report: add author to citations --- gramps/plugins/webreport/narrativeweb.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index 5516555d2..3846a1bbe 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -2355,8 +2355,13 @@ class BasePage(object): # Add this source and its references to the page source = self.dbase_.get_source_from_handle(citation.get_source_handle()) if source is not None: - list = Html("li", self.source_link(source.get_handle(), source.get_title(), - source.get_gramps_id(), cindex, uplink = self.up)) + if source.get_author(): + authorstring = source.get_author() + ": " + else: + authorstring = "" + list = Html("li", self.source_link(source.get_handle(), + authorstring + source.get_title(), + source.get_gramps_id(), cindex, uplink = self.up)) else: list = Html("li", "None") @@ -4234,7 +4239,7 @@ class SourcePages(BasePage): for handle in source_handles: source = self.db.get_source_from_handle(handle) if source is not None: - key = source.get_title() + str(source.get_gramps_id()) + key = source.get_title() + source.get_author() + str(source.get_gramps_id()) source_dict[key] = (source, handle) keys = sorted(source_dict, key=SORT_KEY) @@ -4256,6 +4261,7 @@ class SourcePages(BasePage): header_row = [ (_("Number"), "ColumnRowLabel"), + (_("Author"), "ColumnAuthor"), (_("Source Name|Name"), "ColumnName") ] trow.extend( @@ -4273,6 +4279,9 @@ class SourcePages(BasePage): Html("td", index + 1, class_ ="ColumnRowLabel", inline = True) ) tbody += trow + trow.extend( + Html("td", source.get_author(), class_ ="ColumnAuthor", inline = True) + ) trow.extend( Html("td", self.source_link(source_handle, source.get_title(), source.get_gramps_id()), class_ ="ColumnName")