From e3cc1f6d7175a9d4d30e9a2cd18fe4d268eda42f Mon Sep 17 00:00:00 2001
From: Kees Bakker <kees.bakker@xs4all.nl>
Date: Sat, 14 Mar 2009 15:48:05 +0000
Subject: [PATCH] Partly fixed bug 2788. (Just stylesheet hrefs.)

svn: r12344
---
 src/plugins/webreport/NarrativeWeb.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 9fa2cc33a..27b1e1731 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -367,8 +367,7 @@ class BasePage:
                     'person' : self.author,
                     'year' : year}
         elif 0 < copy_nr < len(_CC):
-            fname = os.path.join("images", "somerights20.gif")
-            fname = self.report.build_url_fname(fname, None, self.up)
+            fname = self.report.build_url_fname("somerights20.gif", "images", self.up)
             text = _CC[copy_nr] % {'gif_fname' : fname}
         of.write('\t<p id="copyright">%s</p>\n' % text)
 
@@ -400,20 +399,17 @@ class BasePage:
         of.write('\t<meta name="author" content="%s" />\n' % self.author)
 
         # Link to media reference regions behaviour stylesheet
-        fname = os.path.join("styles", "behaviour.css")
-        url = self.report.build_url_fname(fname, None, self.up)
+        url = self.report.build_url_fname("behaviour.css", "styles", self.up)
         of.write('\t<link href="%s" rel="stylesheet" \n'
             '\t\ttype="text/css" media="screen" />\n' % url)
 
         # Link to screen stylesheet
-        fname = os.path.join("styles", _NARRATIVESCREEN)
-        url = self.report.build_url_fname(fname, None, self.up)
+        url = self.report.build_url_fname(_NARRATIVESCREEN, "styles", self.up)
         of.write('\t<link href="%s" rel="stylesheet" \n'
             '\t\ttype="text/css" media="screen" />\n' % url)
 
         # Link to printer stylesheet
-        fname = os.path.join("styles", _NARRATIVEPRINT)
-        url = self.report.build_url_fname(fname, None, self.up)
+        url = self.report.build_url_fname(_NARRATIVEPRINT, "styles", self.up)
         of.write('\t<link href="%s" rel="stylesheet" \n'
             '\t\ttype="text/css" media="print" />\n' % url)