diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 1cf56c60b..4ea093277 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -598,7 +598,6 @@ class BasePage(object): lnk = (self.report.cur_fname, self.page_title, self.gid) text = "" - for citation_handle in citation_handle_list: citation = self.report.database.get_citation_from_handle( citation_handle) @@ -616,7 +615,7 @@ class BasePage(object): # the citation reference text index, key = self.bibli.add_reference(citation) id_ = "%d%s" % (index+1, key) - text += ' [%s]' % (id_, id_) + text += ' [%s]' % (id_, id_) # return citation list text to its callers return text @@ -691,7 +690,6 @@ class BasePage(object): @param: notelist -- list of notes """ - if not notelist: return Html("div") @@ -894,7 +892,7 @@ class BasePage(object): omit =EventRoleType.FAMILY) return table - def get_event_data(self, evt, evt_ref, up, gid = None): + def get_event_data(self, evt, evt_ref, up, gid =None): """ retrieve event data from event and evt_ref @@ -5168,7 +5166,7 @@ class IndividualPage(BasePage): Html("th", label, class_ =colclass, inline =True) for (label, colclass) in [ (_("Date"), "ColumnDate"), - (_("Place Title"), "ColumnName"), + (_("Place Title"), "ColumnPlace"), (_("Event Type"), "ColumnType") ] ) @@ -5184,7 +5182,7 @@ class IndividualPage(BasePage): Html("td", data, class_ =colclass, inline =True) for data, colclass in [ (date, "ColumnDate"), - (self.place_link(handle, placetitle, up =True), "ColumnName"), + (self.place_link(handle, placetitle, up =True), "ColumnPlace"), (etype, "ColumnType") ] ) diff --git a/src/plugins/webstuff/css/Web_Basic-Blue.css b/src/plugins/webstuff/css/Web_Basic-Blue.css index 904fd8872..fa5a972da 100644 --- a/src/plugins/webstuff/css/Web_Basic-Blue.css +++ b/src/plugins/webstuff/css/Web_Basic-Blue.css @@ -372,6 +372,9 @@ table.infolist tr td.ColumnLetter { width: 3%; text-align: center; } +table.infolist tbody tr td.ColumnDate { + width: 12%; +} table.infolist tbody tr td.ColumnBirth { font-size:.9em; width: 10%; @@ -561,7 +564,7 @@ div#Relationships table.infolist tbody tr td { } /* Places -================================================= */ +=================================================----- */ div#Places, div#PlaceDetail { font: normal 1em sans; margin: 0; @@ -610,7 +613,7 @@ div#PlaceDetail h5 { /* EventList and EventDetail ------------------------------------------------------ */ +------------------------------------------------------ */ div#EventList, div#EventDetail { margin: 0; padding: 0; @@ -619,10 +622,7 @@ table.eventlist tbody tr td { border-bottom: dashed 1px #000; } table.eventlist tbody tr td.ColumnEvent { - width: 15%; -} -table.eventlist tbody tr td.ColumnDate { - width: 12%; + width: 10%; } table.eventlist tbody tr td.ColumnPlace { width: 25%; @@ -631,7 +631,7 @@ table.eventlist tbody tr td.ColumnNotes { width: 20%; } table.eventlist tbody tr td.ColumnSources { - width: 10%; + width: 17%; } table.eventlist tbody tr td.ColumnPerson { width: 35%; @@ -667,9 +667,6 @@ div#EventList table.alphaevent tbody tr td.ColumnType a:hover { div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID { width: 10%; } -div#EventList table.alphaevent tbody tr td.ColumnDate { - width: 20%; -} div#EventList table.alphaevent tbody tr td.ColumnPerson { width: 50%; } @@ -744,9 +741,6 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate { display: block; padding: .2em 10px .4em 10px; } -#Gallery table.infolist tbody tr td.ColumnDate { - width: 20%; -} #Gallery table.infolist tbody tr td.ColumnMime { width: 20%; } @@ -1251,9 +1245,6 @@ div#Addresses { div#Addresses table.infolist { font-size: 10px; } -div#Addresses table.infolist tbody tr td.ColumnDate { - width: 15%; -} div#Addresses table.infolist tbody tr td.ColumnStreetAddress { width: 30%; } diff --git a/src/plugins/webstuff/css/narrative-maps.css b/src/plugins/webstuff/css/narrative-maps.css index 0b4c2302e..ca04f05d5 100644 --- a/src/plugins/webstuff/css/narrative-maps.css +++ b/src/plugins/webstuff/css/narrative-maps.css @@ -63,16 +63,14 @@ div#FamilyMapDetail div#references table.infolist { div#FamilyMapDetail div#references table.infolist thead tr th { font-weight: bold; font-size: .9em; -} -div#FamilyMapDetail div#references table.infolist thead tr th.ColumnDate { - width: 8%; -} -div#FamilyMapDetail div#references table.infolist thead tr th.ColumnName { - width: 55%; -} -div#FamilyMapDetail div#references table.infolist thead tr th.ColumnType { - width: 10%; + margin-left: 5%; } div#FamilyMapDetail div#references table.infolist tbody tr td { font-size: .9em; } +div#FamilyMapDetail div#references table.infolist tbody tr td.ColumnPlace { + width: 55%; +} +div#FamilyMapDetail div#references table.infolist tbody tr td.ColumnType { + width: 10%; +}