diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css index df40f44b4..ead07b9ea 100644 --- a/src/data/Web_Basic-Cypress.css +++ b/src/data/Web_Basic-Cypress.css @@ -157,9 +157,12 @@ a:visited { /* Header ----------------------------------------------------- */ -#header { +div#header { background-color:#454; } +div#header a { + color: #FFF; +} #SiteTitle { margin:0; padding:.5em 0 0.5em 10px; @@ -176,12 +179,14 @@ a:visited { /* Footer ----------------------------------------------------- */ + div#footer { width: 100%; font-size: 12px; + height: 60px; color: #E8E6E8; - BORDER-TOP: SOLID 1PX #454; - BACKGROUND-COLOR: #454; + border-top: solid 1px #454; + background-color: #454; } #footer a, #footer a:visited { text-decoration:none; diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index 09bc84a92..1090b100a 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -1129,6 +1129,7 @@ div#sourcerefs ol li ol { #footer { clear:both; width:100%; + height: 60px; font-size:12px; line-height:130%; color:#2E2E61; diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index 2a531cdd9..d835e1525 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -1129,6 +1129,7 @@ div#sourcerefs ol li ol { #footer { clear:both; width:100%; + height: 60px; 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 064c5a485..afe2c7478 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -1129,6 +1129,7 @@ div#sourcerefs ol li ol { #footer { clear:both; width:100%; + height: 60px; font-size:12px; line-height:130%; color:#204D91; diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index c0d501559..355dfe2fc 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -65,7 +65,7 @@ body { color:#7D5925; margin:0; padding:0; - background:url(../images/Web_Mainz_Bkgd.png) #000 repeat; + background:url(../images/Web_Mainz_Bkgd.png) #FFF2C6 repeat; } div { margin:0; @@ -1116,16 +1116,19 @@ div#sourcerefs ol li ol { #footer { clear:both; width:965px; + height: 60px; font-size:12px; line-height:130%; font-family:sans-serif; margin:0 auto; padding:15px 0 0 0; + color: #000; background:url(../images/Web_Mainz_MidLight.png) #FFF2C6; border-top:dashed 1px #7D5925; } #footer a, #footer a:visited { text-decoration:none; + color: #000; } #footer a:hover { text-decoration:underline; @@ -1276,8 +1279,9 @@ div#sourcerefs ol li ol { .calendar tbody tr td ul li span.yearsmarried em { color:#453619; } -.calendar tbody tr td.highlight { - +.calendar tbody tr td.highlight { } +.calendar tbody tr td.EmptyDays { + background-color: #FFF2C6; } .calendar tbody tr td.highlight div.date { color:#767D25; @@ -1317,3 +1321,6 @@ body#fullyearlinked table.calendar thead tr th.monthName { body#fullyearlinked table.calendar tbody tr td { height:3em; } +body#OneDay { + background:url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat; +} diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index 0777ae674..660f75418 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -1154,6 +1154,7 @@ div#pedigree { #footer { clear:both; width:100%; + height: 60px; font-size:12px; line-height:130%; font-family:sans-serif; diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index dfd5ed0a8..c836a68e4 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -289,9 +289,6 @@ div#navigation ul, div#subnavigation ul { div#navigation ul li, div#subnavigation ul li { float:left; } -body#WebCal divdiv#navigation ul li a { - color: #FFF; -} div#navigation ul li a, div#subnavigation ul li a { display: block; padding: 12px 10px 14px 1px; @@ -1364,8 +1361,7 @@ div#pedigree { -------------------------------------------------------------------------------------------- */ /* Calendar : General */ body#WebCal { - padding: 98px 14px 0px 14px; - background-color: #542; + background-color: #FFF; } .calendar { empty-cells:show; @@ -1508,7 +1504,7 @@ body#WebCal { /* Calendar : Full Year */ body#fullyearlinked { - padding: 98px 0px 0px 0px; + background-color: #FFF; } body#fullyearlinked div.content { width:963px; @@ -1544,8 +1540,3 @@ body#fullyearlinked table.calendar tbody tr td.saturday { body#fullyearlinked able.calendar tbody tr td.sunday { border:solid 2px #000; } - -/* Calendar : One Day */ -body#OneDay { - padding: 170px 0px 0px 0px; -} diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index 5f647e267..5b926ddc1 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -153,6 +153,7 @@ class WebCalReport(Report): self.today = date.Today() self.warn_dir = True # Only give warning once. + self.link_to_narweb = mgobn('link_to_narweb') self.narweb_prefix = mgobn('prefix') @@ -809,7 +810,7 @@ class WebCalReport(Report): tcell += unordered for nyears, date, text, event in day_list: - unordered += Html("li", text, inline=False if event == 'Anniversary' + unordered += Html("li", text, inline = False if event == 'Anniversary' else True) # no events for this day @@ -1040,14 +1041,13 @@ class WebCalReport(Report): # set date display as in user prevferences pg_date = _dd.display(event_date) - body += Html('h3', pg_date, inline = True) + body += Html("h3", pg_date, inline = True) # list the events - ordered = Html('ol') + ordered = Html("ol") body += ordered for nyears, date, text, event in day_list: - ordered += Html("li", text, inline=False if event == 'Anniversary' - else True) + ordered += Html("li", text, inline = False if event == 'Anniversary' else True) # create blank line for stylesheets # write footer section @@ -1193,6 +1193,8 @@ class WebCalReport(Report): short_name = self.get_name(person, father_surname) alive = probably_alive(person, self.database, prob_alive_date) if (self.alive and alive) or not self.alive: + + # add link to NarrativeWeb if self.link_to_narweb: text = Html('a', short_name, href=self.build_url_fname_html(person.handle, 'ppl', @@ -1817,7 +1819,7 @@ def get_day_list(event_date, holiday_list, bday_anniv_list): + '') # an anniversary - else: + elif event == "Anniversary": if nyears == 0: txt_str = _('%(couple)s, wedding') % { @@ -1833,11 +1835,10 @@ def get_day_list(event_date, holiday_list, bday_anniv_list): day_list.append((nyears, date, txt_str, event)) # a holiday - # will force holidays to be on top nyears = 0 for text, event, date in holiday_list: - day_list.append((nyears, date, text, event)) + day_list.append((nyears, date, text, event)) # sort them based on number of years # holidays will always be on top of event list