From a4f28f1a1685479f1a6c1a42fc51f80b9768df31 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Tue, 6 Mar 2007 04:30:22 +0000
Subject: [PATCH] src/plugins/NarrativeWeb.py: Fix 0000954: e-mail address
 causes Narrative Web plugin to generate bad links

svn: r8274
---
 ChangeLog                   | 4 ++++
 src/plugins/NarrativeWeb.py | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c344acfad..b846f4782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-05  Brian Matherly  <brian@gramps-project.org>
+	* src/plugins/NarrativeWeb.py: Fix 0000954: e-mail address causes Narrative
+	  Web plugin to generate bad links
+
 2007-03-05  Don Allingham  <don@gramps-project.org>
 	* src/ViewManager.py: support for close button on filter sidebar
 	* src/DisplayModels/_BaseModel.py: support for marker coloring
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index fe32157f3..5c9d59130 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -459,7 +459,14 @@ class BasePage:
             if not descr:
                 descr = uri
             of.write('<tr><td class="field">%d.</td>' % index)
-            of.write('<td class="data"><a href="%s">%s</a>' % (uri,descr))
+            if url.get_type() == RelLib.UrlType.EMAIL and not uri.startswith("mailto:"):
+                of.write('<td class="data"><a href="mailto:%s">%s</a>' % (uri,descr))
+            elif url.get_type() == RelLib.UrlType.WEB_HOME and not uri.startswith("http://"):
+                of.write('<td class="data"><a href="http://%s">%s</a>' % (uri,descr))
+            elif url.get_type() == RelLib.UrlType.WEB_FTP and not uri.startswith("ftp://"):
+                of.write('<td class="data"><a href="ftp://%s">%s</a>' % (uri,descr))
+            else:
+                of.write('<td class="data"><a href="%s">%s</a>' % (uri,descr))
             of.write('</td></tr>\n')
             index = index + 1
         of.write('</table>\n')