From bedbf0084f7bc52b71872efed58bea0651a06764 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Sat, 22 May 2010 07:20:27 +0000 Subject: [PATCH] Changed Download page a little and made the changes uniform in all the style sheets. Still have a problem in Web_Mainz.css though. svn: r15446 --- src/data/Web_Basic-Ash.css | 57 +++++++++------------- src/data/Web_Basic-Blue.css | 21 +++----- src/data/Web_Basic-Cypress.css | 70 +++++++++++---------------- src/data/Web_Basic-Lilac.css | 70 +++++++++++---------------- src/data/Web_Basic-Peach.css | 67 +++++++++++-------------- src/data/Web_Basic-Spruce.css | 68 +++++++++++--------------- src/data/Web_Mainz.css | 66 ++++++++++--------------- src/data/Web_Nebraska.css | 68 +++++++++++--------------- src/data/Web_Visually.css | 48 ++++++++---------- src/plugins/webreport/NarrativeWeb.py | 61 +++++++++++------------ 10 files changed, 241 insertions(+), 355 deletions(-) diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css index bb1c380b3..eb0a0f928 100644 --- a/src/data/Web_Basic-Ash.css +++ b/src/data/Web_Basic-Ash.css @@ -177,11 +177,11 @@ div#footer { clear:both; overflow:hidden; width:100%; + height: 60px; font-size:12px; line-height:130%; color:#333; - margin:0; - padding:15px 0 0 0; + margin-top: .5cm; background-color:#CCC; border-top:solid 1px #333; } @@ -685,49 +685,38 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ - -#Download { +div#Download { margin: 0; - padding: .5em 0 .5em 0; -} -table.download { - padding: 0; - margin: .5em 0 .5em 0; - border: solid 1px #000; width: 100%; - background-color: #CCC; } -table.download img { - /* float:center; */ +div#Download table.download { + border: solid 1px #000; + margin: .3cm 14px .5cm 14px; + width: 965px; } -table.download tbody tr#Row02 { - border-bottom:solid 1px #000; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download tbody tr td { - border-style:solid; - border-color: #000; - border-width: 0px 2px 2px 2px; - text-align:left; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download td.ColumnFilename { - width:30%; - background-color: #FFF; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download td.ColumnFilename a { - display:block; - padding:10px; - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.ColumnDescription { - width:45%; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.ColumnLicense { - width:6%; +div#Download table.download td.ColumnModified { + width: 17%; } -table.download td.ColumnModified { - width:17%; +div#Download p#description a.copyright a img { + float: center; } /* Contact diff --git a/src/data/Web_Basic-Blue.css b/src/data/Web_Basic-Blue.css index 6c00b20dd..ec1ce45d7 100644 --- a/src/data/Web_Basic-Blue.css +++ b/src/data/Web_Basic-Blue.css @@ -747,10 +747,9 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate { /* Download ----------------------------------------------------- */ - div#Download { margin: 0; - padding: 0px 0px .5em 0px; + width: 100%; } div#Download table.download { padding: 0; @@ -758,9 +757,6 @@ div#Download table.download { border: solid 1px #000; width: 100%; } -div#Download table.download img { - text-align: center; -} div#Download table.download tbody tr#Row02 { border-bottom: solid 2px #000; } @@ -768,23 +764,22 @@ div#Download table.download tbody tr td { border: solid 1px #000; text-align: left; } -div#Download table.download td.Filename { +div#Download table.download td.ColumnFilename { width: 30%; } -div#Download table.download td.Filename a { +div#Download table.download td.ColumnFilename a { font-weight: bold; font-style: italic; - text-decoration: none; } -div#Download table.download td.Description { +div#Download table.download td.ColumnDescription { width: 45%; } -div#Download table.download td.License { - width: 6%; -} -div#Download table.download td.Modified { +div#Download table.download td.ColumnModified { width: 17%; } +div#Download p#description a.copyright a img { + float: center; +} /* Sources ----------------------------------------------------- */ diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css index a216384ec..b7ba44f0f 100644 --- a/src/data/Web_Basic-Cypress.css +++ b/src/data/Web_Basic-Cypress.css @@ -181,8 +181,7 @@ div#footer { font-size:12px; line-height:130%; color:#E8E6E8; - margin:0; - padding:15px 0 0 0; + margin-top: .5cm; background-color:#454; border-top:solid 1px #454; } @@ -201,7 +200,7 @@ div#footer { } #footer p#createdate { float:left; - width:40%; + width: 50%; text-align:left; margin-left:10px; } @@ -751,54 +750,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ -#Download { - padding:1cm; - height:396px; +div#Download { + margin: 0; + width: 100%; } -table.download { - border:solid 2px #000; - width:100%; +div#Download table.download { + border: solid 1px #000; + margin: .1cm 14px .5cm 14px; + width: 965px; } -table.download img { - text-align:center; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download thead tr th { - text-align:center; - border:solid 2px #000; - color: #000; - text-transform:uppercase; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download tbody tr#Row02 { - border-bottom:solid 2px #000; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download thead tr th, table.download tbody tr td { - padding-left:10px; - padding-top:20px; - border-style:solid; - border-color:#000; - border-width:0 2px 2px 2px; - text-align:left; -} -table.download td.Description { - width: 50%; -} -table.download td.License { - width:8%; -} -table.download td.Filename { - width:30%; -} -table.download td.Filename a { - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.Filename a:hover { - text-decoration:underline; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.Modified { - width:12%; - font-weight:bold; +div#Download table.download td.ColumnModified { + width: 17%; +} +div#Download a.copyright a img { + float: center; + text-align: center; } /* Repositories diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index 47c3baddd..464f0f09f 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -696,55 +696,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ -#Download { - padding: 1cm; - height:396px; +div#Download { + margin: 0; + width: 100%; } -table.download { - padding-top: .5cm; - border:solid 1px #000; - width:100%; +div#Download table.download { + border: solid 1px #000; + margin: .1cm 14px .5cm 14px; + width: 965px; } -table.download img { - text-align:center; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download thead tr th { - text-align:center; - border:solid 2px #000; - color: #000; - text-transform:uppercase; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download tbody tr#Row02 { - border-bottom:solid 2px #000; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download thead tr th, table.download tbody tr td { - padding-left:10px; - padding-top:20px; - border-style:solid; - border-color:#000; - border-width:0 2px 2px 2px; - text-align:left; -} -table.download td.Description { - width: 50%; -} -table.download td.License { - width:8%; -} -table.download td.Filename { - width:30%; -} -table.download td.Filename a { - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.Filename a:hover { - text-decoration:underline; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.Modified { - width:12%; - font-weight:bold; +div#Download table.download td.ColumnModified { + width: 17%; +} +div#Download a.copyright a img { + float: center; + text-align: center; } /* Repositories @@ -1247,11 +1231,11 @@ div#footer { clear:both; overflow:hidden; width:100%; + height: 60px; font-size:12px; line-height:130%; color:#2E2E61; - margin:0; - padding:15px 0 0 0; + margin-top: .5cm; background-color:#B4B4CB; border-top:solid 1px #2E2E61; } diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index 10c096550..3a55d0b68 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -700,54 +700,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ -#Download { - padding:1cm; - height:396px; +div#Download { + margin: 0; + width: 100%; } -table.download { - border:solid 2px #000; - width:100%; +div#Download table.download { + border: solid 1px #000; + margin: .1cm 14px .5cm 14px; + width: 965px; } -table.download img { - text-align:center; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download thead tr th { - text-align:center; - border:solid 2px #000; - color: #000; - text-transform:uppercase; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download tbody tr#Row02 { - border-bottom:solid 2px #000; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download thead tr th, table.download tbody tr td { - padding-left:10px; - padding-top:20px; - border-style:solid; - border-color:#000; - border-width:0 2px 2px 2px; - text-align:left; -} -table.download td.Description { - width: 50%; -} -table.download td.License { - width:8%; -} -table.download td.Filename { - width:30%; -} -table.download td.Filename a { - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.Filename a:hover { - text-decoration:underline; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.Modified { - width:12%; - font-weight:bold; +div#Download table.download td.ColumnModified { + width: 17%; +} +div#Download a.copyright a img { + float: center; + text-align: center; } /* Repositories @@ -1250,6 +1235,8 @@ div#footer { clear:both; overflow:hidden; width:100%; + height: 60px; + margin-top: .5cm; font-size:12px; line-height:130%; color:#8C581C; diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css index 423f8e89f..47a5350ae 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -698,54 +698,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ -#Download { - padding:1cm; - height:396px; +div#Download { + margin: 0; + width: 100%; } -table.download { - border:solid 2px #000; - width:100%; +div#Download table.download { + border: solid 1px #000; + margin: .1cm 14px .5cm 14px; + width: 965px; } -table.download img { - text-align:center; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download thead tr th { - text-align:center; - border:solid 2px #000; - color: #000; - text-transform:uppercase; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download tbody tr#Row02 { - border-bottom:solid 2px #000; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download thead tr th, table.download tbody tr td { - padding-left:10px; - padding-top:20px; - border-style:solid; - border-color:#000; - border-width:0 2px 2px 2px; - text-align:left; -} -table.download td.Description { - width: 50%; -} -table.download td.License { - width:8%; -} -table.download td.Filename { - width:30%; -} -table.download td.Filename a { - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.Filename a:hover { - text-decoration:underline; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.Modified { - width:12%; - font-weight:bold; +div#Download table.download td.ColumnModified { + width: 17%; +} +div#Download a.copyright a img { + float: center; + text-align: center; } /* Repositories @@ -1246,10 +1231,11 @@ div#footer { clear:both; overflow:hidden; width:100%; + height: 60px; font-size:12px; line-height:130%; color:#204D91; - margin:0; + margin-top: .5cm; padding:15px 0 0 0; background-color: #BFD0EA; border-top:solid 1px #204D91; diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index 7f500b9d1..710115efe 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -763,54 +763,40 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ -#Download { - padding: 0; - width: 965; - height: 350px; +div#Download { + margin: 0; + padding:0px 20px 0px 20px; + width: 965px; } -table.download { - border:solid 2px #000; +div#Download table.download { + border: solid 1px #000; + margin: .1cm 0px .5cm 0px; + width: 100%; } -table.download img { - text-align: center; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download thead tr th { - text-align:center; - border:solid 2px #000; - color: #000; - text-transform:uppercase; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download tbody tr#Row02 { - border-bottom:solid 2px #000; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download thead tr th, table.download tbody tr td { - padding-left:10px; - padding-top:20px; - border-style:solid; - border-color:#000; - border-width:0 2px 2px 2px; - text-align:left; -} -table.download td.Description { - width: 50%; -} -table.download td.License { - width:8%; -} -table.download td.Filename { - width:30%; -} -table.download td.Filename a { - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.Filename a:hover { - text-decoration:underline; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.Modified { - width:12%; - font-weight:bold; +div#Download table.download td.ColumnModified { + width: 17%; +} +div#Download a.copyright a img { + float: center; + text-align: center; } /* Repositories diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index 6b635e739..687d33e25 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -734,54 +734,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent { /* Download ----------------------------------------------------- */ -#Download { - padding:1cm; - height:396px; +div#Download { + margin: 0; + width: 100%; } -table.download { - border:solid 2px #000; - width:100%; +div#Download table.download { + border: solid 1px #000; + margin: .1cm 14px .5cm 14px; + width: 965px; } -table.download img { - text-align:center; +div#Download table.download tbody tr#Row02 { + border-bottom: solid 1px #000; } -table.download thead tr th { - text-align:center; - border:solid 2px #000; - color: #000; - text-transform:uppercase; +div#Download table.download tbody tr td { + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -table.download tbody tr#Row02 { - border-bottom:solid 2px #000; +div#Download table.download td.ColumnFilename { + width: 30%; } -table.download thead tr th, table.download tbody tr td { - padding-left:10px; - padding-top:20px; - border-style:solid; - border-color:#000; - border-width:0 2px 2px 2px; - text-align:left; -} -table.download td.Description { - width: 50%; -} -table.download td.License { - width:8%; -} -table.download td.Filename { - width:30%; -} -table.download td.Filename a { - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -table.download td.Filename a:hover { - text-decoration:underline; +div#Download table.download td.ColumnDescription { + width: 45%; } -table.download td.Modified { - width:12%; - font-weight:bold; +div#Download table.download td.ColumnModified { + width: 17%; +} +div#Download a.copyright a img { + float: center; + text-align: center; } /* Repositories @@ -1288,11 +1273,12 @@ div#footer { clear:both; overflow:hidden; width:100%; + height: 60px; font-size:12px; line-height:130%; font-family:sans-serif; color:#FFF; - margin:0; + margin-top: .5cm; padding:0; background-color:#542; border-top: solid 8px #A97; diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index d44998654..95c04b273 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -235,10 +235,11 @@ div#footer { clear:both; overflow:hidden; width:100%; + height: 60px; font-size:12px; line-height:130%; color:#FFF; - margin:0; + margin-top: .5cm; background-color:#542; border-top:solid 8px #5D835F; } @@ -784,47 +785,38 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson { /* Download ----------------------------------------------------- */ - -div#Download { +div#Download { margin: 0; - padding: 0px 0px .5em 0px; } div#Download table.download { - padding: 0; - margin: .5em 0 .5em 0; - border: solid 1px #5D835F; + border: solid 1px #000; + margin: .1cm 0px .5cm 0px; width: 100%; } -div#Download table.download img { - float:center; -} div#Download table.download tbody tr#Row02 { - border-bottom: solid 2px #5D835F; + border-bottom: solid 1px #000; } div#Download table.download tbody tr td { - background-color: #D8F3D6; - border: solid 1px #5D835F; - text-align:left; + border: solid 1px #000; + text-align: left; + padding: 5px 0px 5px 0px; } -div#Download table.download td.Filename { - width:30%; - background-color: #FFF; +div#Download table.download td.ColumnFilename { + width: 30%; } -div#Download table.download td.Filename a { - display: block; - padding: 10px 10px 14px 6px; - font-weight:bold; +div#Download table.download td.ColumnFilename a { + font-weight: bold; font-style: italic; - text-decoration:none; } -div#Download table.download td.Description { - width:45%; +div#Download table.download td.ColumnDescription { + width: 45%; } -div#Download table.download td.License { - width:6%; +div#Download table.download td.ColumnModified { + width: 17%; } -div#Download table.download td.Modified { - width:17%; +div#Download a.copyright a img { + float: center; + text-align: center; } /* Sources diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 0657d15a1..9c6728851 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -3417,23 +3417,21 @@ class DownloadPage(BasePage): dlcopy = self.report.dl_copy # if no filenames at all, return??? - if not dlfname1 and not dlfname2: - return + if dlfname1 or dlfname2: - of = self.report.create_file("download") - downloadpage, body = self.write_header(_('Download')) + of = self.report.create_file("download") + downloadpage, body = self.write_header(_('Download')) - # begin download page and table - with Html("div", class_ = "content", id = "Download") as download: - body += download + # begin download page and table + with Html("div", class_ = "content", id = "Download") as download: + body += download - msg = _("This page is for the user/ creator of this Family Tree/ " - "Narrative website to share a couple of files with you " - "regarding their family. If there are any files listed " - "below, clicking on them will allow you to download them.") - download += Html("p", msg, id = "description") + msg = _("This page is for the user/ creator of this Family Tree/ " + "Narrative website to share a couple of files with you " + "regarding their family. If there are any files listed " + "below, clicking on them will allow you to download them.") + download += Html("p", msg, id = "description") - if dlfname1 or dlfname2: # begin download table and table head with Html("table", class_ = "infolist download") as table: download += table @@ -3445,37 +3443,32 @@ class DownloadPage(BasePage): thead += trow trow.extend( - Html("th", label, class_ = colclass, inline = True) + Html("th", label, class_ = "Column" + colclass, inline = True) for (label, colclass) in [ (_("File Name"), "Filename"), (DESCRHEAD, "Description"), - (_("License"), "License"), (_("Last Modified"), "Modified") ] ) + # table body + tbody = Html("tbody") + table += tbody # if dlfname1 is not None, show it??? if dlfname1: - # table body - tbody = Html("tbody") - table += tbody - trow = Html("tr", id = 'Row01') tbody += trow fname = os.path.basename(dlfname1) - tcell = ( Html("td", class_ = "Filename") + - Html("a", fname, href = dlfname1, alt = dldescr1) + tcell = ( Html("td", class_ = "ColumnFilename") + + Html("a", fname, href = dlfname1, title = dldescr1) ) trow += tcell dldescr1 = dldescr1 or " " - trow += Html("td", dldescr1, class_ = "Description", inline = True) + trow += Html("td", dldescr1, class_ = "ColumnDescription", inline = True) - copyright = self.get_copyright_license(dlcopy) or " " - trow += Html("td", copyright, class_ = "License") - - tcell = Html("td", class_ = "Modified", inline = True) + tcell = Html("td", class_ = "ColumnModified", inline = True) trow += tcell if os.path.exists(dlfname1): modified = os.stat(dlfname1).st_mtime @@ -3492,18 +3485,15 @@ class DownloadPage(BasePage): tbody += trow fname = os.path.basename(dlfname2) - tcell = ( Html("td", class_ = "Filename") + + tcell = ( Html("td", class_ = "ColumnFilename") + Html("a", fname, href = dlfname2, alt = dldescr2) ) trow += tcell dldescr2 = dldescr2 or " " - trow += Html("td", dldescr2, class_ = "Description", inline = True) + trow += Html("td", dldescr2, class_ = "ColumnDescription", inline = True) - copyright = self.get_copyright_license(dlcopy) or " " - trow += Html("td", copyright, class_ = "License", inline = True) - - tcell = Html("td", id = 'Col04', class_ = "Modified", inline = True) + tcell = Html("td", id = 'Col04', class_ = "ColumnModified", inline = True) trow += tcell if os.path.exists(dlfname2): modified = os.stat(dlfname2).st_mtime @@ -3512,6 +3502,13 @@ class DownloadPage(BasePage): else: tcell += " " + # display Copyright license for these files + copyright = self.get_copyright_license(dlcopy) + if copyright: + msg = _("The Copyright License for these files are: ") + download += Html("p", msg, id = "description") + download += Html("a", copyright, class_ = "copyright") + # clear line for proper styling # create footer section footer = self.write_footer()