diff --git a/src/data/NWeb-Print_Default.css b/src/data/NWeb-Print_Default.css index 5d1bd5bd1..e5a746489 100644 --- a/src/data/NWeb-Print_Default.css +++ b/src/data/NWeb-Print_Default.css @@ -264,6 +264,11 @@ table tbody tr td.ColumnParents { table tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table tbody p.EventNote { + padding-top:1em; + padding-bottom:1em; + border-top:dashed .5pt #A7A7A7; +} /* ------------------------------------------------------------------------------ */ /* Home/Welcome Styles */ diff --git a/src/data/NWeb-Screen_Basic-Ash.css b/src/data/NWeb-Screen_Basic-Ash.css index 3bcf7e9e4..b2ce5ee6f 100644 --- a/src/data/NWeb-Screen_Basic-Ash.css +++ b/src/data/NWeb-Screen_Basic-Ash.css @@ -321,6 +321,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #CCC; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/data/NWeb-Screen_Basic-Cypress.css b/src/data/NWeb-Screen_Basic-Cypress.css index 22ac2c2fe..c78376d72 100644 --- a/src/data/NWeb-Screen_Basic-Cypress.css +++ b/src/data/NWeb-Screen_Basic-Cypress.css @@ -331,6 +331,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #9DBF9D; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/data/NWeb-Screen_Basic-Lilac.css b/src/data/NWeb-Screen_Basic-Lilac.css index 69c8c6aa7..5fd158941 100644 --- a/src/data/NWeb-Screen_Basic-Lilac.css +++ b/src/data/NWeb-Screen_Basic-Lilac.css @@ -321,6 +321,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #B4B4CB; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/data/NWeb-Screen_Basic-Peach.css b/src/data/NWeb-Screen_Basic-Peach.css index 5d07a0a01..abed849ac 100644 --- a/src/data/NWeb-Screen_Basic-Peach.css +++ b/src/data/NWeb-Screen_Basic-Peach.css @@ -321,6 +321,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #FFC35E; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/data/NWeb-Screen_Basic-Spruce.css b/src/data/NWeb-Screen_Basic-Spruce.css index 4762b2f7d..27937bb3a 100644 --- a/src/data/NWeb-Screen_Basic-Spruce.css +++ b/src/data/NWeb-Screen_Basic-Spruce.css @@ -321,6 +321,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #BFD0EA; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/data/NWeb-Screen_Mainz.css b/src/data/NWeb-Screen_Mainz.css index 868643d60..bdc8d5d9e 100644 --- a/src/data/NWeb-Screen_Mainz.css +++ b/src/data/NWeb-Screen_Mainz.css @@ -336,6 +336,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #D8C19F; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/data/NWeb-Screen_Nebraska.css b/src/data/NWeb-Screen_Nebraska.css index 0726ba7f1..091e01059 100644 --- a/src/data/NWeb-Screen_Nebraska.css +++ b/src/data/NWeb-Screen_Nebraska.css @@ -349,6 +349,11 @@ table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td table.infolist tbody tr td.ColumnParents span.mother:before { content:"+ "; } +table.infolist tbody p.EventNote { + border-top:dashed 1px #C1B398; + padding-top:1em; + padding-bottom:1em; +} /* ------------------------------------------------------------------------------ */ /* Surnames Styles */ diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 47a8fd414..f600b8947 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -2430,11 +2430,13 @@ class IndividualPage(BasePage): note_text = note.get() format = note.get_format() if note_text: + text += u'\n\t\t\t\t\t

\n\t\t\t\t\t' if format: text += u"

%s
" % note_text else: text += "
" text += u"
".join(note_text.split("\n")) + text += u'\n\t\t\t\t\t

\n\t\t\t\t' return text def get_citation_links(self, source_ref_list):