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

3944: [NarWeb] Alternate Locations on places site in web report vers. 3.2.2

Browse Source 
svn: r15875
This commit is contained in:
Benny Malengier 2010-09-11 15:17:04 +00:00
parent c1137c79e5
commit 3e6fa30d60
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ DESCRHEAD = _("Description")
_EVENT = _("Event") _EVENT = _("Event")
GRAMPSID = _("Gramps ID") GRAMPSID = _("Gramps ID")
LATITUDE = _("Latitude") LATITUDE = _("Latitude")
LOCATIONS = _("Alternate Locations") ALT_LOCATIONS = _("Alternate Locations")
LONGITUDE = _("Longitude") LONGITUDE = _("Longitude")
NHEAD = _("Notes") NHEAD = _("Notes")
PARENTS = _("Parents") PARENTS = _("Parents")
@ -1902,8 +1902,7 @@ class BasePage(object):
(COUNTY, ml.county), (COUNTY, ml.county),
(STATE, ml.state), (STATE, ml.state),
(POSTAL, ml.postal), (POSTAL, ml.postal),
(COUNTRY, ml.country), (COUNTRY, ml.country),]:
(LOCATIONS, place.get_alternate_locations() ) ]:
if val[1]: if val[1]:
trow = Html("tr") + ( trow = Html("tr") + (
@ -1912,6 +1911,31 @@ class BasePage(object):
) )
table += trow table += trow
altloc = place.get_alternate_locations()
if altloc:
table += Html("tr") + Html("td", " ", colspan = 2)
trow = Html("tr") + (
Html("th", ALT_LOCATIONS, colspan = 2, class_ = "ColumnAttribute", inline = True),
)
table += trow
for loc in (nonempt for nonempt in altloc if not nonempt.is_empty()):
for (label, data) in [
(STREET, loc.street),
(CITY, loc.city),
(PARISH, loc.parish),
(COUNTY, loc.county),
(STATE, loc.state),
(POSTAL, loc.postal),
(COUNTRY, loc.country),]:
if data:
trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True),
Html("td", data, class_ = "ColumnValue", inline = True)
)
table += trow
table += Html("tr") + Html("td", " ", colspan = 2)
# return place table to its caller # return place table to its caller
return table return table