Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed Download page a little and made the changes uniform in all the style sheets. Still have a problem in Web_Mainz.css though.

Browse Source 
svn: r15446
This commit is contained in:
Rob G. Healey 2010-05-22 07:20:27 +00:00
parent 630596fca9
commit bedbf0084f
10 changed files with 241 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/data/Web_Basic-Ash.css
View File

@ -177,11 +177,11 @@ div#footer {
clear:both; clear:both;
overflow:hidden; overflow:hidden;
width:100%; width:100%;
height: 60px;
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
color:#333; color:#333;
margin:0; margin-top: .5cm;
padding:15px 0 0 0;
background-color:#CCC; background-color:#CCC;
border-top:solid 1px #333; border-top:solid 1px #333;
} }
@ -685,49 +685,38 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
div#Download {
#Download {
margin: 0; margin: 0;
padding: .5em 0 .5em 0;
}
table.download {
padding: 0;
margin: .5em 0 .5em 0;
border: solid 1px #000;
width: 100%; width: 100%;
background-color: #CCC;
} }
table.download img { div#Download table.download {
/* float:center; */ border: solid 1px #000;
margin: .3cm 14px .5cm 14px;
width: 965px;
} }
table.download tbody tr#Row02 { div#Download table.download tbody tr#Row02 {
border-bottom:solid 1px #000; border-bottom: solid 1px #000;
} }
table.download tbody tr td { div#Download table.download tbody tr td {
border-style:solid; border: solid 1px #000;
border-color: #000; text-align: left;
border-width: 0px 2px 2px 2px; padding: 5px 0px 5px 0px;
text-align:left;
} }
table.download td.ColumnFilename { div#Download table.download td.ColumnFilename {
width:30%; width: 30%;
background-color: #FFF;
} }
table.download td.ColumnFilename a { div#Download table.download td.ColumnFilename a {
display:block; font-weight: bold;
padding:10px;
font-weight:bold;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.ColumnDescription { div#Download table.download td.ColumnDescription {
width:45%; width: 45%;
} }
table.download td.ColumnLicense { div#Download table.download td.ColumnModified {
width:6%; width: 17%;
} }
table.download td.ColumnModified { div#Download p#description a.copyright a img {
width:17%; float: center;
} }
/* Contact /* Contact

21
src/data/Web_Basic-Blue.css
View File

@ -747,10 +747,9 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
div#Download { div#Download {
margin: 0; margin: 0;
padding: 0px 0px .5em 0px; width: 100%;
} }
div#Download table.download { div#Download table.download {
padding: 0; padding: 0;
@ -758,9 +757,6 @@ div#Download table.download {
border: solid 1px #000; border: solid 1px #000;
width: 100%; width: 100%;
} }
div#Download table.download img {
text-align: center;
}
div#Download table.download tbody tr#Row02 { div#Download table.download tbody tr#Row02 {
border-bottom: solid 2px #000; border-bottom: solid 2px #000;
} }
@ -768,23 +764,22 @@ div#Download table.download tbody tr td {
border: solid 1px #000; border: solid 1px #000;
text-align: left; text-align: left;
} }
div#Download table.download td.Filename { div#Download table.download td.ColumnFilename {
width: 30%; width: 30%;
} }
div#Download table.download td.Filename a { div#Download table.download td.ColumnFilename a {
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
text-decoration: none;
} }
div#Download table.download td.Description { div#Download table.download td.ColumnDescription {
width: 45%; width: 45%;
} }
div#Download table.download td.License { div#Download table.download td.ColumnModified {
width: 6%;
}
div#Download table.download td.Modified {
width: 17%; width: 17%;
} }
div#Download p#description a.copyright a img {
float: center;
}
/* Sources /* Sources
----------------------------------------------------- */ ----------------------------------------------------- */

70
src/data/Web_Basic-Cypress.css
View File

