diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css index dadaab7d8..cf2e81b6e 100644 --- a/src/data/Web_Basic-Ash.css +++ b/src/data/Web_Basic-Ash.css @@ -1137,27 +1137,24 @@ body#WebCal #CreatorInfo { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #7D5925; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { +body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; -} diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index 678da82b7..1a64c128a 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -1135,27 +1135,24 @@ body#WebCal #CreatorInfo { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #7D5925; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { +body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; -} diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index 260a79fc1..d73fa6b62 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -1136,27 +1136,24 @@ body#WebCal #CreatorInfo { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #7D5925; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { +body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; -} diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css index 0a14b2a42..4b77ca01b 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -1136,27 +1136,24 @@ body#WebCal #CreatorInfo { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #7D5925; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { + body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; -} diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index ce72523ee..dce62cd63 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -1114,28 +1114,25 @@ div#sourcerefs ol li ol { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; background:url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #7D5925; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { +body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; -} diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index 1e8dccd78..b6745099c 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -1174,27 +1174,24 @@ body#WebCal { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #7D5925; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { +body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; -} diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index 97362ab56..38c7d4c6a 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -1185,27 +1185,30 @@ body#WebCal { } /* Calendar : Full Year */ -body#fullyear div.content, body#fullyearlinked div.content { +body#fullyearlinked div.content { width:963px; margin:0 auto; padding:15px 0 2px 2px; } -body#fullyear table.calendar, body#fullyearlinked table.calendar { +body#fullyearlinked table.calendar { float:left; width:320px; height:18em; border:solid 1px #453619; } -body#fullyear table.calendar thead tr th, body#fullyearlinked table.calendar thead tr th { +body#fullyearlinked table.calendar thead tr th { height:2em; } -body#fullyear table.calendar thead tr th.monthName, body#fullyearlinked table.calendar thead tr th.monthName { +body#fullyearlinked table.calendar thead tr th.monthName { font-size:1.2em; padding:2px 0; } -body#fullyear table.calendar tbody tr td, body#fullyearlinked table.calendar tbody tr td { +body#fullyearlinked table.calendar tbody tr td { height:3em; } -body#fullyear table.calendar tfoot tr td, body#fullyearlinked table.calendar tfoot tr td { - display:none; +body#fullyearlinked table.calendar tbody tr td.saturday { + border-right:solid 2px #000; +} +body#fullyearlinked able.calendar tbody tr td.sunday { + border:solid 2px #000; } diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index 987c34563..ba025d892 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -494,8 +494,6 @@ class WebCalReport(Report): # identify currentsection for proper highlighting self.display_month_navs(of, nr_up, year, currentsection, use_home) - of.write('
%s
\n' % msg) + + # close page description division + of.write('\n') # generate progress pass for "Year At A Glance" self.progress.set_pass(_('Creating Year At A Glance calendar'), 12) @@ -867,15 +867,8 @@ class WebCalReport(Report): # build the calendar self.calendar_build(of, "yg", year, month) - # create note section for "Year At A Glance" - note = self.month_notes[month-1].strip() - note = note or " " - of.write('\t\n') - of.write('\t\t