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

Fixes the problem with Ancestor Tree -- unlinked persons only being listed without any styling.

Browse Source 
svn: r11863
This commit is contained in:
Rob G. Healey
2009-02-05 06:17:34 +00:00
parent 28dce4cfcb
commit dbabadbf05
2 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/data/Web_Visually.css
View File

@@ -11,7 +11,7 @@ http://www.gramps-project.org
--------------------------------------------------------------------------------------------------
GRAMPS is a Free Software Project for Genealogy, offering a professional genealogy program,
and a wiki open to all. It is a community project, created, developed and governed by genealogists.
/*
Go to http://gramps-project.org to learn more!
--------------------------------------------------------------------------------------------------
@@ -47,15 +47,14 @@ Unknown #000
Males Web_Gender_Male.png
Females Web_Gender_Female.png
NarrativeWeb Styles
-------------------------------------------------------------------------------------------- */
/* General Elements
-----------------------------------------------------
# $Id$
*/
NarrativeWeb Styles
--------------------------------------------------------------------------------------------
General Elements
----------------------------------------------------- */
body {
color:#000;
margin:0;
@@ -131,11 +130,11 @@ h3 {
}
h4 {
font:normal 1.2em/1.2em serif;
color:$FFF;
color:#FFF;
margin:0;
padding:.2em 0 .2em 20px;
background-color:#C1B398;
border-bottom:solid 1px #453619;
background-color:#453619;
border-bottom:solid 1px #6AF364;
}
h5, h6 {
font:normal 1em/1.2em serif;
@@ -878,6 +877,25 @@ div#pedigree {
padding:0;
background:none;
}
#tree #treeContainer div.boxbg span.unlinked {
position:absolute;
margin:0;
padding:0;
height:40px;
width:174px;
border:1px solid #000;
text-align:center;
}
#treeContainer div.male span.unlinked {
background:url(../images/Web_Gender_Male.png) #BCEAF6 no-repeat top right;
}
#treeContainer div.female span.unlinked {
background:url(../images/Web_Gender_Female.png) #FFC0CB no-repeat top right;
}
#treeContainer div.unknown span.unlinked {
background-color:#000;
color:#FFF;
}
#treeContainer div.boxbg a {
position:relative;
z-index:10;

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

@@ -102,8 +102,6 @@ from gen.lib.eventroletype import EventRoleType
# constants
#
#------------------------------------------------------------------------
_PERSON = 0
_PLACE = 1
_INCLUDE_LIVING_VALUE = 99 # Arbitrary number
_NAME_COL = 3
@@ -348,24 +346,25 @@ class BasePage:
# Link to css behaviours
fname = os.path.join("styles", "behaviour.css")
url = self.report.build_url_fname(fname, None, self.up)
of.write('\t<link href="%s" rel="stylesheet" type="text/css" '
'media="screen" />\n' % url)
of.write('\t<link href="%s" rel="stylesheet" \n'
'\t\ttype="text/css" media="screen">\n' % url)
# Link to screen stylesheet
fname = os.path.join("styles", self.report.css)
url = self.report.build_url_fname(fname, None, self.up)
of.write('\t<link href="%s" rel="stylesheet" type="text/css" '
'media="screen" />\n' % url)
of.write('\t<link href="%s" rel="stylesheet" \n'
'\t\ttype="text/css" media="screen" />\n' % url)
# Link to printer stylesheet
fname = os.path.join("styles", "Web_Print-Default.css")
url = self.report.build_url_fname(fname, None, self.up)
of.write('\t<link href="%s" rel="stylesheet" type="text/css" '
'media="print" />\n' % url)
of.write('\t<link href="%s" rel="stylesheet" \n'
'\t\ttype="text/css" media="print" />\n' % url)
# Link to GRAMPS favicon
url = self.report.build_url_image('favicon.ico', 'images', self.up)
of.write('\t<link href="%s" rel="Shortcut Icon" />\n' % url)
of.write('\t<link href="%s" rel="Shortcut Icon"\n'
'\t\ttype="image/icon">\n' % url)
of.write('</head>\n\n')
of.write('<body id="NarrativeWeb">\n') # Terminated in write_footer()
@@ -1902,9 +1901,9 @@ class IndividualPage(BasePage):
url = self.report.build_url_fname_html(person.handle, 'ppl', True)
self.person_link(of, url, person_name, thumbnailUrl=thumbnailUrl)
else:
of.write('<span>')
of.write('<span class="unlinked">')
of.write(_nd.display(person))
of.write('</span>\n')
of.write('</span>')
of.write('\n\t\t\t</div>\n')
of.write('\t\t\t<div class="shadow" style="top: %dpx; left: %dpx;"></div>\n'
% (top+_SHADOW, xoff+_SHADOW))