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

Added Locality to Addresses, Places, and ContactPage.

Browse Source 
svn: r16385
This commit is contained in:
Rob G. Healey 2011-01-15 07:23:06 +00:00
parent 45b1b97897
commit 51f239f53b
1 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -886,11 +886,12 @@ class BasePage(object):
addr_header = [ addr_header = [
[DHEAD, "Date"], [DHEAD, "Date"],
[STREET, "StreetAddress"], [STREET, "StreetAddress"],
[_("Locality"), "Locality"],
[CITY, "City"], [CITY, "City"],
[COUNTY, "County"],
[STATE, "State"], [STATE, "State"],
[COUNTRY, "Cntry"], [COUNTY, "County"],
[POSTAL, "Postalcode"], [POSTAL, "Postalcode"],
[COUNTRY, "Cntry"],
[PHONE, "Phone"] ] [PHONE, "Phone"] ]
# if showsrc = True -- an individual's address else repository # if showsrc = True -- an individual's address else repository
@ -898,7 +899,7 @@ class BasePage(object):
addr_header.append([SHEAD, "Sources"]) addr_header.append([SHEAD, "Sources"])
trow.extend( trow.extend(
Html("th", label, class_="Colummn" + colclass, inline = True) Html("th", label, class_ = "Colummn" + colclass, inline = True)
for (label, colclass) in addr_header for (label, colclass) in addr_header
) )
@ -915,11 +916,12 @@ class BasePage(object):
addr_data_row = [ addr_data_row = [
["Date", _dd.display(address.get_date_object() )], ["Date", _dd.display(address.get_date_object() )],
["Streetaddress", address.get_street()], ["Streetaddress", address.get_street()],
["Locality", address.get_locality()],
["City", address.get_city()], ["City", address.get_city()],
["State", address.get_state()],
["County", address.get_county()], ["County", address.get_county()],
["State/ Province", address.get_state()],
["Cntry", address.get_country()],
["Postslcode", address.get_postal_code()], ["Postslcode", address.get_postal_code()],
["Cntry", address.get_country()],
["Phone", address.get_phone()] ] ["Phone", address.get_phone()] ]
# get source citation list # get source citation list
@ -1959,16 +1961,17 @@ class BasePage(object):
if ml and not ml.is_empty(): if ml and not ml.is_empty():
for (label, data) in [ for (label, data) in [
(STREET, ml.street),
(CITY, ml.city),
(PARISH, ml.parish),
(COUNTY, ml.county),
(STATE, ml.state),
(POSTAL, ml.postal),
(COUNTRY, ml.country),
(LATITUDE, place.lat), (LATITUDE, place.lat),
(LONGITUDE, place.long), (LONGITUDE, place.long),
(ALT_LOCATIONS, place.get_alternate_locations() ) ]: (STREET, ml.street),
(_("Locality"), ml.locality),
(CITY, ml.city),
(PARISH, ml.parish),
(STATE, ml.state),
(COUNTY, ml.county),
(POSTAL, ml.postal),
(COUNTRY, ml.country),
(_("Telephone"), ml.phone) ]:
if data: if data:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True), Html("td", label, class_ = "ColumnAttribute", inline = True),
@ -1992,7 +1995,6 @@ class BasePage(object):
(STATE, loc.state), (STATE, loc.state),
(POSTAL, loc.postal), (POSTAL, loc.postal),
(COUNTRY, loc.country),]: (COUNTRY, loc.country),]:
if data: if data:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True), Html("td", label, class_ = "ColumnAttribute", inline = True),
@ -2000,6 +2002,7 @@ class BasePage(object):
) )
table += trow table += trow
table += Html("tr") + Html("td", " ", colspan = 2) table += Html("tr") + Html("td", " ", colspan = 2)
# return place table to its callers # return place table to its callers
return table return table
@ -3830,7 +3833,9 @@ class ContactPage(BasePage):
r.name = r.name.replace(',,,', '') r.name = r.name.replace(',,,', '')
researcher += Html("h3", r.name, inline = True) researcher += Html("h3", r.name, inline = True)
if r.addr: if r.addr:
researcher += Html("span", r.addr, id = 'streetaddress') researcher += Html("span", r.addr, id = 'streetaddress', inline = True)
if r.locality:
researcher += Html("span", r.locality, id = "locality", inline = True)
text = "".join([r.city, r.state, r.postal]) text = "".join([r.city, r.state, r.postal])
if text: if text:
city = Html("span", r.city, id = 'city', inline = True) city = Html("span", r.city, id = 'city', inline = True)