From 1cf4315a635a67974b34578708cf5a1665b302ea Mon Sep 17 00:00:00 2001 From: Michiel Nauta Date: Tue, 12 Jul 2011 20:48:31 +0000 Subject: [PATCH] 5063: Mainz stylesheet bugs: align subtables and fix source ref links svn: r17919 --- src/plugins/webreport/NarrativeWeb.py | 9 +++++++-- src/plugins/webstuff/css/Web_Basic-Ash.css | 9 +++++++++ src/plugins/webstuff/css/Web_Basic-Blue.css | 9 +++++++++ src/plugins/webstuff/css/Web_Basic-Cypress.css | 9 +++++++++ src/plugins/webstuff/css/Web_Basic-Lilac.css | 9 +++++++++ src/plugins/webstuff/css/Web_Basic-Peach.css | 9 +++++++++ src/plugins/webstuff/css/Web_Basic-Spruce.css | 9 +++++++++ src/plugins/webstuff/css/Web_Mainz.css | 9 +++++++++ src/plugins/webstuff/css/Web_Nebraska.css | 9 +++++++++ src/plugins/webstuff/css/Web_Visually.css | 9 +++++++++ 10 files changed, 88 insertions(+), 2 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 0d500dbe2..2b93bbecf 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1729,6 +1729,7 @@ class BasePage(object): ordered1 = Html("ol") citation_ref_list = citation.get_ref_list() for key, sref in citation_ref_list: + cit_ref_li = Html("li", id="sref%d%s" % (cindex, key)) tmp = Html("ul") confidence = Utils.confidence.get(sref.confidence, _('Unknown')) if confidence == _('Normal'): @@ -1745,7 +1746,8 @@ class BasePage(object): self.get_note_format(this_note, True) )) if tmp: - ordered1 += tmp + cit_ref_li += tmp + ordered1 += cit_ref_li if citation_ref_list: list += ordered1 @@ -5069,7 +5071,10 @@ class IndividualPage(BasePage): section += Html("h4", _("Families"), inline = True) # begin families table - with Html("table", class_ = "infolist") as table: + table_class = "infolist" + if len(family_list) > 1: + table_class += " fixed_subtables" + with Html("table", class_ = table_class) as table: section += table for family_handle in family_list: diff --git a/src/plugins/webstuff/css/Web_Basic-Ash.css b/src/plugins/webstuff/css/Web_Basic-Ash.css index 4ffd626ea..7b997ec28 100644 --- a/src/plugins/webstuff/css/Web_Basic-Ash.css +++ b/src/plugins/webstuff/css/Web_Basic-Ash.css @@ -787,6 +787,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsections : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Basic-Blue.css b/src/plugins/webstuff/css/Web_Basic-Blue.css index 8d9b1aeec..8a7b02471 100644 --- a/src/plugins/webstuff/css/Web_Basic-Blue.css +++ b/src/plugins/webstuff/css/Web_Basic-Blue.css @@ -1097,6 +1097,15 @@ div#families table.infolist tbody tr td.ColumnValue ol li { div#families table.infolist tbody tr td.ColumnValue ol li a { text-decoration: underline; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsection: LDS Ordinance ------------------------------------------------------ */ diff --git a/src/plugins/webstuff/css/Web_Basic-Cypress.css b/src/plugins/webstuff/css/Web_Basic-Cypress.css index a6d52d0be..722819f33 100644 --- a/src/plugins/webstuff/css/Web_Basic-Cypress.css +++ b/src/plugins/webstuff/css/Web_Basic-Cypress.css @@ -784,6 +784,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsections : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Basic-Lilac.css b/src/plugins/webstuff/css/Web_Basic-Lilac.css index 901e578ab..b3cdad003 100644 --- a/src/plugins/webstuff/css/Web_Basic-Lilac.css +++ b/src/plugins/webstuff/css/Web_Basic-Lilac.css @@ -785,6 +785,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsections : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Basic-Peach.css b/src/plugins/webstuff/css/Web_Basic-Peach.css index ac3a67fcc..cf84bbe03 100644 --- a/src/plugins/webstuff/css/Web_Basic-Peach.css +++ b/src/plugins/webstuff/css/Web_Basic-Peach.css @@ -786,6 +786,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsections : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Basic-Spruce.css b/src/plugins/webstuff/css/Web_Basic-Spruce.css index 48f28d3e8..e755e504b 100644 --- a/src/plugins/webstuff/css/Web_Basic-Spruce.css +++ b/src/plugins/webstuff/css/Web_Basic-Spruce.css @@ -786,6 +786,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsections : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Mainz.css b/src/plugins/webstuff/css/Web_Mainz.css index b199c1406..8d8089677 100644 --- a/src/plugins/webstuff/css/Web_Mainz.css +++ b/src/plugins/webstuff/css/Web_Mainz.css @@ -791,6 +791,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* SubSection : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Nebraska.css b/src/plugins/webstuff/css/Web_Nebraska.css index 07e987ebe..1922fbf8d 100644 --- a/src/plugins/webstuff/css/Web_Nebraska.css +++ b/src/plugins/webstuff/css/Web_Nebraska.css @@ -782,6 +782,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsections : Addresses ----------------------------------------------------- */ diff --git a/src/plugins/webstuff/css/Web_Visually.css b/src/plugins/webstuff/css/Web_Visually.css index a82cd12ea..9e730d700 100644 --- a/src/plugins/webstuff/css/Web_Visually.css +++ b/src/plugins/webstuff/css/Web_Visually.css @@ -1081,6 +1081,15 @@ div#families table.infolist tbody tr td.ColumnValue ol { div#families table.infolist tbody tr td.ColumnValue ol li { padding-bottom:.2em; } +div#families table.fixed_subtables table.eventlist { + table-layout:fixed; +} +div#families table.fixed_subtables table.eventlist th:first-child { + width:9em; +} +div#families table.fixed_subtables table.eventlist th:last-child { + width:5em; +} /* Subsection: LDS Ordinance ------------------------------------------------------ */