Bug#4696; Wrong parent path with 'Creative Commons' on Web Calendar report has been fixed ...

svn: r16778
This commit is contained in:
Rob G. Healey 2011-03-07 20:42:00 +00:00
parent ed32530f57
commit f6b9e2884d
2 changed files with 13 additions and 9 deletions

View File

@ -338,19 +338,19 @@ class WebCalReport(Report):
fname = CSS["Print-Default"]["filename"]
self.copy_file(fname, _CALENDARPRINT, "styles")
# set imgs to empty
imgs = []
# Mainz stylesheet graphics
# will only be used if Mainz is slected as the stylesheet
imgs += CSS[self.css]["images"]
# Copy GRAMPS favicon
imgs += CSS["All Images"]['images']
# copy copyright image
# the proper way would be to call "filename", but it is NOT working...
if 0 < self.copy <= len(_CC):
imgs += CSS["Copyright"]['images']
imgs += CSS["Copyright"]["images"]
# copy Gramps favicon #2
imgs += CSS["favicon2"]["images"]
for from_path in imgs:
fdir, fname = os.path.split(from_path)

View File

@ -142,12 +142,16 @@ def load_on_reg(dbstate, uistate, plugin):
# all other images for use in NarrativeWeb
['All Images', 0, 'All Images', None, None,
[ os.path.join(dir, "images", "favicon2.ico"),
os.path.join(dir, "images", "blank.gif"),
os.path.join(dir, "images", "document.png")], []],
[os.path.join(dir, "images", "blank.gif"),
os.path.join(dir, "images", "document.png")], []],
# Gramps Fav icon #2
["favicon2", 0, "favicon2", [], None,
[os.path.join(dir, "images", "favicon2.ico")], []],
# copyright image
['Copyright', 0, 'Copyright', os.path.join(dir, "images", "somerights20.gif"), None, [], []],
['Copyright', 0, 'Copyright', [], None,
[os.path.join(dir, "images", "somerights20.gif")], []],
# document image in case the media object is not an image
['Document', 0, 'Document', os.path.join(dir, "images", "document.png"), None, [], []],