From 3c85a65fd37c1bf838d56448d50e7ae4cf94dc98 Mon Sep 17 00:00:00 2001
From: Kees Bakker <kees.bakker@xs4all.nl>
Date: Mon, 10 Nov 2008 21:37:20 +0000
Subject: [PATCH] Small correction of generated HTML.    *
 src/plugins/NarrativeWeb.py

svn: r11284
---
 src/plugins/NarrativeWeb.py | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index 8e0e3b45f..940e0c40e 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -289,35 +289,30 @@ class BasePage:
 
         value = _dp.parse(time.strftime('%b %d %Y'))
         value = _dd.display(value)
-
         msg = _('Generated by <a href="http://gramps-project.org">'
-                'GRAMPS</a> on %(date)s') % { 'date' : value }
-        of.write('\t<p id="createdate" />')
-        of.write(msg)
-        of.write('</p>\n')
+                'GRAMPS</a> on %(date)s') % {'date' : value}
+        of.write('\t<p id="createdate">%s</p>\n' % msg)
 
-        of.write('\t<p id="copyright">')
         copy_nr = self.report.copyright
+        text = ''
         if copy_nr == 0:
             if self.author:
                 year = time.localtime()[0]
-                cright = _('&copy; %(year)d %(person)s') % {
+                text = '&copy; %(year)d %(person)s' % {
                     'person' : self.author,
-                    'year' : year }
-                of.write('%s' % cright)
-        elif 0 < copy_nr < 7:
-            text = _CC[copy_nr]
-            fname = self.report.build_url_fname("somerights20.gif", 
-                                                'images', self.up)
-            text = text % {'gif_fname' : fname}
-            of.write(text)
-        of.write('</p>\n')
+                    '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)
+            text = _CC[copy_nr] % {'gif_fname' : fname}
+        of.write('\t<p id="copyright">%s</p>\n' % text)
 
         of.write('\t<p id="quality"><a href="http://validator.w3.org/check?uri=referer">')
         of.write('<img src="http://www.w3.org/Icons/valid-xhtml10" ')
         of.write('alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a></p>\n')
 
         of.write('\t\t<div class="fullclear"></div>\n')
+
         of.write('</div>\n')
         of.write('</body>\n')
         of.write('</html>')
@@ -2719,7 +2714,7 @@ class NavWebReport(Report):
 
         # Copy the Creative Commons icon if the Creative Commons
         # license is requested
-        if 0 < self.copyright < 7:
+        if 0 < self.copyright < len(_CC):
             imgs += ["somerights20.gif"]
 
         imgs += ["favicon.ico",