@ -181,8 +181,7 @@ div#footer {
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
color:#E8E6E8; color:#E8E6E8;
margin:0; margin-top: .5cm;
padding:15px 0 0 0;
background-color:#454; background-color:#454;
border-top:solid 1px #454; border-top:solid 1px #454;
} }
@ -201,7 +200,7 @@ div#footer {
} }
#footer p#createdate { #footer p#createdate {
float:left; float:left;
width:40%; width: 50%;
text-align:left; text-align:left;
margin-left:10px; margin-left:10px;
} }
@ -751,54 +750,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
#Download { div#Download {
padding:1cm; margin: 0;
height:396px; width: 100%;
} }
table.download { div#Download table.download {
border:solid 2px #000; border: solid 1px #000;
width:100%; margin: .1cm 14px .5cm 14px;
width: 965px;
} }
table.download img { div#Download table.download tbody tr#Row02 {
text-align:center; border-bottom: solid 1px #000;
} }
table.download thead tr th { div#Download table.download tbody tr td {
text-align:center; border: solid 1px #000;
border:solid 2px #000; text-align: left;
color: #000; padding: 5px 0px 5px 0px;
text-transform:uppercase;
} }
table.download tbody tr#Row02 { div#Download table.download td.ColumnFilename {
border-bottom:solid 2px #000; width: 30%;
} }
table.download thead tr th, table.download tbody tr td { div#Download table.download td.ColumnFilename a {
padding-left:10px; font-weight: bold;
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;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.Filename a:hover { div#Download table.download td.ColumnDescription {
text-decoration:underline; width: 45%;
} }
table.download td.Modified { div#Download table.download td.ColumnModified {
width:12%; width: 17%;
font-weight:bold; }
div#Download a.copyright a img {
float: center;
text-align: center;
} }
/* Repositories /* Repositories

70
src/data/Web_Basic-Lilac.css
View File

@ -696,55 +696,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
#Download { div#Download {
padding: 1cm; margin: 0;
height:396px; width: 100%;
} }
table.download { div#Download table.download {
padding-top: .5cm; border: solid 1px #000;
border:solid 1px #000; margin: .1cm 14px .5cm 14px;
width:100%; width: 965px;
} }
table.download img { div#Download table.download tbody tr#Row02 {
text-align:center; border-bottom: solid 1px #000;
} }
table.download thead tr th { div#Download table.download tbody tr td {
text-align:center; border: solid 1px #000;
border:solid 2px #000; text-align: left;
color: #000; padding: 5px 0px 5px 0px;
text-transform:uppercase;
} }
table.download tbody tr#Row02 { div#Download table.download td.ColumnFilename {
border-bottom:solid 2px #000; width: 30%;
} }
table.download thead tr th, table.download tbody tr td { div#Download table.download td.ColumnFilename a {
padding-left:10px; font-weight: bold;
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;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.Filename a:hover { div#Download table.download td.ColumnDescription {
text-decoration:underline; width: 45%;
} }
table.download td.Modified { div#Download table.download td.ColumnModified {
width:12%; width: 17%;
font-weight:bold; }
div#Download a.copyright a img {
float: center;
text-align: center;
} }
/* Repositories /* Repositories
@ -1247,11 +1231,11 @@ div#footer {
clear:both; clear:both;
overflow:hidden; overflow:hidden;
width:100%; width:100%;
height: 60px;
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
color:#2E2E61; color:#2E2E61;
margin:0; margin-top: .5cm;
padding:15px 0 0 0;
background-color:#B4B4CB; background-color:#B4B4CB;
border-top:solid 1px #2E2E61; border-top:solid 1px #2E2E61;
} }

67
src/data/Web_Basic-Peach.css
View File

@ -700,54 +700,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
#Download { div#Download {
padding:1cm; margin: 0;
height:396px; width: 100%;
} }
table.download { div#Download table.download {
border:solid 2px #000; border: solid 1px #000;
width:100%; margin: .1cm 14px .5cm 14px;
width: 965px;
} }
table.download img { div#Download table.download tbody tr#Row02 {
text-align:center; border-bottom: solid 1px #000;
} }
table.download thead tr th { div#Download table.download tbody tr td {
text-align:center; border: solid 1px #000;
border:solid 2px #000; text-align: left;
color: #000; padding: 5px 0px 5px 0px;
text-transform:uppercase;
} }
table.download tbody tr#Row02 { div#Download table.download td.ColumnFilename {
border-bottom:solid 2px #000; width: 30%;
} }
table.download thead tr th, table.download tbody tr td { div#Download table.download td.ColumnFilename a {
padding-left:10px; font-weight: bold;
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;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.Filename a:hover { div#Download table.download td.ColumnDescription {
text-decoration:underline; width: 45%;
} }
table.download td.Modified { div#Download table.download td.ColumnModified {
width:12%; width: 17%;
font-weight:bold; }
div#Download a.copyright a img {
float: center;
text-align: center;
} }
/* Repositories /* Repositories
@ -1250,6 +1235,8 @@ div#footer {
clear:both; clear:both;
overflow:hidden; overflow:hidden;
width:100%; width:100%;
height: 60px;
margin-top: .5cm;
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
color:#8C581C; color:#8C581C;

68
src/data/Web_Basic-Spruce.css
View File

@ -698,54 +698,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
#Download { div#Download {
padding:1cm; margin: 0;
height:396px; width: 100%;
} }
table.download { div#Download table.download {
border:solid 2px #000; border: solid 1px #000;
width:100%; margin: .1cm 14px .5cm 14px;
width: 965px;
} }
table.download img { div#Download table.download tbody tr#Row02 {
text-align:center; border-bottom: solid 1px #000;
} }
table.download thead tr th { div#Download table.download tbody tr td {
text-align:center; border: solid 1px #000;
border:solid 2px #000; text-align: left;
color: #000; padding: 5px 0px 5px 0px;
text-transform:uppercase;
} }
table.download tbody tr#Row02 { div#Download table.download td.ColumnFilename {
border-bottom:solid 2px #000; width: 30%;
} }
table.download thead tr th, table.download tbody tr td { div#Download table.download td.ColumnFilename a {
padding-left:10px; font-weight: bold;
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;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.Filename a:hover { div#Download table.download td.ColumnDescription {
text-decoration:underline; width: 45%;
} }
table.download td.Modified { div#Download table.download td.ColumnModified {
width:12%; width: 17%;
font-weight:bold; }
div#Download a.copyright a img {
float: center;
text-align: center;
} }
/* Repositories /* Repositories
@ -1246,10 +1231,11 @@ div#footer {
clear:both; clear:both;
overflow:hidden; overflow:hidden;
width:100%; width:100%;
height: 60px;
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
color:#204D91; color:#204D91;
margin:0; margin-top: .5cm;
padding:15px 0 0 0; padding:15px 0 0 0;
background-color: #BFD0EA; background-color: #BFD0EA;
border-top:solid 1px #204D91; border-top:solid 1px #204D91;

66
src/data/Web_Mainz.css
View File

@ -763,54 +763,40 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
#Download { div#Download {
padding: 0; margin: 0;
width: 965; padding:0px 20px 0px 20px;
height: 350px; width: 965px;
} }
table.download { div#Download table.download {
border:solid 2px #000; border: solid 1px #000;
margin: .1cm 0px .5cm 0px;
width: 100%;
} }
table.download img { div#Download table.download tbody tr#Row02 {
text-align: center; border-bottom: solid 1px #000;
} }
table.download thead tr th { div#Download table.download tbody tr td {
text-align:center; border: solid 1px #000;
border:solid 2px #000; text-align: left;
color: #000; padding: 5px 0px 5px 0px;
text-transform:uppercase;
} }
table.download tbody tr#Row02 { div#Download table.download td.ColumnFilename {
border-bottom:solid 2px #000; width: 30%;
} }
table.download thead tr th, table.download tbody tr td { div#Download table.download td.ColumnFilename a {
padding-left:10px; font-weight: bold;
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;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.Filename a:hover { div#Download table.download td.ColumnDescription {
text-decoration:underline; width: 45%;
} }
table.download td.Modified { div#Download table.download td.ColumnModified {
width:12%; width: 17%;
font-weight:bold; }
div#Download a.copyright a img {
float: center;
text-align: center;
} }
/* Repositories /* Repositories

68
src/data/Web_Nebraska.css
View File

@ -734,54 +734,39 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
#Download { div#Download {
padding:1cm; margin: 0;
height:396px; width: 100%;
} }
table.download { div#Download table.download {
border:solid 2px #000; border: solid 1px #000;
width:100%; margin: .1cm 14px .5cm 14px;
width: 965px;
} }
table.download img { div#Download table.download tbody tr#Row02 {
text-align:center; border-bottom: solid 1px #000;
} }
table.download thead tr th { div#Download table.download tbody tr td {
text-align:center; border: solid 1px #000;
border:solid 2px #000; text-align: left;
color: #000; padding: 5px 0px 5px 0px;
text-transform:uppercase;
} }
table.download tbody tr#Row02 { div#Download table.download td.ColumnFilename {
border-bottom:solid 2px #000; width: 30%;
} }
table.download thead tr th, table.download tbody tr td { div#Download table.download td.ColumnFilename a {
padding-left:10px; font-weight: bold;
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;
font-style: italic; font-style: italic;
text-decoration:none;
} }
table.download td.Filename a:hover { div#Download table.download td.ColumnDescription {
text-decoration:underline; width: 45%;
} }
table.download td.Modified { div#Download table.download td.ColumnModified {
width:12%; width: 17%;
font-weight:bold; }
div#Download a.copyright a img {
float: center;
text-align: center;
} }
/* Repositories /* Repositories
@ -1288,11 +1273,12 @@ div#footer {
clear:both; clear:both;
overflow:hidden; overflow:hidden;
width:100%; width:100%;
height: 60px;
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
font-family:sans-serif; font-family:sans-serif;
color:#FFF; color:#FFF;
margin:0; margin-top: .5cm;
padding:0; padding:0;
background-color:#542; background-color:#542;
border-top: solid 8px #A97; border-top: solid 8px #A97;

46
src/data/Web_Visually.css
View File

@ -235,10 +235,11 @@ div#footer {
clear:both; clear:both;
overflow:hidden; overflow:hidden;
width:100%; width:100%;
height: 60px;
font-size:12px; font-size:12px;
line-height:130%; line-height:130%;
color:#FFF; color:#FFF;
margin:0; margin-top: .5cm;
background-color:#542; background-color:#542;
border-top:solid 8px #5D835F; border-top:solid 8px #5D835F;
} }
@ -784,47 +785,38 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
/* Download /* Download
----------------------------------------------------- */ ----------------------------------------------------- */
div#Download { div#Download {
margin: 0; margin: 0;
padding: 0px 0px .5em 0px;
} }
div#Download table.download { div#Download table.download {
padding: 0; border: solid 1px #000;
margin: .5em 0 .5em 0; margin: .1cm 0px .5cm 0px;
border: solid 1px #5D835F;
width: 100%; width: 100%;
} }
div#Download table.download img {
float:center;
}
div#Download table.download tbody tr#Row02 { div#Download table.download tbody tr#Row02 {
border-bottom: solid 2px #5D835F; border-bottom: solid 1px #000;
} }
div#Download table.download tbody tr td { div#Download table.download tbody tr td {
background-color: #D8F3D6; border: solid 1px #000;
border: solid 1px #5D835F; text-align: left;
text-align:left; padding: 5px 0px 5px 0px;
} }
div#Download table.download td.Filename { div#Download table.download td.ColumnFilename {
width:30%; width: 30%;
background-color: #FFF;
} }
div#Download table.download td.Filename a { div#Download table.download td.ColumnFilename a {
display: block; font-weight: bold;
padding: 10px 10px 14px 6px;
font-weight:bold;
font-style: italic; font-style: italic;
text-decoration:none;
} }
div#Download table.download td.Description { div#Download table.download td.ColumnDescription {
width:45%; width: 45%;
} }
div#Download table.download td.License { div#Download table.download td.ColumnModified {
width:6%; width: 17%;
} }
div#Download table.download td.Modified { div#Download a.copyright a img {
width:17%; float: center;
text-align: center;
} }
/* Sources /* Sources

41
src/plugins/webreport/NarrativeWeb.py
View File

@ -3417,8 +3417,7 @@ class DownloadPage(BasePage):
dlcopy = self.report.dl_copy dlcopy = self.report.dl_copy
# if no filenames at all, return??? # if no filenames at all, return???
if not dlfname1 and not dlfname2: if dlfname1 or dlfname2:
return
of = self.report.create_file("download") of = self.report.create_file("download")
downloadpage, body = self.write_header(_('Download')) downloadpage, body = self.write_header(_('Download'))
@ -3433,7 +3432,6 @@ class DownloadPage(BasePage):
"below, clicking on them will allow you to download them.") "below, clicking on them will allow you to download them.")
download += Html("p", msg, id = "description") download += Html("p", msg, id = "description")
if dlfname1 or dlfname2:
# begin download table and table head # begin download table and table head
with Html("table", class_ = "infolist download") as table: with Html("table", class_ = "infolist download") as table:
download += table download += table
@ -3445,37 +3443,32 @@ class DownloadPage(BasePage):
thead += trow thead += trow
trow.extend( trow.extend(
Html("th", label, class_ = colclass, inline = True) Html("th", label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [ for (label, colclass) in [
(_("File Name"), "Filename"), (_("File Name"), "Filename"),
(DESCRHEAD, "Description"), (DESCRHEAD, "Description"),
(_("License"), "License"),
(_("Last Modified"), "Modified") ] (_("Last Modified"), "Modified") ]
) )
# if dlfname1 is not None, show it???
if dlfname1:
# table body # table body
tbody = Html("tbody") tbody = Html("tbody")
table += tbody table += tbody
# if dlfname1 is not None, show it???
if dlfname1:
trow = Html("tr", id = 'Row01') trow = Html("tr", id = 'Row01')
tbody += trow tbody += trow
fname = os.path.basename(dlfname1) fname = os.path.basename(dlfname1)
tcell = ( Html("td", class_ = "Filename") + tcell = ( Html("td", class_ = "ColumnFilename") +
Html("a", fname, href = dlfname1, alt = dldescr1) Html("a", fname, href = dlfname1, title = dldescr1)
) )
trow += tcell trow += tcell
dldescr1 = dldescr1 or " " 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 " " tcell = Html("td", class_ = "ColumnModified", inline = True)
trow += Html("td", copyright, class_ = "License")
tcell = Html("td", class_ = "Modified", inline = True)
trow += tcell trow += tcell
if os.path.exists(dlfname1): if os.path.exists(dlfname1):
modified = os.stat(dlfname1).st_mtime modified = os.stat(dlfname1).st_mtime
@ -3492,18 +3485,15 @@ class DownloadPage(BasePage):
tbody += trow tbody += trow
fname = os.path.basename(dlfname2) fname = os.path.basename(dlfname2)
tcell = ( Html("td", class_ = "Filename") + tcell = ( Html("td", class_ = "ColumnFilename") +
Html("a", fname, href = dlfname2, alt = dldescr2) Html("a", fname, href = dlfname2, alt = dldescr2)
) )
trow += tcell trow += tcell
dldescr2 = dldescr2 or " " 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 " " tcell = Html("td", id = 'Col04', class_ = "ColumnModified", inline = True)
trow += Html("td", copyright, class_ = "License", inline = True)
tcell = Html("td", id = 'Col04', class_ = "Modified", inline = True)
trow += tcell trow += tcell
if os.path.exists(dlfname2): if os.path.exists(dlfname2):
modified = os.stat(dlfname2).st_mtime modified = os.stat(dlfname2).st_mtime
@ -3512,6 +3502,13 @@ class DownloadPage(BasePage):
else: else:
tcell += " " 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 # clear line for proper styling
# create footer section # create footer section
footer = self.write_footer() footer = self.write_footer()