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

Beg#4601: Fixed and cleanup for NarrativeWeb for W3C compliance; IndividualPages still have errors in the Pedigree section -- this will require more than a simple tweak of code or style sheet elements.

Browse Source 
svn: r16588
This commit is contained in:
Rob G. Healey 2011-02-07 09:07:49 +00:00
parent aa04f08668
commit fc9001632d
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,7 @@ DESCRHEAD = _("Description")
_EVENT = _("Event") _EVENT = _("Event")
GRAMPSID = _("Gramps ID") GRAMPSID = _("Gramps ID")
LATITUDE = _("Latitude") LATITUDE = _("Latitude")
LOCALITY = _("Locality")
LONGITUDE = _("Longitude") LONGITUDE = _("Longitude")
NHEAD = _("Notes") NHEAD = _("Notes")
PARENTS = _("Parents") PARENTS = _("Parents")
@ -835,7 +836,9 @@ class BasePage(object):
display a person's or repository's addresses ... display a person's or repository's addresses ...
@param: addrlist -- a list of address handles @param: addrlist -- a list of address handles
@param: showsrc -- whether to show sources or not? @param: showsrc -- True = show sources
False = do not show sources
None = djpe
""" """
if not addrlist: if not addrlist:
@ -857,9 +860,9 @@ class BasePage(object):
and source references. and source references.
@param: addrlist = either person or repository address list @param: addrlist = either person or repository address list
@param: showsrc = True -- person @param: showsrc = True -- person and their sources
False -- repository False -- repository with no sources
None -- do not show sources None -- Address Book address with sources
""" """
# begin summaryarea division # begin summaryarea division
with Html("div", id = "summaryarea") as summaryarea: with Html("div", id = "summaryarea") as summaryarea:
@ -894,8 +897,8 @@ class BasePage(object):
[COUNTRY, "Cntry"], [COUNTRY, "Cntry"],
[PHONE, "Phone"] ] [PHONE, "Phone"] ]
# if showsrc = True -- an individual's address else repository # True, False, or None ** see docstring for explanation
if showsrc: if showsrc in [True, None]:
addr_header.append([SHEAD, "Sources"]) addr_header.append([SHEAD, "Sources"])
trow.extend( trow.extend(
@ -925,7 +928,7 @@ class BasePage(object):
["Phone", address.get_phone()] ] ["Phone", address.get_phone()] ]
# get source citation list # get source citation list
if showsrc: if showsrc in [True, None]:
addr_data_row.append(["Sources", self.get_citation_links( addr_data_row.append(["Sources", self.get_citation_links(
address.get_source_references() )]) address.get_source_references() )])
@ -1659,17 +1662,15 @@ class BasePage(object):
# Web Site address # Web Site address
elif _type == UrlType.WEB_HOME: elif _type == UrlType.WEB_HOME:
if not (uri.startswith("http://") or if not (uri.startswith("http://") or uri.startswith("https://")):
uri.startswith("https://")):
uri = "http://%(website)s" % { "website" : uri } uri = "http://%(website)s" % { "website" : uri }
# FTP server address # FTP server address
elif _type == UrlType.WEB_FTP: elif _type == UrlType.WEB_FTP:
if not (uri.startswith("ftp://") or if not (uri.startswith("ftp://") or uri.startswith("ftps://")):
uri.startswith("ftps://")):
uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri } uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri }
uri = Html("a", uri, href = uri, title = html_escape(uri)) uri = Html("a", uri, href = uri, title = html_escape(descr))
trow.extend( trow.extend(
Html("td", data, class_ = "Column" + colclass, inline = True) Html("td", data, class_ = "Column" + colclass, inline = True)
for (data, colclass) in [ for (data, colclass) in [
@ -1962,7 +1963,7 @@ class BasePage(object):
(LATITUDE, place.lat), (LATITUDE, place.lat),
(LONGITUDE, place.long), (LONGITUDE, place.long),
(STREET, ml.street), (STREET, ml.street),
(_("Locality"), ml.locality), (LOCALITY, ml.locality),
(CITY, ml.city), (CITY, ml.city),
(PARISH, ml.parish), (PARISH, ml.parish),
(STATE, ml.state), (STATE, ml.state),
@ -2626,8 +2627,7 @@ class PlacePage(BasePage):
var marker = new mxn.Marker(home); var marker = new mxn.Marker(home);
// add marker InfoBubble() place name // add marker InfoBubble() place name
marker.setInfoBubble('<div id = "geo-info" >%s</div>'); """ \ hrp-infoInfoBubble('%s'); """ % self.page_title
% self.page_title
jsc += """ jsc += """
// add marker to map // add marker to map
@ -4171,7 +4171,7 @@ class IndividualPage(BasePage):
var latlon = new mxn.LatLonPoint(latitude, longitude); var latlon = new mxn.LatLonPoint(latitude, longitude);
var marker = new mxn.Marker(latlon); var marker = new mxn.Marker(latlon);
marker.setInfoBubble('<div id="geo-info">' + title + '</div>'); marker.setInfoBubble(title);
map.addMarker(marker, true);""" map.addMarker(marker, true);"""
@ -5527,7 +5527,7 @@ class AddressBookPage(BasePage):
# individual has an address # individual has an address
if has_add: if has_add:
addressbookdetail += self.display_addr_list(has_add, True) addressbookdetail += self.display_addr_list(has_add, None)
# individual has a residence # individual has a residence
if has_res: if has_res: