Fixed the way the ancestortree gender graphics are handled.

svn: r16770
This commit is contained in:
Rob G. Healey 2011-03-07 04:20:56 +00:00
parent 2c72c7a5d8
commit 1cba394366
2 changed files with 5 additions and 7 deletions

View File

@ -5853,13 +5853,14 @@ class NavWebReport(Report):
# copy Ancestor Tree graphics if needed??? # copy Ancestor Tree graphics if needed???
if self.ancestortree: if self.ancestortree:
imgs += CSS["Gender Images"]["images"] imgs += CSS["ancestortree"]["images"]
# Anything css-specific: # Anything css-specific:
imgs += CSS[self.css]["images"] imgs += CSS[self.css]["images"]
# copy all to images subdir: # copy all to images subdir:
for from_path in imgs: for from_path in imgs:
print(from_path)
fdir, fname = os.path.split(from_path) fdir, fname = os.path.split(from_path)
self.copy_file(from_path, fname, "images") self.copy_file(from_path, fname, "images")

View File

@ -94,7 +94,9 @@ def load_on_reg(dbstate, uistate, plugin):
# ancestor tree style sheet # ancestor tree style sheet
["ancestortree", 0, "ancestortree", ["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 # media reference regions style sheet
["behaviour", 0, "Behaviour", ["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.js"),
os.path.join(dir, "js", "mapstraction", "mxn.openlayers.core.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 other images for use in NarrativeWeb
['All Images', 0, 'All Images', None, None, ['All Images', 0, 'All Images', None, None,
[ os.path.join(dir, "images", "favicon2.ico"), [ os.path.join(dir, "images", "favicon2.ico"),