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

Fixed an error in the __create_family_map(), and fixed an error in display_ind_sources().

Browse Source 
svn: r18268
This commit is contained in:
Rob G. Healey 2011-10-09 19:19:04 +00:00
parent 1ca2b92ea9
commit 40a0a21765
4 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1756,9 +1756,9 @@ class BasePage(object):
# return section to its caller # return section to its caller
return section 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 return None
# begin references division and title # begin references division and title
@ -1767,15 +1767,15 @@ class BasePage(object):
ordered = Html("ol") ordered = Html("ol")
section += ordered 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: for (path, name, gid) in sortlist:
list = Html("li") list = Html("li")
ordered += list ordered += list
# Note. 'path' already has a filename extension # Note. 'path' already has a filename extension
url = self.report.build_url_fname(path, None, self.up) url = self.report.build_url_fname(path, up =self.up)
list += self.person_link(url, name or _UNKNOWN, None, gid = gid) list += self.person_link(url, name or _("Unknown"), None, gid =gid)
# return references division to its caller # return references division to its caller
return section 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)] 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): if (spany in tinyset or spany in smallset):
zoomlevel = 7 zoomlevel = 6
elif spany in middleset: elif spany in middleset:
zoomlevel = 5 zoomlevel = 5
elif spany in largeset: elif spany in largeset:
@ -4311,9 +4311,6 @@ class IndividualPage(BasePage):
list1 = Html("li", _dd.display(date), inline =True) list1 = Html("li", _dd.display(date), inline =True)
ordered1 += list1 ordered1 += list1
# add body id for this page...
body.attr = 'id ="FamilyMap" '
# add body onload to initialize map for Google Maps only... # add body onload to initialize map for Google Maps only...
if self.mapservice == "Google": if self.mapservice == "Google":
body.attr += 'onload ="initialize()"' body.attr += 'onload ="initialize()"'
@ -7128,13 +7125,13 @@ def _has_webpage_extension(url):
""" """
return any(url.endswith(ext) for ext in _WEB_EXT) 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 This will sort a list of child handles in birth order
""" """
sortable_individuals = [] sortable_individuals = []
for handle in handlelist: for handle in handle_list:
person = db.get_person_from_handle(handle) person = db.get_person_from_handle(handle)
# get birth date: if birth_date equals nothing, then generate a fake one? # get birth date: if birth_date equals nothing, then generate a fake one?

10
src/plugins/webstuff/css/Web_Basic-Blue.css
View File

@ -42,16 +42,8 @@ Unknown #000
===== Web Graphics ===== ===== Web Graphics =====
Males Web_Gender_Male.png Males Web_Gender_Male.png
Females Web_Gender_Female.png Females Web_Gender_Female.png
*/
/* NarrativeWeb Styles Menu Colorized Elements
================================================= */
body {
background-color: #000;
color: #FFF;
}
/* Menu Elements
================================================= */ ================================================= */
div#navigation ul, div#subnavigation ul { div#navigation ul, div#subnavigation ul {
background-color: Navy; background-color: Navy;

6
src/plugins/webstuff/css/Web_Navigation-Horizontal.css
View File

@ -25,14 +25,16 @@ GRAMPS Cascading Style Sheet
Style Name: Web_Navigation-Horizontal.css Style Name: Web_Navigation-Horizontal.css
*************************************************************************************************** ***************************************************************************************************
# $Id: $ # $Id$
Body Element Body Element
----------------------------------------------------- */ ----------------------------------------------------- */
body { body {
background-color: #000;
color: #FFF;
margin: 0 auto; margin: 0 auto;
padding: 5px 2px 5px 2px; padding: 5px 2px 5px 2px;
width: 965px; width: 100%;
} }
/* Navigation /* Navigation

16
src/plugins/webstuff/css/narrative-maps.css
View File

@ -21,16 +21,7 @@
# #
# $Id$ # $Id$
# #
# geo-info Bubble
Family Map body element
------------------------------------------------- */
body#FamilyMap {
margin-left: 2px;
margin-right: 2px;
background-color: #FFF;
}
/* geo-info Bubble
------------------------------------------------- */ ------------------------------------------------- */
div#geo-info { div#geo-info {
font: bold 11px sans-serif; font: bold 11px sans-serif;
@ -39,9 +30,8 @@ div#geo-info {
/* map_canvas-- place map holder /* map_canvas-- place map holder
------------------------------------------------- */ ------------------------------------------------- */
div#map_canvas { div#map_canvas {
margin: 5px; border: solid 2px #00029D;
border: solid 4px #00029D; width: 99%;
width: 98%;
height: 800px; height: 800px;
} }