From b42877e41bb0fb2309bafe4773e418d63d867015 Mon Sep 17 00:00:00 2001 From: Zsolt Foldvari Date: Sun, 23 Sep 2007 17:18:47 +0000 Subject: [PATCH] 2007-09-17 Zsolt Foldvari * src/plugins/WebCal.py: * src/plugins/NarrativeWeb.py: Change const.image_dir to uppercase const.IMAGE_DIR svn: r8998 --- ChangeLog | 5 +++++ src/plugins/NarrativeWeb.py | 4 ++-- src/plugins/WebCal.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5486fc843..0074a3b9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-17 Zsolt Foldvari + * src/plugins/WebCal.py: + * src/plugins/NarrativeWeb.py: + Change const.image_dir to uppercase const.IMAGE_DIR + 2007-09-20 Benny Malengier * src/plugins/MarkerReport.py: localize fixed markers, issue #1137 diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 86578e5ad..eb535b5c6 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -2428,11 +2428,11 @@ class WebReport(Report): # Copy the Creative Commons icon if the a Creative Commons # license is requested if 0 < self.copyright < 7: - from_path = os.path.join(const.image_dir,"somerights20.gif") + from_path = os.path.join(const.IMAGE_DIR,"somerights20.gif") to_path = os.path.join("images","somerights20.gif") self.store_file(archive,self.target_path,from_path,to_path) - from_path = os.path.join(const.image_dir,"document.png") + from_path = os.path.join(const.IMAGE_DIR,"document.png") to_path = os.path.join("images","document.png") self.store_file(archive,self.target_path,from_path,to_path) diff --git a/src/plugins/WebCal.py b/src/plugins/WebCal.py index 7ca1a03c1..9baecc2f1 100644 --- a/src/plugins/WebCal.py +++ b/src/plugins/WebCal.py @@ -403,7 +403,7 @@ class WebReport(Report): of.write('alt="Valid XHTML 1.0 Transitional" height="31" width="88" />

\n') if self.copy > 0 and self.copy <= 6: text = _cc[self.copy-1] - from_path = os.path.join(const.image_dir,"somerights20.gif") + from_path = os.path.join(const.IMAGE_DIR,"somerights20.gif") shutil.copyfile(from_path,os.path.join(self.html_dir,"somerights20.gif")) else: text = "© %s %s" % (time.localtime()[0], author)