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

Make the narratives notes placement an option

Browse Source 
From 5.1 the narrative notes are placed just after the name, gender and
age at death. This follow the feature request #6772.
Some people want to have this placement an option to have the same
functionality as before

Fixes #11283
This commit is contained in:
SNoiraud 2019-08-25 10:47:50 +02:00 committed by Nick Hall
parent 590a5cf59a
commit e39e59c795
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/plugins/webreport/narrativeweb.py
View File

@ -1797,9 +1797,16 @@ class NavWebOptions(MenuReportOptions):
self.__graphgens.set_help(_("The number of generations to include in " self.__graphgens.set_help(_("The number of generations to include in "
"the ancestor graph")) "the ancestor graph"))
addopt("graphgens", self.__graphgens) addopt("graphgens", self.__graphgens)
self.__graph_changed() self.__graph_changed()
notes = BooleanOption(
_('Include narrative notes just after name, gender'), True)
notes.set_help(
_('Include narrative notes just after name, gender and'
' age at death (default) or include them just before'
' attributes.'))
addopt("notes", notes)
def __add_page_generation_options(self, menu): def __add_page_generation_options(self, menu):
""" """
Options on the "Page Generation" tab. Options on the "Page Generation" tab.

18
gramps/plugins/webreport/person.py
View File

@ -490,11 +490,12 @@ class PersonPages(BasePage):
individualdetail += thumbnail individualdetail += thumbnail
individualdetail += (name, summary) individualdetail += (name, summary)
# display Narrative Notes if self.report.options['notes']:
notelist = person.get_note_list() # display Narrative Notes
sect8 = self.display_note_list(notelist) notelist = person.get_note_list()
if sect8 is not None: sect8 = self.display_note_list(notelist)
individualdetail += sect8 if sect8 is not None:
individualdetail += sect8
# display a person's events # display a person's events
sect2 = self.display_ind_events(place_lat_long) sect2 = self.display_ind_events(place_lat_long)
@ -557,6 +558,13 @@ class PersonPages(BasePage):
if sect7 is not None: if sect7 is not None:
individualdetail += sect7 individualdetail += sect7
if not self.report.options['notes']:
# display Narrative Notes
notelist = person.get_note_list()
sect8 = self.display_note_list(notelist)
if sect8 is not None:
individualdetail += sect8
# display attributes # display attributes
attrlist = person.get_attribute_list() attrlist = person.get_attribute_list()
if attrlist: if attrlist: