From 87dd9aff24c750fd8ee85d421ca1899f547925ea Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 17 Apr 2010 14:49:36 +0000 Subject: [PATCH] CSS fixes and partial fix to 3837 svn: r15185 --- src/data/Web_Basic-Ash.css | 3 +-- src/data/Web_Basic-Blue.css | 2 -- src/data/Web_Basic-Cypress.css | 4 +--- src/data/Web_Basic-Lilac.css | 4 +--- src/data/Web_Basic-Peach.css | 4 +--- src/data/Web_Basic-Spruce.css | 4 +--- src/data/Web_Mainz.css | 4 +--- src/data/Web_Nebraska.css | 2 -- src/data/Web_Print-Default.css | 2 -- src/plugins/webreport/NarrativeWeb.py | 20 ++++++++++++-------- 10 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css index 618b23414..bcd72b232 100644 --- a/src/data/Web_Basic-Ash.css +++ b/src/data/Web_Basic-Ash.css @@ -314,7 +314,7 @@ div#alphabet ul li a:hover { ----------------------------------------------------- */ table { font-size:14px; - margin:0 15px; + margin:0; padding:0; border:none; border-collapse:collapse; @@ -1011,7 +1011,6 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { background-color: #FFF; diff --git a/src/data/Web_Basic-Blue.css b/src/data/Web_Basic-Blue.css index c52175724..c29505d63 100644 --- a/src/data/Web_Basic-Blue.css +++ b/src/data/Web_Basic-Blue.css @@ -973,10 +973,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css index a7e04c557..047de088e 100644 --- a/src/data/Web_Basic-Cypress.css +++ b/src/data/Web_Basic-Cypress.css @@ -317,7 +317,7 @@ div#alphabet ul li a:hover { ----------------------------------------------------- */ table { font-size:14px; - margin:0 15px; + margin:0; padding:0; border:none; border-collapse:collapse; @@ -1038,10 +1038,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index f1d7ec1e9..5d06577de 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -263,7 +263,7 @@ div#alphabet ul li a:hover { ----------------------------------------------------- */ table { font-size:14px; - margin:0 15px; + margin:0; padding:0; border:none; border-collapse:collapse; @@ -988,10 +988,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index bf6eb115a..a2a386478 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -267,7 +267,7 @@ div#alphabet ul li a:hover { ----------------------------------------------------- */ table { font-size:14px; - margin:0 15px; + margin:0; padding:0; border:none; border-collapse:collapse; @@ -991,10 +991,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css index 83a4aa727..184fc5c1a 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -265,7 +265,7 @@ div#alphabet ul li a:hover { ----------------------------------------------------- */ table { font-size:14px; - margin:0 15px; + margin:0; padding:0; border:none; border-collapse:collapse; @@ -989,10 +989,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index e181de061..3ba307858 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -305,7 +305,7 @@ div#alphabet ul li a:hover { ----------------------------------------------------- */ table { font-size:14px; - margin:0 15px 1em 15px; + margin:0; padding:0; border:none; border-collapse:collapse; @@ -1041,10 +1041,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index bbcd0611d..3335a8c50 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -971,10 +971,8 @@ table.attrlist tbody tr td.ColumnAttrValue { } table.attrlist tbody tr td.ColumnAttrNotes { width: 45%; - background-color: #D8F3D6; } table.attrlist tbody tr td.ColumnAttrSources { - background-color: #FFF; width: 15%; } diff --git a/src/data/Web_Print-Default.css b/src/data/Web_Print-Default.css index a3418151e..91edeb38d 100644 --- a/src/data/Web_Print-Default.css +++ b/src/data/Web_Print-Default.css @@ -938,7 +938,6 @@ table.attrlist tbody tr td.ColumnValue { width: 250px; } table.attrlist tbody tr td.ColumnSources { - background-color: #FFF; width: 100px; } table.attrlist tbody tr td.ColumnNotes { @@ -946,7 +945,6 @@ table.attrlist tbody tr td.ColumnNotes { } div#attributes table.attrlist tbody tr td.ColumnNotes { width: 400px; - background-color: #D8F3D6; } /* Subsections : Parents diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index a522d43c0..e173210bf 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -450,13 +450,16 @@ class BasePage(object): db = self.report.database # begin unordered list - ul = Html("ul") - ul.extend( - self.get_note_format( - db.get_note_from_handle(notehandle)) - for notehandle in notelist) + ul = Html("p") + for notehandle in notelist: + ul.extend( + Html("p", str(db.get_note_from_handle(notehandle).type)) + ) + ul.extend( + self.get_note_format(db.get_note_from_handle(notehandle)) + ) - # return unordered note list to its callers + # return note list to its callers return ul def display_event_row(self, evt, evt_ref, subdirs, hyp): @@ -1611,8 +1614,9 @@ class BasePage(object): if tmp: list1 = Html("li", inline = True) + ( - Html("a", ";   ".join(tmp), - name = "sref%d%s" % (cindex, key)) + Html("a", "
".join(tmp), + style="text-decoration: none;", + name="sref%d%s" % (cindex, key)) ) ordered1 += list1