bug report #2234; notes should be separated from the previous text to which they apply; merged from gramps30

svn: r10824
This commit is contained in:
Stéphane Charette 2008-06-21 08:42:31 +00:00
parent ae5ba9a180
commit ae2a2917c4
9 changed files with 42 additions and 0 deletions

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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<p class="EventNote">\n\t\t\t\t\t'
if format:
text += u"<pre>%s</pre>" % note_text
else:
text += "<br />"
text += u"<br />".join(note_text.split("\n"))
text += u'\n\t\t\t\t\t</p>\n\t\t\t\t'
return text
def get_citation_links(self, source_ref_list):