From f6b9e2884d0cb9f01023e3194eaffa37b8025a05 Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Mon, 7 Mar 2011 20:42:00 +0000
Subject: [PATCH] Bug#4696; Wrong parent path with 'Creative Commons' on Web
 Calendar report has been fixed ...

svn: r16778
---
 src/plugins/webreport/WebCal.py  | 10 +++++-----
 src/plugins/webstuff/webstuff.py | 12 ++++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py
index ac8627034..82cfb488e 100644
--- a/src/plugins/webreport/WebCal.py
+++ b/src/plugins/webreport/WebCal.py
@@ -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)
diff --git a/src/plugins/webstuff/webstuff.py b/src/plugins/webstuff/webstuff.py
index 9097c6b66..cf6b2d5cf 100644
--- a/src/plugins/webstuff/webstuff.py
+++ b/src/plugins/webstuff/webstuff.py
@@ -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, [], []],