From 74133275e9112fb954103007814f8b883ad524c1 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Wed, 7 Dec 2005 05:09:24 +0000
Subject: [PATCH] * src/plugins/NavWebPage.py (display_note_object,
 ContactPage.__init__, display_spouse): Do not treat linebreaks in the
 preformatted notes; (IndividualPage.__init__): restrict notes, url list, and
 source on living people.

svn: r5493
---
 gramps2/ChangeLog                 |  4 ++++
 gramps2/src/plugins/NavWebPage.py | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 94368a2c7..24c734a5e 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,6 +1,10 @@
 2005-12-06  Alex Roitman  <shura@gramps-project.org>
 	* src/gramps.glade (date_edit): Allow negative year integers.
 	* src/po/nl.po: Correct %s mismatches.
+	* src/plugins/NavWebPage.py (display_note_object,
+	ContactPage.__init__, display_spouse): Do not treat linebreaks in
+	the preformatted notes; (IndividualPage.__init__): restrict notes,
+	url list, and source on living people.
 
 2005-12-06  Jérôme Rapinat  <romjerome@yahoo.fr>
 	* src/po/fr.po: Partial translation update.
diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py
index c1a9eba4c..602eedc29 100644
--- a/gramps2/src/plugins/NavWebPage.py
+++ b/gramps2/src/plugins/NavWebPage.py
@@ -399,7 +399,7 @@ class BasePage:
             of.write('<div id="narrative">\n')
             of.write('<h4>%s</h4>\n' % _('Narrative'))
             if format:
-                text = u"<pre>" + u"<br />".join(text.split("\n"))+u"</pre>"
+                text = u"<pre>%s</pre>" % text
             else:
                 text = u"</p><p>".join(text.split("\n"))
             of.write('<p>%s</p>\n' % text)
@@ -1308,7 +1308,7 @@ class ContactPage(BasePage):
                 text = nobj.get()
     
                 if format:
-                    text = u"<pre>" + u"<br />".join(text.split("\n"))+u"</pre>"
+                    text = u"<pre>%s</pre>" % text
                 else:
                     text = u"</p><p>".join(text.split("\n"))
                 of.write('<p>%s</p>\n' % text)
@@ -1371,9 +1371,9 @@ class IndividualPage(BasePage):
 
             self.display_additional_images_as_gallery(of, db, media_list)
             
-        self.display_note_object(of, self.person.get_note_object())
-        self.display_url_list(of, self.person.get_url_list())
-        self.display_ind_sources(of)
+            self.display_note_object(of, self.person.get_note_object())
+            self.display_url_list(of, self.person.get_url_list())
+            self.display_ind_sources(of)
         self.display_ind_pedigree(of)
         if self.usegraph:
             self.display_tree(of)
@@ -1877,8 +1877,9 @@ class IndividualPage(BasePage):
             format = nobj.get_format()
             text = nobj.get()
             if format:
-                of.write( u"<pre>" + u"<br />".join(text.split("\n"))+u"</pre>")
-            else:                of.write( u"</p><p>".join(text.split("\n")))
+                of.write( u"<pre>%s</pre>" % text
+            else:
+                of.write( u"</p><p>".join(text.split("\n")))
             of.write('</td>\n</tr>\n')
             
     def pedigree_person(self,of,person,is_spouse=False):