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

Previous fix for bug#4696 broke NarrativeWeb. I now have a fix that solves both of them now. The missing images and icon are now there.

Browse Source 
svn: r16779
This commit is contained in:
Rob G. Healey 2011-03-07 22:34:38 +00:00
parent f6b9e2884d
commit 91ca1981ac
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/webreport/NarrativeWeb.py
View File

@ -5846,8 +5846,10 @@ class NavWebReport(Report):
if 0 < self.copyright <= len(_CC): if 0 < self.copyright <= len(_CC):
imgs += [CSS["Copyright"]["filename"]] imgs += [CSS["Copyright"]["filename"]]
# include GRAMPS favicon # copy Gramps favorite icon #2
# we need the blank image gif neede by behaviour.css imgs += [CSS["favicon2"]["filename"]]
# we need the blank image gif needed by behaviour.css
# add the document.png file for media other than photos # add the document.png file for media other than photos
imgs += CSS["All Images"]["images"] imgs += CSS["All Images"]["images"]

4
src/plugins/webreport/WebCal.py
View File

@ -347,10 +347,10 @@ class WebCalReport(Report):
# copy copyright image # copy copyright image
# the proper way would be to call "filename", but it is NOT working... # the proper way would be to call "filename", but it is NOT working...
if 0 < self.copy <= len(_CC): if 0 < self.copy <= len(_CC):
imgs += CSS["Copyright"]["images"] imgs += [CSS["Copyright"]["filename"]]
# copy Gramps favicon #2 # copy Gramps favicon #2
imgs += CSS["favicon2"]["images"] imgs += [CSS["favicon2"]["filename"]]
for from_path in imgs: for from_path in imgs:
fdir, fname = os.path.split(from_path) fdir, fname = os.path.split(from_path)

12
src/plugins/webstuff/webstuff.py
View File

@ -92,7 +92,7 @@ def load_on_reg(dbstate, uistate, plugin):
# no style sheet option # no style sheet option
["No style sheet",1, _("No style sheet"), [], None, [], []], ["No style sheet",1, _("No style sheet"), [], None, [], []],
# ancestor tree style sheet # ancestor tree style sheet and its images
["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_Female.png"),
@ -100,7 +100,7 @@ def load_on_reg(dbstate, uistate, plugin):
# media reference regions style sheet # media reference regions style sheet
["behaviour", 0, "Behaviour", ["behaviour", 0, "Behaviour",
os.path.join(dir, "css", 'behaviour.css'), None, [], []], os.path.join(dir, "css", 'behaviour.css'), None, [], []],
# mapstraction style sheet for NarrativeWeb place maps # mapstraction style sheet for NarrativeWeb place maps
["mapstraction", 0, "mapstraction", ["mapstraction", 0, "mapstraction",
@ -146,12 +146,12 @@ def load_on_reg(dbstate, uistate, plugin):
os.path.join(dir, "images", "document.png")], []], os.path.join(dir, "images", "document.png")], []],
# Gramps Fav icon #2 # Gramps Fav icon #2
["favicon2", 0, "favicon2", [], None, ["favicon2", 0, "favicon2",
[os.path.join(dir, "images", "favicon2.ico")], []], os.path.join(dir, "images", "favicon2.ico"), None, [], []],
# copyright image # copyright image
['Copyright', 0, 'Copyright', [], None, ['Copyright', 0, 'Copyright',
[os.path.join(dir, "images", "somerights20.gif")], []], os.path.join(dir, "images", "somerights20.gif"), None, [], []],
# document image in case the media object is not an image # document image in case the media object is not an image
['Document', 0, 'Document', os.path.join(dir, "images", "document.png"), None, [], []], ['Document', 0, 'Document', os.path.join(dir, "images", "document.png"), None, [], []],