From 91ca1981ac53510b362a1910456064527d663d35 Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Mon, 7 Mar 2011 22:34:38 +0000
Subject: [PATCH] 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.

svn: r16779
---
 src/plugins/webreport/NarrativeWeb.py |  6 ++++--
 src/plugins/webreport/WebCal.py       |  4 ++--
 src/plugins/webstuff/webstuff.py      | 12 ++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 3807ceb11..333ac3758 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -5846,8 +5846,10 @@ class NavWebReport(Report):
         if 0 < self.copyright <= len(_CC):
             imgs += [CSS["Copyright"]["filename"]]
 
-        # include GRAMPS favicon
-        # we need the blank image gif neede by behaviour.css
+        # copy Gramps favorite icon #2
+        imgs += [CSS["favicon2"]["filename"]]
+
+        # we need the blank image gif needed by behaviour.css
         # add the document.png file for media other than photos
         imgs += CSS["All Images"]["images"]
 
diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py
index 82cfb488e..655f665b9 100644
--- a/src/plugins/webreport/WebCal.py
+++ b/src/plugins/webreport/WebCal.py
@@ -347,10 +347,10 @@ class WebCalReport(Report):
         # 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"]["filename"]]
 
         # copy Gramps favicon #2
-        imgs += CSS["favicon2"]["images"]
+        imgs += [CSS["favicon2"]["filename"]]
 
         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 cf6b2d5cf..38a91cb8f 100644
--- a/src/plugins/webstuff/webstuff.py
+++ b/src/plugins/webstuff/webstuff.py
@@ -92,7 +92,7 @@ def load_on_reg(dbstate, uistate, plugin):
         # no style sheet option
         ["No style sheet",1, _("No style sheet"),    [],    None, [], []],
 
-        # ancestor tree style sheet
+        # ancestor tree style sheet and its images
         ["ancestortree",  0, "ancestortree",
          os.path.join(dir, "css", "ancestortree.css"), None,
          [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
         ["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",  0, "mapstraction",
@@ -146,12 +146,12 @@ def load_on_reg(dbstate, uistate, plugin):
           os.path.join(dir, "images", "document.png")], []],
 
         # Gramps Fav icon #2
-        ["favicon2", 0, "favicon2", [], None,
-         [os.path.join(dir, "images", "favicon2.ico")],                           []], 
+        ["favicon2", 0, "favicon2", 
+         os.path.join(dir, "images", "favicon2.ico"), None, [],                   []],
 
         # copyright image
-        ['Copyright', 0, 'Copyright', [], None,
-         [os.path.join(dir, "images", "somerights20.gif")],                       []],
+        ['Copyright', 0, 'Copyright',
+         os.path.join(dir, "images", "somerights20.gif"), None, [],               []],
 
         # document image in case the media object is not an image
         ['Document', 0, 'Document', os.path.join(dir, "images", "document.png"), None, [], []],