From ea9b663908bc995bb4d827db897d09d9ee924139 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Thu, 5 Apr 2007 12:13:33 +0000
Subject: [PATCH] 0000996: Individual attributes do no include source reference
 citations in Narrative Web report.

svn: r8356
---
 ChangeLog                   |  4 ++++
 src/plugins/NarrativeWeb.py | 44 +++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 32e8c7ea9..827bb2537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-05  Brian Matherly  <brian@gramps-project.org>
+	* src/plugins/NarrativeWeb.py: 0000996: Individual attributes do no include
+	  source reference citations in Narrative Web report.
+
 2007-04-04  Brian Matherly  <brian@gramps-project.org>
 	* src/plugins/Checkpoint.py: 0000993: Checkpoint tool crashes in Windows
 
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index 0963198a7..fc32af195 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -475,20 +475,6 @@ class BasePage:
         of.write('</table>\n')
         of.write('</div>\n')
 
-    def display_attr_list(self,of,attrlist=None):
-        if not attrlist:
-            return
-        of.write('<div id="attributes">\n')
-        of.write('<h4>%s</h4>\n' % _('Attributes'))
-        of.write('<table class="infolist">\n')
-
-        for attr in attrlist:
-            atType = str( attr.get_type() )
-            of.write('<tr><td class="field">%s</td>' % atType)
-            of.write('<td class="data">%s</td></tr>\n' % attr.get_value())
-        of.write('</table>\n')
-        of.write('</div>\n')
-
     def display_references(self,of,db,handlelist):
         if not handlelist:
             return
@@ -939,6 +925,20 @@ class MediaPage(BasePage):
         self.display_footer(of,db)
         self.close_file(of)
 
+    def display_attr_list(self,of,attrlist=None):
+        if not attrlist:
+            return
+        of.write('<div id="attributes">\n')
+        of.write('<h4>%s</h4>\n' % _('Attributes'))
+        of.write('<table class="infolist">\n')
+
+        for attr in attrlist:
+            atType = str( attr.get_type() )
+            of.write('<tr><td class="field">%s</td>' % atType)
+            of.write('<td class="data">%s</td></tr>\n' % attr.get_value())
+        of.write('</table>\n')
+        of.write('</div>\n')
+
     def copy_source_file(self,handle,photo):
         ext = os.path.splitext(photo.get_path())[1]
         to_dir = self.build_path(handle,'images')
@@ -1471,6 +1471,22 @@ class IndividualPage(BasePage):
         self.display_footer(of,db)
         self.close_file(of)
 
+    def display_attr_list(self,of,attrlist=None):
+        if not attrlist:
+            return
+        of.write('<div id="attributes">\n')
+        of.write('<h4>%s</h4>\n' % _('Attributes'))
+        of.write('<table class="infolist">\n')
+
+        for attr in attrlist:
+            atType = str( attr.get_type() )
+            of.write('<tr><td class="field">%s</td>' % atType)
+            value = attr.get_value()
+            value += self.get_citation_links( attr.get_source_references() )
+            of.write('<td class="data">%s</td></tr>\n' % value)
+        of.write('</table>\n')
+        of.write('</div>\n')
+
     def draw_box(self,of,center,col,person):
         top = center - HEIGHT/2
         xoff = XOFFSET+col*(WIDTH+HGAP)