From 2e90dd01a296e9737d42d743e089c679409b454e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Charette?= <stephanecharette@gmail.com>
Date: Sat, 17 Nov 2007 06:06:43 +0000
Subject: [PATCH] issue 1381, Confidence:Normal

svn: r9363
---
 ChangeLog                   |  6 +++++-
 src/plugins/NarrativeWeb.py | 16 +++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 666fe0d84..d06353c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
+2007-11-16  Stéphane Charette <stephanecharette@gmail.com>
+	* src/plugins/NarrativeWeb.py: issue #1381, no need to print
+	"Confidence" on every reference line if it is "Normal"
+
 2007-11-16  Jerome Rapinat <romjerome@yahoo.fr>
 	* src/plugins/rel_pt.py: import gen.lib
 
 2007-11-16 Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	Trying to fix unicode filename handling on Windows. Patch ported from 2.2.
-	* src/Utils.py: add get_unicode_path()
+ 	* src/Utils.py: add get_unicode_path()
 	* src/ArgHandler.py: use Utils.get_unicode_path()
 	* src/AddMedia.py: use Utils.get_unicode_path()
 	* src/DbLoader.py: use Utils.get_unicode_path()
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index d5bb85d6c..ca6cdfcbe 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -543,14 +543,11 @@ class BasePage:
             of.write('</td></tr>\n')
 
             for key,sref in citation.get_ref_list():
-                of.write('\t<tr><td></td>')
-                of.write('<td class="field">')
-                of.write('<a name="sref%d%s">' % (cindex,key))
-                of.write('</a>%d%s.</td>' % (cindex,key))
-                of.write('<td>')
 
                 tmp = []
                 confidence = Utils.confidence.get(sref.confidence, _('Unknown'))
+                if confidence == _('Normal'):
+                    confidence = None
                 for (label,data) in [(_('Date'),_dd.display(sref.date)),
                                      (_('Page'),sref.page),
                                      (_('Confidence'),confidence)]:
@@ -561,9 +558,14 @@ class BasePage:
                     note = self.db.get_note_from_handle(notehandle)
                     tmp.append("%s: %s" % (_('Text'),note.get(True)))
                 if len(tmp) > 0:
+                    of.write('\t<tr><td></td>')
+                    of.write('<td class="field">')
+                    of.write('<a name="sref%d%s">' % (cindex,key))
+                    of.write('</a>%d%s.</td>' % (cindex,key))
+                    of.write('<td>')
                     of.write('<br />'.join(tmp))
-                of.write('<p/>')
-                of.write('</td></tr>\n')
+                    of.write('<p/>')
+                    of.write('</td></tr>\n')
         of.write('</table>\n')
         of.write('</div>\n')