diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index e173210bf..752eb1882 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -340,7 +340,7 @@ class BasePage(object): attr_data_row.append(("Sources", srcrefs)) # get attribute note list - notelist = self.dump_notes(attr.get_note_list() ) or " " + notelist = self.dump_notes(attr.get_note_list() ) attr_data_row.append(("Notes", notelist)) # display attribute list @@ -446,14 +446,14 @@ class BasePage(object): """ if not notelist: - return " " + return Html("p") db = self.report.database # begin unordered list ul = Html("p") for notehandle in notelist: ul.extend( - Html("p", str(db.get_note_from_handle(notehandle).type)) + Html("i", str(db.get_note_from_handle(notehandle).type)) ) ul.extend( self.get_note_format(db.get_note_from_handle(notehandle)) @@ -506,11 +506,26 @@ class BasePage(object): notelist = evt.get_note_list() notelist.extend( evt_ref.get_note_list() ) if notelist: - notelist = self.dump_notes( notelist ) or " " + htmllist = self.dump_notes( notelist ) else: - notelist = " " + htmllist = Html("p") + + # if the event or event reference has a attributes attached to it, + # get the text and format it correctly + attrlist = evt.get_attribute_list() + attrlist.extend(evt_ref.get_attribute_list()) + for attr in attrlist: + htmllist.extend ( Html ( + "p", + _("%(type)s: %(value)s") % { + 'type' : Html("b", attr.get_type()), + 'value' : attr.get_value() } )) + #also output notes attached to the attributes + notelist = attr.get_note_list() + if notelist: + htmllist.extend (self.dump_notes( notelist )) - trow += Html("td", notelist, class_ = "ColumnNotes") + trow += Html("td", htmllist, class_ = "ColumnNotes") # get event source references srcrefs = self.get_citation_links( evt.get_source_references() ) or " "