diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index e410bbb5a..8aa4c46ae 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -5853,13 +5853,14 @@ class NavWebReport(Report): # copy Ancestor Tree graphics if needed??? if self.ancestortree: - imgs += CSS["Gender Images"]["images"] + imgs += CSS["ancestortree"]["images"] # Anything css-specific: imgs += CSS[self.css]["images"] # copy all to images subdir: for from_path in imgs: + print(from_path) fdir, fname = os.path.split(from_path) self.copy_file(from_path, fname, "images") diff --git a/src/plugins/webstuff/webstuff.py b/src/plugins/webstuff/webstuff.py index 87c8731e1..9097c6b66 100644 --- a/src/plugins/webstuff/webstuff.py +++ b/src/plugins/webstuff/webstuff.py @@ -94,7 +94,9 @@ def load_on_reg(dbstate, uistate, plugin): # ancestor tree style sheet ["ancestortree", 0, "ancestortree", - os.path.join(dir, "css", "ancestortree.css"), None, [], []], + os.path.join(dir, "css", "ancestortree.css"), None, + [os.path.join(dir, "images", "Web_Gender_Female.png"), + os.path.join(dir, "images", "Web_Gender_Male.png")], []], # media reference regions style sheet ["behaviour", 0, "Behaviour", @@ -138,11 +140,6 @@ def load_on_reg(dbstate, uistate, plugin): os.path.join(dir, "js", "mapstraction", "mxn.js"), os.path.join(dir, "js", "mapstraction", "mxn.openlayers.core.js")]], - # gender symbol images for use in NarrativeWeb's Ancestor Tree - ['Gender Images', 0, 'Gender Images', None, None, - [os.path.join(dir, "images", "Web_Gender_Female.png"), - os.path.join(dir, "images", "Web_Gender_Male.png")], []], - # all other images for use in NarrativeWeb ['All Images', 0, 'All Images', None, None, [ os.path.join(dir, "images", "favicon2.ico"),