Fixed an error in the __create_family_map(), and fixed an error in display_ind_sources().
svn: r18268
This commit is contained in:
parent
1ca2b92ea9
commit
40a0a21765
@ -1756,9 +1756,9 @@ class BasePage(object):
|
||||
# return section to its caller
|
||||
return section
|
||||
|
||||
def display_references(self, handlelist, up = False):
|
||||
def display_references(self, handle_list, up = False):
|
||||
|
||||
if not handlelist:
|
||||
if not handle_list:
|
||||
return None
|
||||
|
||||
# begin references division and title
|
||||
@ -1767,15 +1767,15 @@ class BasePage(object):
|
||||
|
||||
ordered = Html("ol")
|
||||
section += ordered
|
||||
sortlist = sorted(handlelist, key=lambda x:locale.strxfrm(x[1]))
|
||||
sortlist = sorted(handle_list, key = lambda x:locale.strxfrm(x[1]))
|
||||
|
||||
for (path, name, gid) in sortlist:
|
||||
list = Html("li")
|
||||
ordered += list
|
||||
|
||||
# Note. 'path' already has a filename extension
|
||||
url = self.report.build_url_fname(path, None, self.up)
|
||||
list += self.person_link(url, name or _UNKNOWN, None, gid = gid)
|
||||
url = self.report.build_url_fname(path, up =self.up)
|
||||
list += self.person_link(url, name or _("Unknown"), None, gid =gid)
|
||||
|
||||
# return references division to its caller
|
||||
return section
|
||||
@ -4075,7 +4075,7 @@ class IndividualPage(BasePage):
|
||||
largeset = [value for value in (-11, -12, -13, -14, -15, -16, -17, 11, 12, 13, 14, 15, 16, 17)]
|
||||
|
||||
if (spany in tinyset or spany in smallset):
|
||||
zoomlevel = 7
|
||||
zoomlevel = 6
|
||||
elif spany in middleset:
|
||||
zoomlevel = 5
|
||||
elif spany in largeset:
|
||||
@ -4311,12 +4311,9 @@ class IndividualPage(BasePage):
|
||||
list1 = Html("li", _dd.display(date), inline =True)
|
||||
ordered1 += list1
|
||||
|
||||
# add body id for this page...
|
||||
body.attr = 'id ="FamilyMap" '
|
||||
|
||||
# add body onload to initialize map for Google Maps only...
|
||||
if self.mapservice == "Google":
|
||||
body.attr += ' onload ="initialize()" '
|
||||
body.attr += 'onload ="initialize()"'
|
||||
|
||||
# add clearline for proper styling
|
||||
# add footer section
|
||||
@ -6304,7 +6301,7 @@ class NavWebReport(Report):
|
||||
raise AttributeError("unknown object type '%s'" % obj_class)
|
||||
return self.build_url_fname(handle, subdir, up) + self.ext
|
||||
|
||||
def build_url_fname(self, fname, subdir = None, up = False):
|
||||
def build_url_fname(self, fname, subdir =None, up =False):
|
||||
"""
|
||||
Create part of the URL given the filename and optionally the subdirectory.
|
||||
If the subdirectory is given, then two extra levels of subdirectory are inserted
|
||||
@ -7128,13 +7125,13 @@ def _has_webpage_extension(url):
|
||||
"""
|
||||
return any(url.endswith(ext) for ext in _WEB_EXT)
|
||||
|
||||
def add_birthdate(db, handlelist):
|
||||
def add_birthdate(db, handle_list):
|
||||
"""
|
||||
This will sort a list of child handles in birth order
|
||||
"""
|
||||
|
||||
sortable_individuals = []
|
||||
for handle in handlelist:
|
||||
for handle in handle_list:
|
||||
person = db.get_person_from_handle(handle)
|
||||
|
||||
# get birth date: if birth_date equals nothing, then generate a fake one?
|
||||
|
@ -42,16 +42,8 @@ Unknown #000
|
||||
===== Web Graphics =====
|
||||
Males Web_Gender_Male.png
|
||||
Females Web_Gender_Female.png
|
||||
*/
|
||||
|
||||
/* NarrativeWeb Styles
|
||||
================================================= */
|
||||
body {
|
||||
background-color: #000;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
/* Menu Elements
|
||||
Menu Colorized Elements
|
||||
================================================= */
|
||||
div#navigation ul, div#subnavigation ul {
|
||||
background-color: Navy;
|
||||
|
@ -25,14 +25,16 @@ GRAMPS Cascading Style Sheet
|
||||
Style Name: Web_Navigation-Horizontal.css
|
||||
***************************************************************************************************
|
||||
|
||||
# $Id: $
|
||||
# $Id$
|
||||
|
||||
Body Element
|
||||
----------------------------------------------------- */
|
||||
body {
|
||||
background-color: #000;
|
||||
color: #FFF;
|
||||
margin: 0 auto;
|
||||
padding: 5px 2px 5px 2px;
|
||||
width: 965px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* Navigation
|
||||
|
@ -21,16 +21,7 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
#
|
||||
Family Map body element
|
||||
------------------------------------------------- */
|
||||
body#FamilyMap {
|
||||
margin-left: 2px;
|
||||
margin-right: 2px;
|
||||
background-color: #FFF;
|
||||
}
|
||||
|
||||
/* geo-info Bubble
|
||||
geo-info Bubble
|
||||
------------------------------------------------- */
|
||||
div#geo-info {
|
||||
font: bold 11px sans-serif;
|
||||
@ -39,9 +30,8 @@ div#geo-info {
|
||||
/* map_canvas-- place map holder
|
||||
------------------------------------------------- */
|
||||
div#map_canvas {
|
||||
margin: 5px;
|
||||
border: solid 4px #00029D;
|
||||
width: 98%;
|
||||
border: solid 2px #00029D;
|
||||
width: 99%;
|
||||
height: 800px;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user