From 8aa44642a96ceb7d207d9ec839cafe74cd9559b2 Mon Sep 17 00:00:00 2001 From: Michiel Nauta Date: Sun, 10 Jul 2011 19:02:33 +0000 Subject: [PATCH] 5063: Mainz stylesheet bugs svn: r17914 --- src/plugins/webreport/NarrativeWeb.py | 243 +++++++++--------- src/plugins/webstuff/css/Mapstraction.css | 12 +- src/plugins/webstuff/css/Web_Basic-Ash.css | 5 +- src/plugins/webstuff/css/Web_Basic-Blue.css | 9 +- .../webstuff/css/Web_Basic-Cypress.css | 5 +- src/plugins/webstuff/css/Web_Basic-Lilac.css | 5 +- src/plugins/webstuff/css/Web_Basic-Peach.css | 5 +- src/plugins/webstuff/css/Web_Basic-Spruce.css | 5 +- src/plugins/webstuff/css/Web_Mainz.css | 9 +- src/plugins/webstuff/css/Web_Nebraska.css | 14 +- src/plugins/webstuff/css/Web_Visually.css | 10 +- 11 files changed, 176 insertions(+), 146 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index aefa22020..0d500dbe2 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1223,10 +1223,10 @@ class BasePage(object): ('events', _("Events"), self.report.inc_events), ('media', _("Media"), self.create_media), ('download', _("Download"), self.report.inc_download), - ('contact', _("Contact"), self.report.use_contact), ('sources', SHEAD, True), ('repositories', _("Repositories"), inc_repos), - ("addressbook", _("Address Book"), self.report.inc_addressbook) + ("addressbook", _("Address Book"), self.report.inc_addressbook), + ('contact', _("Contact"), self.report.use_contact), ] navigation = Html("div", id = 'navigation') @@ -1858,7 +1858,7 @@ class BasePage(object): thumbnail += hyper if usedescr: - hyper += Html("pre", name, inline = True) + hyper += Html("p", name, inline = True) # return thumbnail division to its callers return thumbnail @@ -4114,128 +4114,131 @@ class IndividualPage(BasePage): ymap = "large" ymap += "YMap" - # begin familymap division - with Html("div", class_ = "content", id = ymap) as mapbody: - body += mapbody + with Html("div", class_ = "content", id = "FamilyMapDetail") as mapbackground: + body += mapbackground - # page message - msg = _("The place markers on this page represent a different location " - "based upon your spouse, your children (if any), and your personal " - "events and their places. The list has been sorted in chronological " - "date order. Clicking on the place’s name in the References " - "will take you to that place’s page. Clicking on the markers " - "will display its place title.") - mapbody += Html("p", msg, id = "description") - - xmap = "" - if spanX in smallset: - xmap = "small" - elif spanX in middleset: - xmap = "middle" - elif spanX in largeset: - xmap = "large" - xmap += "XMap" - - # begin middle section division - with Html("div", id = xmap) as middlesection: - mapbody += middlesection - - # begin inline javascript code - # because jsc is a string, it does NOT have to properly indented - with Html("script", type = "text/javascript") as jsc: - middlesection += jsc - - jsc += """ - var map; - - function initialize() { - - // create map object - map = new mxn.Mapstraction('familygooglev3', 'googlev3'); - - // add map controls to image - map.addControls({ - pan: true, - zoom: 'large', - scale: true, - disableDoubleClickZoom: true, - keyboardShortcuts: true, - scrollwheel: false, - map_type: true - });""" - - for (lat, long, p, h, d) in place_lat_long: - jsc += """ add_markers(%s, %s, "%s");""" % ( lat, long, p ) - jsc += """ - }""" - - # if the span is larger than +- 42 which is the span of four(4) states in the USA - if spanY not in smallset and spanY not in middleset: - - # set southWest and northEast boundaries as spanY is greater than 20 + # begin familymap division + with Html("div", id = ymap) as mapbody: + mapbackground += mapbody + + # page message + msg = _("The place markers on this page represent a different location " + "based upon your spouse, your children (if any), and your personal " + "events and their places. The list has been sorted in chronological " + "date order. Clicking on the place’s name in the References " + "will take you to that place’s page. Clicking on the markers " + "will display its place title.") + mapbody += Html("p", msg, id = "description") + + xmap = "" + if spanX in smallset: + xmap = "small" + elif spanX in middleset: + xmap = "middle" + elif spanX in largeset: + xmap = "large" + xmap += "XMap" + + # begin middle section division + with Html("div", id = xmap) as middlesection: + mapbody += middlesection + + # begin inline javascript code + # because jsc is a string, it does NOT have to properly indented + with Html("script", type = "text/javascript") as jsc: + middlesection += jsc + jsc += """ - // boundary southWest equals bottom left GPS Coordinates - var southWest = new mxn.LatLonPoint(%s, %s);""" % (minX, minY) + var map; + + function initialize() { + + // create map object + map = new mxn.Mapstraction('familygooglev3', 'googlev3'); + + // add map controls to image + map.addControls({ + pan: true, + zoom: 'large', + scale: true, + disableDoubleClickZoom: true, + keyboardShortcuts: true, + scrollwheel: false, + map_type: true + });""" + + for (lat, long, p, h, d) in place_lat_long: + jsc += """ add_markers(%s, %s, "%s");""" % ( lat, long, p ) jsc += """ - // boundary northEast equals top right GPS Coordinates - var northEast = new mxn.LatLonPoint(%s, %s);""" % (maxX, maxY) + }""" + + # if the span is larger than +- 42 which is the span of four(4) states in the USA + if spanY not in smallset and spanY not in middleset: + + # set southWest and northEast boundaries as spanY is greater than 20 + jsc += """ + // boundary southWest equals bottom left GPS Coordinates + var southWest = new mxn.LatLonPoint(%s, %s);""" % (minX, minY) + jsc += """ + // boundary northEast equals top right GPS Coordinates + var northEast = new mxn.LatLonPoint(%s, %s);""" % (maxX, maxY) + jsc += """ + var bounds = new google.maps.LatLngBounds(southWest, northEast); + map.fitBounds(bounds);""" + + # include add_markers function jsc += """ - var bounds = new google.maps.LatLngBounds(southWest, northEast); - map.fitBounds(bounds);""" + function add_markers(latitude, longitude, title) { + + var latlon = new mxn.LatLonPoint(latitude, longitude); + var marker = new mxn.Marker(latlon); + + marker.setInfoBubble(title); + + map.addMarker(marker, true);""" + + # set zoomlevel for size of map + if spanY in smallset: + zoomlevel = 7 + elif spanY in middleset: + zoomlevel = 4 + elif spanY in largeset: + zoomlevel = 4 + else: + zoomlevel = 1 + + jsc += """ + map.setCenterAndZoom(latlon, %d); + }""" % zoomlevel + + # there is no need to add an ending "", + # as it will be added automatically! + + # here is where the map is held in the CSS/ Page + middlesection += Html("div", id = "familygooglev3", inline = True) + + # add fullclear for proper styling + middlesection += fullclear - # include add_markers function - jsc += """ - function add_markers(latitude, longitude, title) { - - var latlon = new mxn.LatLonPoint(latitude, longitude); - var marker = new mxn.Marker(latlon); - - marker.setInfoBubble(title); - - map.addMarker(marker, true);""" - - # set zoomlevel for size of map - if spanY in smallset: - zoomlevel = 7 - elif spanY in middleset: - zoomlevel = 4 - elif spanY in largeset: - zoomlevel = 4 - else: - zoomlevel = 1 - - jsc += """ - map.setCenterAndZoom(latlon, %d); - }""" % zoomlevel - - # there is no need to add an ending "", - # as it will be added automatically! - - # here is where the map is held in the CSS/ Page - middlesection += Html("div", id = "familygooglev3", inline = True) - - # add fullclear for proper styling - middlesection += fullclear - - with Html("div", class_ = "subsection", id = "References") as section: - body += section - section += Html("h4", _("References"), inline = True) - - ordered = Html("ol") - section += ordered - - # 0 = latitude, 1 = longitude, 2 = place title, 3 = handle, 4 = date - for (lat, long, pname, handle, date) in place_lat_long: - - list = Html("li", self.place_link(handle, pname, up = self.up)) - ordered += list - - if date: - ordered1 = Html("ol") - list += ordered1 - - list1 = Html("li", _dd.display(date), inline = True) - ordered1 += list1 + with Html("div", class_ = "subsection", id = "references") as section: + mapbackground += section + section += Html("h4", _("References"), inline = True) + + ordered = Html("ol") + section += ordered + + # 0 = latitude, 1 = longitude, 2 = place title, 3 = handle, 4 = date + for (lat, long, pname, handle, date) in place_lat_long: + + list = Html("li", self.place_link(handle, pname, up = self.up)) + ordered += list + + if date: + ordered1 = Html("ol") + list += ordered1 + + list1 = Html("li", _dd.display(date), inline = True) + ordered1 += list1 # add body onload to initialize map body.attr = 'onload = "initialize();" id = "FamilyMap"' diff --git a/src/plugins/webstuff/css/Mapstraction.css b/src/plugins/webstuff/css/Mapstraction.css index 5a4804993..a830683e6 100644 --- a/src/plugins/webstuff/css/Mapstraction.css +++ b/src/plugins/webstuff/css/Mapstraction.css @@ -26,7 +26,6 @@ ------------------------------------------------- */ body#FamilyMap { background-color: #FFF; - color: #000; margin: 0 auto; width: 1060px; padding: 0px 4px 0px 4px; @@ -83,11 +82,11 @@ div#middleYMap { } div#smallYMap { width: 800px; - margin: 0% 8% 0% 9%; + margin: 0px 8% 10px 9%; } div#YMap { width: 800px; - margin: 0% 8% 0% 9%; + margin: 0% 8% 10px 9%; } /* X Map Sizes @@ -112,10 +111,3 @@ div#familygooglev3 { width: 100%; border: double 4px #000; } - -/* Footer -------------------------------------------------- */ -div#footer a { - text-decoration: none; - color: #FFF; -} diff --git a/src/plugins/webstuff/css/Web_Basic-Ash.css b/src/plugins/webstuff/css/Web_Basic-Ash.css index 538650359..4ffd626ea 100644 --- a/src/plugins/webstuff/css/Web_Basic-Ash.css +++ b/src/plugins/webstuff/css/Web_Basic-Ash.css @@ -466,6 +466,9 @@ table.individuallist tbody tr td.ColumnName a:hover { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -693,7 +696,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Basic-Blue.css b/src/plugins/webstuff/css/Web_Basic-Blue.css index 8e9390019..00d592d43 100644 --- a/src/plugins/webstuff/css/Web_Basic-Blue.css +++ b/src/plugins/webstuff/css/Web_Basic-Blue.css @@ -508,6 +508,13 @@ div#IndividualDetail table.infolist tbody tr td.ColumnAttribute { div#IndividualDetail div.subsection table tr td:first-child { padding-left: 20px; } +#familymap a.familymap { + margin-left:20px; + text-decoration:none; +} +#familymap a.familymap:hover { + text-decoration:underline; +} /* Places ================================================= */ @@ -963,7 +970,7 @@ div.subsection { div.subsection h4 { margin-bottom: .5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size: .9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Basic-Cypress.css b/src/plugins/webstuff/css/Web_Basic-Cypress.css index b7cbbd116..a6d52d0be 100644 --- a/src/plugins/webstuff/css/Web_Basic-Cypress.css +++ b/src/plugins/webstuff/css/Web_Basic-Cypress.css @@ -463,6 +463,9 @@ table.individuallist tbody tr td.ColumnName a:hover { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -690,7 +693,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Basic-Lilac.css b/src/plugins/webstuff/css/Web_Basic-Lilac.css index a1212f3c1..901e578ab 100644 --- a/src/plugins/webstuff/css/Web_Basic-Lilac.css +++ b/src/plugins/webstuff/css/Web_Basic-Lilac.css @@ -464,6 +464,9 @@ table.individuallist tbody tr td.ColumnName a:hover { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -691,7 +694,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Basic-Peach.css b/src/plugins/webstuff/css/Web_Basic-Peach.css index 370e08850..ac3a67fcc 100644 --- a/src/plugins/webstuff/css/Web_Basic-Peach.css +++ b/src/plugins/webstuff/css/Web_Basic-Peach.css @@ -465,6 +465,9 @@ table.individuallist tbody tr td.ColumnName a:hover { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -692,7 +695,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Basic-Spruce.css b/src/plugins/webstuff/css/Web_Basic-Spruce.css index ba16f3daf..48f28d3e8 100644 --- a/src/plugins/webstuff/css/Web_Basic-Spruce.css +++ b/src/plugins/webstuff/css/Web_Basic-Spruce.css @@ -465,6 +465,9 @@ table.individuallist tbody tr td.ColumnName a:hover { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -692,7 +695,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Mainz.css b/src/plugins/webstuff/css/Web_Mainz.css index d8c0af463..b199c1406 100644 --- a/src/plugins/webstuff/css/Web_Mainz.css +++ b/src/plugins/webstuff/css/Web_Mainz.css @@ -458,7 +458,7 @@ table.individuallist tbody tr td.ColumnName a { /* IndividualDetail ------------------------------------------------------ */ #IndividualDetail { - background:url(../images/Web_Mainz_MidLight.png) #FFF2C6; + background:url(../images/Web_Mainz_Mid.png) #FFF2C6; } #IndividualDetail div table.infolist tr td { font:normal .9em/1.2em sans-serif; @@ -477,6 +477,9 @@ table.individuallist tbody tr td.ColumnName a { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -682,7 +685,7 @@ table.download td.Modified { min-height:500px; padding:1.5em 0 3em 0; } -#Home p, #Introduction p, #Surnames p, #Individuals p, #Sources p, #Places p, #Gallery p, { +#Home p, #Introduction p, #Surnames p, #Individuals p, #Sources p, #Places p, #Gallery p, #Contact p{ margin:0 20px 1em 20px; padding-top:1em; } @@ -701,7 +704,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { diff --git a/src/plugins/webstuff/css/Web_Nebraska.css b/src/plugins/webstuff/css/Web_Nebraska.css index 05c98cbef..07e987ebe 100644 --- a/src/plugins/webstuff/css/Web_Nebraska.css +++ b/src/plugins/webstuff/css/Web_Nebraska.css @@ -455,6 +455,9 @@ table.individuallist tbody tr td.ColumnName a:hover { #IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; +} /* Sources ----------------------------------------------------- */ @@ -466,7 +469,6 @@ table.individuallist tbody tr td.ColumnName a:hover { padding:0; } #Sources table.infolist tbody tr td.ColumnName a { - font-size:.9em; padding:.1em 10px .3em 10px; } #Sources table.infolist tbody tr td.ColumnName a:hover { @@ -690,7 +692,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a { @@ -937,7 +939,7 @@ div#pedigree { font-size: 12px; line-height: 130%; font-family: sans-serif; - color: #FFF; + color: #C1B398; margin: 0; padding: 0; background-color: #542; @@ -945,7 +947,7 @@ div#pedigree { } #footer a, #footer a:visited { text-decoration: none; - color: #FFF; + color: #C1B398; } #footer a:hover { text-decoration: underline; @@ -960,13 +962,13 @@ div#pedigree { width: 40%; text-align: left; margin-left: 10px; - color: #FFF; + color: #C1B398; } #footer p#copyright { float: right; width: 40%; text-align: right; - color: #FFF; + color: #C1B398; margin-right: 10px; } #footer p#copyright img { diff --git a/src/plugins/webstuff/css/Web_Visually.css b/src/plugins/webstuff/css/Web_Visually.css index a82ef241e..a82cd12ea 100644 --- a/src/plugins/webstuff/css/Web_Visually.css +++ b/src/plugins/webstuff/css/Web_Visually.css @@ -509,6 +509,14 @@ div#IndividualDetail table.infolist tbody tr td.ColumnAttribute { div#IndividualDetail div.subsection table tr td:first-child { padding-left:20px; } +#familymap a.familymap { + margin-left:20px; + text-decoration:none; + color:rgb(0,0,0); +} +#familymap a.familymap:hover { + text-decoration:underline; +} /* Places ----------------------------------------------------- */ @@ -935,7 +943,7 @@ div.subsection{ div.subsection h4 { margin-bottom:.5em; } -div.subsection table, div.subsection ol, div.subsection p { +div.subsection table, div.subsection ol, div.subsection p, div.subsection > a { font-size:.9em; } div.subsection a {