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

Solved a problem with <li>..</li>

Browse Source 
Reorganized the of.write() statements so that the text won't have
multiple newlines in them. And introduced so for-loops instead of
repetition of multiple lines of code.
        * src/plugins/NarrativeWeb.py


svn: r10222
This commit is contained in:
Kees Bakker
2008-03-08 11:30:59 +00:00
parent d6806733a2
commit d425133e8e
1 changed files with 300 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

470
src/plugins/NarrativeWeb.py
View File

@@ -320,16 +320,18 @@ class BasePage:
return md5.new(text).hexdigest() return md5.new(text).hexdigest()
def display_footer(self, of,db): def display_footer(self, of,db):
of.write('</div>\n\n') of.write('</div>\n\n')
of.write('<div id="footer">\n') of.write('<div id="footer">\n')
if self.footer: if self.footer:
note = db.get_note_from_gramps_id(self.footer) note = db.get_note_from_gramps_id(self.footer)
of.write('\t<div id="user_footer">\n\t\t<p>') of.write('\t<div id="user_footer">\n')
of.write('\t\t<p>')
of.write(note.get(markup=True)) of.write(note.get(markup=True))
of.write('</p>\n\t</div>\n') of.write('</p>\n')
of.write('\t</div>\n')
if self.copyright == 0: if self.copyright == 0:
of.write('\t<div id="copyright">\n\t\t<p>') of.write('\t<div id="copyright">\n')
of.write('\t\t<p>')
if self.author: if self.author:
self.author = self.author.replace(',,,','') self.author = self.author.replace(',,,','')
year = time.localtime(time.time())[0] year = time.localtime(time.time())[0]
@@ -337,7 +339,8 @@ class BasePage:
'person' : self.author, 'person' : self.author,
'year' : year } 'year' : year }
of.write('%s' % cright) of.write('%s' % cright)
of.write('</p>\n\t</div>\n') of.write('</p>\n')
of.write('\t</div>\n')
elif self.copyright <=6: elif self.copyright <=6:
of.write('\t<div id="copyright">') of.write('\t<div id="copyright">')
text = _CC[self.copyright-1] text = _CC[self.copyright-1]
@@ -366,7 +369,8 @@ class BasePage:
of.write('"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n') of.write('"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n')
of.write('<html xmlns="http://www.w3.org/1999/xhtml" ') of.write('<html xmlns="http://www.w3.org/1999/xhtml" ')
xmllang = Utils.xml_lang() xmllang = Utils.xml_lang()
of.write('xml:lang="%s" lang="%s">\n\n<head>\n' % (xmllang,xmllang)) of.write('xml:lang="%s" lang="%s">\n\n' % (xmllang,xmllang))
of.write('<head>\n')
of.write('<title>%s - %s</title>\n' % (html_escape(self.title_str), html_escape(title))) of.write('<title>%s - %s</title>\n' % (html_escape(self.title_str), html_escape(title)))
of.write('<meta http-equiv="Content-Type" content="text/html; ') of.write('<meta http-equiv="Content-Type" content="text/html; ')
of.write('charset=%s" />\n' % self.encoding) of.write('charset=%s" />\n' % self.encoding)
@@ -383,6 +387,7 @@ class BasePage:
else: else:
of.write('<link href="%s" ' % _NARRATIVEPRINT) of.write('<link href="%s" ' % _NARRATIVEPRINT)
of.write('rel="stylesheet" type="text/css" media="print" />\n') of.write('rel="stylesheet" type="text/css" media="print" />\n')
# Link to favicon.ico # Link to favicon.ico
if path: if path:
of.write('<link href="%s/images/favicon.ico" rel="Shortcut Icon" />\n' % path) of.write('<link href="%s/images/favicon.ico" rel="Shortcut Icon" />\n' % path)
@@ -436,8 +441,10 @@ class BasePage:
surname_page = "index" surname_page = "index"
intro_page = "" intro_page = ""
# Define 'self.currentsection' to correctly set navlink item CSS id 'CurrentSection' for Navigation styling # Define 'self.currentsection' to correctly set navlink item CSS id
# Use 'self.cur_name' to determine 'CurrentSection' for individual elements for Navigation styling # 'CurrentSection' for Navigation styling.
# Use 'self.cur_name' to determine 'CurrentSection' for individual
# elements for Navigation styling.
self.currentsection = title self.currentsection = title
if self.use_home: if self.use_home:
@@ -456,117 +463,77 @@ class BasePage:
self.show_navlink(of,'contact',_('Contact'),path) self.show_navlink(of,'contact',_('Contact'),path)
of.write('\t</ol>\n</div>\n\n') of.write('\t</ol>\n</div>\n\n')
# Give unique ID to 'content' div for styling specific sections separately # Give unique ID to 'content' div for styling specific sections separately.
# Because of how this script was originally written, the appropriate section ID is determined by looking for a directory or HTML file name to associate with that section # Because of how this script was originally written, the appropriate section
# ID is determined by looking for a directory or HTML file name to associate
# with that section.
if "index" in self.cur_name: if "index" in self.cur_name:
of.write('<div id="Home" class="content">\n') divid = "Home"
elif "introduction" in self.cur_name: elif "introduction" in self.cur_name:
of.write('<div id="Introduction" class="content">\n') divid = "Introduction"
elif "surnames" in self.cur_name: elif "surnames" in self.cur_name:
of.write('<div id="Surnames" class="content">\n') divid = "Surnames"
elif "srn" in self.cur_name: elif "srn" in self.cur_name:
of.write('<div id="SurnameDetail" class="content">\n') divid = "SurnameDetail"
elif "individuals" in self.cur_name: elif "individuals" in self.cur_name:
of.write('<div id="Individuals" class="content">\n') divid = "Individuals"
elif "ppl" in self.cur_name: elif "ppl" in self.cur_name:
of.write('<div id="IndividualDetail" class="content">\n') divid = "IndividualDetail"
elif "sources" in self.cur_name: elif "sources" in self.cur_name:
of.write('<div id="Sources" class="content">\n') divid = "Sources"
elif "src" in self.cur_name: elif "src" in self.cur_name:
of.write('<div id="SourceDetail" class="content">\n') divid = "SourceDetail"
elif "places" in self.cur_name: elif "places" in self.cur_name:
of.write('<div id="Places" class="content">\n') divid = "Places"
elif "plc" in self.cur_name: elif "plc" in self.cur_name:
of.write('<div id="PlaceDetail" class="content">\n') divid = "PlaceDetail"
elif "gallery" in self.cur_name: elif "gallery" in self.cur_name:
of.write('<div id="Gallery" class="content">\n') divid = "Gallery"
elif "img" in self.cur_name: elif "img" in self.cur_name:
of.write('<div id="GalleryDetail" class="content">\n') divid = "GalleryDetail"
elif "download" in self.cur_name: elif "download" in self.cur_name:
of.write('<div id="Download" class="content">\n') divid = "Download"
elif "contact" in self.cur_name: elif "contact" in self.cur_name:
of.write('<div id="Contact" class="content">\n') divid = "Contact"
else: else:
of.write('<div class="content">\n') divid = ''
if divid:
divid = ' id="%s"' % divid
of.write('<div%s class="content">\n' % divid)
def show_link(self,of,lpath,title,path): def show_link(self,of,lpath,title,path):
if path: if path:
of.write('<a href="%s/%s%s">%s</a>\n' % (path,lpath,self.ext,title)) lpath = path + '/' + lpath
else:
of.write('<a href="%s%s">%s</a>\n' % (lpath,self.ext,title)) of.write('<a href="%s%s">%s</a>\n' % (lpath,self.ext,title))
def show_navlink(self,of,lpath,title,path): def show_navlink(self,of,lpath,title,path):
if self.currentsection == title:
if path: if path:
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title)) lpath = path + '/' + lpath
else:
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title)) # Figure out if we need <li id="CurrentSection"> of just plain <li>
cs = False
if self.currentsection == title:
cs = True
elif title == "Surnames": elif title == "Surnames":
if "srn" in self.cur_name: if "srn" in self.cur_name:
if path: cs = True
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
elif "Surnames" in self.currentsection: elif "Surnames" in self.currentsection:
if path: cs = True
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
else:
if path:
of.write('\t\t<li><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
elif title == "Individuals": elif title == "Individuals":
if "ppl" in self.cur_name: if "ppl" in self.cur_name:
if path: cs = True
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
else:
if path:
of.write('\t\t<li><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
elif title == "Sources": elif title == "Sources":
if "src" in self.cur_name: if "src" in self.cur_name:
if path: cs = True
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
else:
if path:
of.write('\t\t<li><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
elif title == "Places": elif title == "Places":
if "plc" in self.cur_name: if "plc" in self.cur_name:
if path: cs = True
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
else:
if path:
of.write('\t\t<li><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
elif title == "Gallery": elif title == "Gallery":
if "img" in self.cur_name: if "img" in self.cur_name:
if path: cs = True
of.write('\t\t<li id="CurrentSection"><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else: cs = cs and ' id="CurrentSection"' or ''
of.write('\t\t<li id="CurrentSection"><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title)) of.write('\t\t<li%s><a href="%s%s">%s</a></li>\n' % (cs,lpath,self.ext,title))
else:
if path:
of.write('\t\t<li><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
else:
if path:
of.write('\t\t<li><a href="%s/%s%s">%s</a></li>\n' % (path,lpath,self.ext,title))
else:
of.write('\t\t<li><a href="%s%s">%s</a></li>\n' % (lpath,self.ext,title))
def display_first_image_as_thumbnail( self, of, db, photolist=None): def display_first_image_as_thumbnail( self, of, db, photolist=None):
@@ -709,7 +676,8 @@ class BasePage:
of.write('\t\t\t<li><a name="sref%d"' % cindex) of.write('\t\t\t<li><a name="sref%d"' % cindex)
self.source_link(of, source.handle, title, source.gramps_id, True) self.source_link(of, source.handle, title, source.gramps_id, True)
of.write('\n\t\t\t\t<ol>\n') of.write('\n')
of.write('\t\t\t\t<ol>\n')
for key,sref in citation.get_ref_list(): for key,sref in citation.get_ref_list():
tmp = [] tmp = []
@@ -863,7 +831,9 @@ class IndividualListPage(BasePage):
of.write('\t<h2>%s</h2>\n' % _('Individuals')) of.write('\t<h2>%s</h2>\n' % _('Individuals'))
of.write('\t<p id="description">%s</p>\n' % msg) of.write('\t<p id="description">%s</p>\n' % msg)
of.write('\t<table class="infolist individuallist">\n\t<thead>\n\t\t<tr>\n') of.write('\t<table class="infolist individuallist">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
of.write('\t\t\t<th class="ColumnSurname">%s</th>\n' % _('Surname')) of.write('\t\t\t<th class="ColumnSurname">%s</th>\n' % _('Surname'))
of.write('\t\t\t<th class="ColumnName">%s</th>\n' % _('Name')) of.write('\t\t\t<th class="ColumnName">%s</th>\n' % _('Name'))
column_count = 2 column_count = 2
@@ -879,7 +849,9 @@ class IndividualListPage(BasePage):
if self.showparents: if self.showparents:
of.write('\t\t\t<th class="ColumnParents">%s</th>\n' % _('Parents')) of.write('\t\t\t<th class="ColumnParents">%s</th>\n' % _('Parents'))
column_count += 1 column_count += 1
of.write('\t\t</tr>\n\t</thead>\n\t<tbody>\n') of.write('\t\t</tr>\n')
of.write('\t</thead>\n')
of.write('\t<tbody>\n')
person_handle_list = sort_people(db,person_handle_list) person_handle_list = sort_people(db,person_handle_list)
@@ -890,9 +862,11 @@ class IndividualListPage(BasePage):
# surname column # surname column
if first: if first:
of.write('\t\t<tr class="BeginSurname">\n\t\t\t<td class="ColumnSurname"><a name="%s">%s</a>' % (self.lnkfmt(surname),surname)) of.write('\t\t<tr class="BeginSurname">\n')
of.write('\t\t\t<td class="ColumnSurname"><a name="%s">%s</a>' % (self.lnkfmt(surname),surname))
else: else:
of.write('\t\t<tr>\n\t\t\t<td class="ColumnSurname">&nbsp;') of.write('\t\t<tr>\n')
of.write('\t\t\t<td class="ColumnSurname">&nbsp;')
of.write('</td>\n') of.write('</td>\n')
# firstname column # firstname column
@@ -976,7 +950,8 @@ class IndividualListPage(BasePage):
of.write('\t\t</tr>\n') of.write('\t\t</tr>\n')
first = False first = False
of.write('\t</tbody>\n\t</table>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n')
self.display_footer(of,db) self.display_footer(of,db)
self.close_file(of) self.close_file(of)
@@ -1001,7 +976,9 @@ class SurnamePage(BasePage):
of.write('\t<h2>Surnames:</h2>\n') of.write('\t<h2>Surnames:</h2>\n')
of.write('\t<h3>%s</h3>\n' % html_escape(title)) of.write('\t<h3>%s</h3>\n' % html_escape(title))
of.write('\t<p id="description">%s</p>\n' % msg) of.write('\t<p id="description">%s</p>\n' % msg)
of.write('\t<table class="infolist surname">\n\t<thead>\n\t\t<tr>\n') of.write('\t<table class="infolist surname">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
of.write('\t\t\t<th class="ColumnName">%s</th>\n' % _('Name')) of.write('\t\t\t<th class="ColumnName">%s</th>\n' % _('Name'))
if self.showbirth: if self.showbirth:
of.write('\t\t\t<th class="ColumnBirth">%s</th>\n' % _('Birth')) of.write('\t\t\t<th class="ColumnBirth">%s</th>\n' % _('Birth'))
@@ -1011,13 +988,16 @@ class SurnamePage(BasePage):
of.write('\t\t\t<th class="ColumnPartner">%s</th>\n' % _('Partner')) of.write('\t\t\t<th class="ColumnPartner">%s</th>\n' % _('Partner'))
if self.showparents: if self.showparents:
of.write('\t\t\t<th class="ColumnParents">%s</th>\n' % _('Parents')) of.write('\t\t\t<th class="ColumnParents">%s</th>\n' % _('Parents'))
of.write('\t\t</tr>\n\t</thead>\n\t<tbody>\n') of.write('\t\t</tr>\n')
of.write('\t</thead>\n')
of.write('\t<tbody>\n')
for person_handle in person_handle_list: for person_handle in person_handle_list:
# firstname column # firstname column
person = db.get_person_from_handle(person_handle) person = db.get_person_from_handle(person_handle)
of.write('\t\t<tr>\n\t\t\t<td class="ColumnName">') of.write('\t\t<tr>\n')
of.write('\t\t\t<td class="ColumnName">')
path = self.build_path(person.handle,"ppl",True) path = self.build_path(person.handle,"ppl",True)
self.person_link(of, self.build_name(path,person.handle), self.person_link(of, self.build_name(path,person.handle),
person.get_primary_name().get_first_name(), person.get_primary_name().get_first_name(),
@@ -1096,7 +1076,8 @@ class SurnamePage(BasePage):
# finished writing all columns # finished writing all columns
of.write('\t\t</tr>\n') of.write('\t\t</tr>\n')
of.write('\t</tbody>\n\t</table>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n')
self.display_footer(of,db) self.display_footer(of,db)
self.close_file(of) self.close_file(of)
@@ -1121,10 +1102,14 @@ class PlaceListPage(BasePage):
of.write('\t<h2>%s</h2>\n' % _('Places')) of.write('\t<h2>%s</h2>\n' % _('Places'))
of.write('\t<p id="description">%s</p>\n' % msg ) of.write('\t<p id="description">%s</p>\n' % msg )
of.write('\t<table class="infolist placelist">\n\t<thead>\n\t\t<tr>\n') of.write('\t<table class="infolist placelist">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
of.write('\t\t\t<th class="ColumnLetter">%s</th>\n' % _('Letter')) of.write('\t\t\t<th class="ColumnLetter">%s</th>\n' % _('Letter'))
of.write('\t\t\t<th class="ColumnName">%s</th>\n' % _('Name')) of.write('\t\t\t<th class="ColumnName">%s</th>\n' % _('Name'))
of.write('\t\t</tr>\n\t</thead>\n\t<tbody>\n\n') of.write('\t\t</tr>\n')
of.write('\t</thead>\n')
of.write('\t<tbody>\n\n')
self.sort = Sort.Sort(db) self.sort = Sort.Sort(db)
handle_list = place_handles.keys() handle_list = place_handles.keys()
@@ -1142,17 +1127,22 @@ class PlaceListPage(BasePage):
if letter != last_letter: if letter != last_letter:
last_letter = letter last_letter = letter
of.write('\t\t<tr class="BeginLetter">\n\t\t\t<td class="ColumnLetter">%s</td>\n' % last_letter) of.write('\t\t<tr class="BeginLetter">\n')
of.write('\t\t\t<td class="ColumnLetter">%s</td>\n' % last_letter)
of.write('\t\t\t<td class="ColumnName">') of.write('\t\t\t<td class="ColumnName">')
self.place_link(of,place.handle, n,place.gramps_id) self.place_link(of,place.handle, n,place.gramps_id)
of.write('</td>\n\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t</tr>\n')
else: else:
of.write('\t\t<tr>\n\t\t\t<td class="ColumnLetter">&nbsp;</td>\n') of.write('\t\t<tr>\n')
of.write('\t\t\t<td class="ColumnLetter">&nbsp;</td>\n')
of.write('\t\t\t<td class="ColumnName">') of.write('\t\t\t<td class="ColumnName">')
self.place_link(of,place.handle, n,place.gramps_id) self.place_link(of,place.handle, n,place.gramps_id)
of.write('</td>\n\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t</tr>\n')
of.write('\t</tbody>\n\t</table>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n')
self.display_footer(of,db) self.display_footer(of,db)
self.close_file(of) self.close_file(of)
@@ -1181,7 +1171,8 @@ class PlacePage(BasePage):
of.write('\t\t<table class="infolist place">\n') of.write('\t\t<table class="infolist place">\n')
if not self.noid: if not self.noid:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('GRAMPS ID')) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('GRAMPS ID'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.gramps_id) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.gramps_id)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
@@ -1195,17 +1186,20 @@ class PlacePage(BasePage):
(_('Postal Code'),ml.postal), (_('Postal Code'),ml.postal),
(_('Country'),ml.country)]: (_('Country'),ml.country)]:
if val[1]: if val[1]:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % val[0]) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % val[0])
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % val[1]) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % val[1])
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
if place.long: if place.long:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Longitude')) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Longitude'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.long) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.long)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
if place.lat: if place.lat:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Latitude')) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Latitude'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.lat) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.lat)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
@@ -1254,7 +1248,8 @@ class MediaPage(BasePage):
of.write('\t<h2>Gallery:</h2>\n') of.write('\t<h2>Gallery:</h2>\n')
# gallery navigation # gallery navigation
of.write('\t<div id="GalleryNav">\n\t\t') of.write('\t<div id="GalleryNav">\n')
of.write('\t\t')
if prev: if prev:
self.galleryNav_link(of,prev,_('Previous'),True) self.galleryNav_link(of,prev,_('Previous'),True)
data = _('<strong id="GalleryCurrent">%(page_number)d</strong> of <strong id="GalleryTotal">%(total_pages)d</strong>' ) % { data = _('<strong id="GalleryCurrent">%(page_number)d</strong> of <strong id="GalleryTotal">%(total_pages)d</strong>' ) % {
@@ -1262,7 +1257,8 @@ class MediaPage(BasePage):
of.write(' <span id="GalleryPages">%s</span> ' % data) of.write(' <span id="GalleryPages">%s</span> ' % data)
if next: if next:
self.galleryNav_link(of,next,_('Next'),True) self.galleryNav_link(of,next,_('Next'),True)
of.write('\n\t</div>\n\n') of.write('\n')
of.write('\t</div>\n\n')
of.write('\t<div id="summaryarea">\n') of.write('\t<div id="summaryarea">\n')
if mime_type: if mime_type:
@@ -1370,8 +1366,10 @@ class MediaPage(BasePage):
for attr in attrlist: for attr in attrlist:
atType = str( attr.get_type() ) atType = str( attr.get_type() )
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % atType) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n\t\t\t</tr>\n' % attr.get_value()) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % atType)
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % attr.get_value())
of.write('\t\t\t</tr>\n')
of.write('\t\t</table>\n') of.write('\t\t</table>\n')
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@@ -1451,9 +1449,13 @@ class SurnameListPage(BasePage):
'database with this same surname.')) 'database with this same surname.'))
if order_by == self.ORDER_BY_COUNT: if order_by == self.ORDER_BY_COUNT:
of.write('\t<table id="SortByCount" class="infolist surnamelist">\n\t<thead>\n\t\t<tr>\n') of.write('\t<table id="SortByCount" class="infolist surnamelist">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
else: else:
of.write('\t<table id="SortByName" class="infolist surnamelist">\n\t<thead>\n\t\t<tr>\n') of.write('\t<table id="SortByName" class="infolist surnamelist">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
of.write('\t\t\t<th class="ColumnLetter">%s</th>\n' % _('Letter')) of.write('\t\t\t<th class="ColumnLetter">%s</th>\n' % _('Letter'))
if not self.use_home and not self.use_intro: if not self.use_home and not self.use_intro:
@@ -1461,7 +1463,9 @@ class SurnameListPage(BasePage):
else: else:
of.write('\t\t\t<th class="ColumnSurname"><a href="%s%s">%s</a></th>\n' % ("surnames", self.ext, _('Surname'))) of.write('\t\t\t<th class="ColumnSurname"><a href="%s%s">%s</a></th>\n' % ("surnames", self.ext, _('Surname')))
of.write('\t\t\t<th class="ColumnQuantity"><a href="%s%s">%s</a></th>\n' % ("surnames_count", self.ext, _('Number of people'))) of.write('\t\t\t<th class="ColumnQuantity"><a href="%s%s">%s</a></th>\n' % ("surnames_count", self.ext, _('Number of people')))
of.write('\t\t</tr>\n\t</thead>\n\t<tbody>\n') of.write('\t\t</tr>\n')
of.write('\t</thead>\n')
of.write('\t<tbody>\n')
person_handle_list = sort_people(db,person_handle_list) person_handle_list = sort_people(db,person_handle_list)
if order_by == self.ORDER_BY_COUNT: if order_by == self.ORDER_BY_COUNT:
@@ -1488,19 +1492,23 @@ class SurnameListPage(BasePage):
if letter != last_letter: if letter != last_letter:
last_letter = letter last_letter = letter
of.write('\t\t<tr class="BeginLetter">\n\t\t\t<td class="ColumnLetter">%s</td>\n' % last_letter) of.write('\t\t<tr class="BeginLetter">\n')
of.write('\t\t\t<td class="ColumnLetter">%s</td>\n' % last_letter)
of.write('\t\t\t<td class="ColumnSurname">') of.write('\t\t\t<td class="ColumnSurname">')
self.surname_link(of,surname) self.surname_link(of,surname)
of.write('</td>\n') of.write('</td>\n')
elif surname != last_surname: elif surname != last_surname:
of.write('\t\t<tr>\n\t\t\t<td class="ColumnLetter">&nbsp;</td>\n') of.write('\t\t<tr>\n')
of.write('\t\t\t<td class="ColumnLetter">&nbsp;</td>\n')
of.write('\t\t\t<td class="ColumnSurname">') of.write('\t\t\t<td class="ColumnSurname">')
self.surname_link(of,surname) self.surname_link(of,surname)
of.write('</td>\n') of.write('</td>\n')
last_surname = surname last_surname = surname
of.write('\t\t\t<td class="ColumnQuantity">%d</td>\n\t\t</tr>\n' % len(data_list)) of.write('\t\t\t<td class="ColumnQuantity">%d</td>\n' % len(data_list))
of.write('\t\t</tr>\n')
of.write('\t</tbody>\n\t</table>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n')
self.display_footer(of,db) self.display_footer(of,db)
self.close_file(of) self.close_file(of)
return return
@@ -1546,7 +1554,8 @@ class IntroductionPage(BasePage):
note_obj = db.get_note_from_gramps_id(note_id) note_obj = db.get_note_from_gramps_id(note_id)
text = note_obj.get(markup=True) text = note_obj.get(markup=True)
if note_obj.get_format(): if note_obj.get_format():
of.write('\t<pre>\n%s\n\t</pre>\n' % text) of.write('\t<pre>\n%s\n' % text)
of.write('\t</pre>\n')
else: else:
of.write('\t<p>') of.write('\t<p>')
of.write(u'</p>\n\t<p>'.join(text.split("\n"))) of.write(u'</p>\n\t<p>'.join(text.split("\n")))
@@ -1594,7 +1603,8 @@ class HomePage(BasePage):
note_obj = db.get_note_from_gramps_id(note_id) note_obj = db.get_note_from_gramps_id(note_id)
text = note_obj.get(markup=True) text = note_obj.get(markup=True)
if note_obj.get_format(): if note_obj.get_format():
of.write('\t<pre>\n%s\n\t</pre>\n' % text) of.write('\t<pre>\n%s\n' % text)
of.write('\t</pre>\n')
else: else:
of.write('\t<p>') of.write('\t<p>')
of.write(u'</p>\n\t<p>'.join(text.split("\n"))) of.write(u'</p>\n\t<p>'.join(text.split("\n")))
@@ -1632,23 +1642,31 @@ class SourcesPage(BasePage):
"database, sorted by their title. Clicking on a source&#8217;s " "database, sorted by their title. Clicking on a source&#8217;s "
"title will take you to that source&#8217;s page.") "title will take you to that source&#8217;s page.")
of.write('\t<h2>%s</h2>\n\t<p id="description">' % _('Sources')) of.write('\t<h2>%s</h2>\n' % _('Sources'))
of.write('\t<p id="description">')
of.write(msg) of.write(msg)
of.write('</p>\n\t<table class="infolist sourcelist">\n') of.write('</p>\n')
of.write('\t<thead>\n\t\t<tr>\n') of.write('\t<table class="infolist sourcelist">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
of.write('\t\t\t<th class="ColumnLabel">&nbsp;</th>\n') of.write('\t\t\t<th class="ColumnLabel">&nbsp;</th>\n')
of.write('\t\t\t<th class="ColumnName">Name</th>\n') of.write('\t\t\t<th class="ColumnName">Name</th>\n')
of.write('\t\t</tr>\n\t</thead>\n\t<tbody>\n') of.write('\t\t</tr>\n')
of.write('\t</thead>\n')
of.write('\t<tbody>\n')
index = 1 index = 1
for key in keys: for key in keys:
(source, handle) = source_dict[key] (source, handle) = source_dict[key]
of.write('\t\t<tr>\n\t\t\t<td class="ColumnRowLabel">%d.</td>\n' % index) of.write('\t\t<tr>\n')
of.write('\t\t\t<td class="ColumnRowLabel">%d.</td>\n' % index)
of.write('\t\t\t<td class="ColumnName"><a ') of.write('\t\t\t<td class="ColumnName"><a ')
self.source_link(of, handle,source.get_title(),source.gramps_id) self.source_link(of, handle,source.get_title(),source.gramps_id)
of.write('</td>\n\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t</tr>\n')
index += 1 index += 1
of.write('\t</tbody>\n\t</table>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n')
self.display_footer(of,db) self.display_footer(of,db)
self.close_file(of) self.close_file(of)
@@ -1687,11 +1705,13 @@ class SourcePage(BasePage):
(_('Publication information'),source.pubinfo), (_('Publication information'),source.pubinfo),
(_('Abbreviation'),source.abbrev)]: (_('Abbreviation'),source.abbrev)]:
if val: if val:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % label) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % label)
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % val) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % val)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
of.write('\t\t</table>\n\t</div>\n\n') of.write('\t\t</table>\n')
of.write('\t</div>\n\n')
self.display_additional_images_as_gallery(of, db, media_list) self.display_additional_images_as_gallery(of, db, media_list)
self.display_note_list(of, db, source.get_note_list()) self.display_note_list(of, db, source.get_note_list())
@@ -1712,17 +1732,22 @@ class GalleryPage(BasePage):
of = self.create_file("gallery") of = self.create_file("gallery")
self.display_header(of,db, _('Gallery'), get_researcher().get_name()) self.display_header(of,db, _('Gallery'), get_researcher().get_name())
of.write('\t<h2>%s</h2>\n\n\t<p id="description">' % _('Gallery')) of.write('\t<h2>%s</h2>\n\n' % _('Gallery'))
of.write('\t<p id="description">')
of.write(_("This page contains an index of all the media objects " of.write(_("This page contains an index of all the media objects "
"in the database, sorted by their title. Clicking on " "in the database, sorted by their title. Clicking on "
"the title will take you to that media object&#8217;s page.")) "the title will take you to that media object&#8217;s page."))
of.write('</p>\n\n\t<table class="infolist gallerylist">\n') of.write('</p>\n\n')
of.write('\t<thead>\n\t\t<tr>\n') of.write('\t<table class="infolist gallerylist">\n')
of.write('\t<thead>\n')
of.write('\t\t<tr>\n')
of.write('\t\t\t<th class="ColumnRowLabel">&nbsp;</th>\n') of.write('\t\t\t<th class="ColumnRowLabel">&nbsp;</th>\n')
of.write('\t\t\t<th class="ColumnName">Name</th>\n') of.write('\t\t\t<th class="ColumnName">Name</th>\n')
of.write('\t\t\t<th class="ColumnDate">Date</th>\n') of.write('\t\t\t<th class="ColumnDate">Date</th>\n')
of.write('\t\t</tr>\n\t</thead>\n\t<tbody>\n') of.write('\t\t</tr>\n')
of.write('\t</thead>\n')
of.write('\t<tbody>\n')
self.db = db self.db = db
index = 1 index = 1
@@ -1748,7 +1773,8 @@ class GalleryPage(BasePage):
of.write('\t\t</tr>\n') of.write('\t\t</tr>\n')
index += 1 index += 1
of.write('\t</tbody>\n\t</table>\n') of.write('\t</tbody>\n')
of.write('\t</table>\n')
self.display_footer(of,db) self.display_footer(of,db)
self.close_file(of) self.close_file(of)
@@ -1818,7 +1844,9 @@ class ContactPage(BasePage):
of.write('\t\t\t<span id="streetaddress">%s</span>\n' % r.addr) of.write('\t\t\t<span id="streetaddress">%s</span>\n' % r.addr)
text = "".join([r.city,r.state,r.postal]) text = "".join([r.city,r.state,r.postal])
if text: if text:
of.write('\t\t\t<span id="city">%s</span>\n\t\t\t<span id="state">%s</span>\n\t\t\t<span id="postalcode">%s</span>\n' % (r.city,r.state,r.postal)) of.write('\t\t\t<span id="city">%s</span>\n' % r.city)
of.write('\t\t\t<span id="state">%s</span>\n' % r.state)
of.write('\t\t\t<span id="postalcode">%s</span>\n' % r.postal)
if r.country: if r.country:
of.write('\t\t\t<span id="country">%s</span>\n' % r.country) of.write('\t\t\t<span id="country">%s</span>\n' % r.country)
if r.email: if r.email:
@@ -1910,10 +1938,12 @@ class IndividualPage(BasePage):
for attr in attrlist: for attr in attrlist:
atType = str( attr.get_type() ) atType = str( attr.get_type() )
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % atType) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % atType)
value = attr.get_value() value = attr.get_value()
value += self.get_citation_links( attr.get_source_references() ) value += self.get_citation_links( attr.get_source_references() )
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n\t\t\t</tr>\n' % value) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % value)
of.write('\t\t\t</tr>\n')
of.write('\t\t</table>\n') of.write('\t\t</table>\n')
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@@ -2039,19 +2069,22 @@ class IndividualPage(BasePage):
of.write('\t<div id="pedigree" class="subsection">\n') of.write('\t<div id="pedigree" class="subsection">\n')
of.write('\t\t<h4>%s</h4>\n' % _('Pedigree')) of.write('\t\t<h4>%s</h4>\n' % _('Pedigree'))
of.write('\t\t<ol class="pedigreegen">\n\t\t\t') of.write('\t\t<ol class="pedigreegen">\n')
of.write('\t\t\t')
if father and mother: if father and mother:
self.pedigree_person(of,father)
of.write('\n\t\t\t\t<ol>\n\t\t\t\t\t')
self.pedigree_person(of,mother,True)
of.write('\n')
of.write('\t\t\t\t\t\t<ol>\n')
else:
if father:
self.pedigree_person(of,father) self.pedigree_person(of,father)
of.write('\n') of.write('\n')
of.write('\t\t\t\t<ol>\n') of.write('\t\t\t\t<ol>\n')
if mother: of.write('\t\t\t\t\t')
self.pedigree_person(of,mother,True)
of.write('\n')
of.write('\t\t\t\t\t\t<ol>\n')
elif father:
self.pedigree_person(of,father)
of.write('\n')
of.write('\t\t\t\t<ol>\n')
elif mother:
self.pedigree_person(of,mother,True) self.pedigree_person(of,mother,True)
of.write('\n') of.write('\n')
of.write('\t\t\t\t<ol>\n') of.write('\t\t\t\t<ol>\n')
@@ -2061,20 +2094,25 @@ class IndividualPage(BasePage):
child_handle = child_ref.ref child_handle = child_ref.ref
if child_handle == self.person.handle: if child_handle == self.person.handle:
of.write('\t\t\t\t\t\t\t<li class="thisperson">%s\n' % self.name) of.write('\t\t\t\t\t\t\t<li class="thisperson">%s\n' % self.name)
of.write('\t\t\t\t\t\t\t\t<ol class="spouselist">\n\t\t\t\t\t\t\t\t\t') of.write('\t\t\t\t\t\t\t\t<ol class="spouselist">\n')
of.write('\t\t\t\t\t\t\t\t\t')
self.pedigree_family(of) self.pedigree_family(of)
of.write('\t\t\t\t\t\t\t\t</ol>\n\t\t\t\t\t\t\t</li>\n') of.write('\t\t\t\t\t\t\t\t</ol>\n')
of.write('\t\t\t\t\t\t\t</li>\n')
else: else:
of.write('\t\t\t\t\t\t\t') of.write('\t\t\t\t\t\t\t')
child = self.db.get_person_from_handle(child_handle) child = self.db.get_person_from_handle(child_handle)
self.pedigree_person(of,child) self.pedigree_person(of,child)
of.write('</li>\n') of.write('</li>\n')
of.write('\t\t\t\t\t\t</ol>\n\t\t\t\t\t</li>\n') of.write('\t\t\t\t\t\t</ol>\n')
of.write('\t\t\t\t\t</li>\n')
else: else:
of.write('<li class="thisperson">%s\n' % self.name) of.write('<li class="thisperson">%s\n' % self.name)
of.write('\t\t\t\t<ol class="spouselist">\n\t\t\t\t\t\t') of.write('\t\t\t\t<ol class="spouselist">\n')
of.write('\t\t\t\t\t\t')
self.pedigree_family(of) self.pedigree_family(of)
of.write('\t\t\t\t</ol>\n\t\t\t</li>\n') of.write('\t\t\t\t</ol>\n')
of.write('\t\t\t</li>\n')
of.write('\t\t</ol>\n') of.write('\t\t</ol>\n')
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@@ -2090,7 +2128,8 @@ class IndividualPage(BasePage):
# GRAMPS ID # GRAMPS ID
if not self.noid: if not self.noid:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('GRAMPS ID')) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('GRAMPS ID'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % self.person.gramps_id) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % self.person.gramps_id)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
@@ -2099,22 +2138,28 @@ class IndividualPage(BasePage):
pname = _nd.display_name(name) pname = _nd.display_name(name)
pname += self.get_citation_links( name.get_source_references() ) pname += self.get_citation_links( name.get_source_references() )
type = str( name.get_type() ) type = str( name.get_type() )
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _(type)) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _(type))
of.write('\t\t\t\t<td class="ColumnValue">%s' % pname) of.write('\t\t\t\t<td class="ColumnValue">%s' % pname)
of.write('</td>\n\t\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t\t</tr>\n')
# Gender # Gender
nick = self.person.get_nick_name() nick = self.person.get_nick_name()
if nick: if nick:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Nickname')) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Nickname'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % nick) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % nick)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
# Gender # Gender
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Gender')) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Gender'))
gender = self.gender_map[self.person.gender] gender = self.gender_map[self.person.gender]
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % gender) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % gender)
of.write('\t\t\t</tr>\n\t\t</table>\n\t</div>\n\n') of.write('\t\t\t</tr>\n')
of.write('\t\t</table>\n')
of.write('\t</div>\n\n')
def display_ind_events(self, of): def display_ind_events(self, of):
evt_ref_list = self.person.get_event_ref_list() evt_ref_list = self.person.get_event_ref_list()
@@ -2132,9 +2177,11 @@ class IndividualPage(BasePage):
evt_name = str(event.get_type()) evt_name = str(event.get_type())
if event_ref.get_role() == EventRoleType.PRIMARY: if event_ref.get_role() == EventRoleType.PRIMARY:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % evt_name) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % evt_name)
else: else:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s (%s)</td>\n' \ of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s (%s)</td>\n' \
% (evt_name, event_ref.get_role())) % (evt_name, event_ref.get_role()))
of.write('\t\t\t\t<td class="ColumnValue">') of.write('\t\t\t\t<td class="ColumnValue">')
@@ -2159,7 +2206,8 @@ class IndividualPage(BasePage):
location += self.get_citation_links( addr.get_source_references() ) location += self.get_citation_links( addr.get_source_references() )
date = _dd.display(addr.get_date_object()) date = _dd.display(addr.get_date_object())
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % date) of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % date)
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % location) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % location)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
@@ -2225,7 +2273,9 @@ class IndividualPage(BasePage):
mrel = str(child_ref.get_mother_relation()) mrel = str(child_ref.get_mother_relation())
if not first: if not first:
of.write('\t\t\t<tr>\n\t\t\t\t<td colspan="2">&nbsp;</td>\n\t\t\t</tr>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td colspan="2">&nbsp;</td>\n')
of.write('\t\t\t</tr>\n')
else: else:
first = False first = False
@@ -2244,13 +2294,16 @@ class IndividualPage(BasePage):
if len(child_ref_list) > 1: if len(child_ref_list) > 1:
of.write('\t\t\t<tr>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Siblings")) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Siblings"))
of.write('\t\t\t\t<td class="ColumnValue">\n\t\t\t\t\t<ol>\n') of.write('\t\t\t\t<td class="ColumnValue">\n')
of.write('\t\t\t\t\t<ol>\n')
for child_ref in child_ref_list: for child_ref in child_ref_list:
child_handle = child_ref.ref child_handle = child_ref.ref
sibling.add(child_handle) # remember that we've already "seen" this child sibling.add(child_handle) # remember that we've already "seen" this child
if child_handle != self.person.handle: if child_handle != self.person.handle:
self.display_child_link(of,child_handle) self.display_child_link(of,child_handle)
of.write('\t\t\t\t\t</ol>\n\t\t\t\t</td>\n\t\t\t</tr>\n') of.write('\t\t\t\t\t</ol>\n')
of.write('\t\t\t\t</td>\n')
of.write('\t\t\t</tr>\n')
# Also try to identify half-siblings # Also try to identify half-siblings
other_siblings = set() other_siblings = set()
@@ -2287,10 +2340,13 @@ class IndividualPage(BasePage):
if len(other_siblings) > 0: if len(other_siblings) > 0:
of.write('\t\t\t<tr>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Half Siblings")) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Half Siblings"))
of.write('\t\t\t\t<td class="ColumnValue">\n\t\t\t\t\t<ol>\n') of.write('\t\t\t\t<td class="ColumnValue">\n')
of.write('\t\t\t\t\t<ol>\n')
for child_handle in other_siblings: for child_handle in other_siblings:
self.display_child_link(of, child_handle) self.display_child_link(of, child_handle)
of.write('\t\t\t\t\t</ol>\n\t\t\t\t</td>\n\t\t\t</tr>\n') of.write('\t\t\t\t\t</ol>\n')
of.write('\t\t\t\t</td>\n')
of.write('\t\t\t</tr>\n')
of.write('\t\t</table>\n') of.write('\t\t</table>\n')
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@@ -2310,12 +2366,16 @@ class IndividualPage(BasePage):
first = False first = False
childlist = family.get_child_ref_list() childlist = family.get_child_ref_list()
if childlist: if childlist:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnType">&nbsp;</td>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnType">&nbsp;</td>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Children")) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Children"))
of.write('\t\t\t\t<td class="ColumnValue">\n\t\t\t\t\t<ol>\n') of.write('\t\t\t\t<td class="ColumnValue">\n')
of.write('\t\t\t\t\t<ol>\n')
for child_ref in childlist: for child_ref in childlist:
self.display_child_link(of,child_ref.ref) self.display_child_link(of,child_ref.ref)
of.write('\t\t\t\t\t</ol>\n\t\t\t\t</td>\n\t\t\t</tr>\n') of.write('\t\t\t\t\t</ol>\n')
of.write('\t\t\t\t</td>\n')
of.write('\t\t\t</tr>\n')
of.write('\t\t</table>\n') of.write('\t\t</table>\n')
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@@ -2340,7 +2400,8 @@ class IndividualPage(BasePage):
else: else:
name = _("unknown") name = _("unknown")
rtype = str(family.get_relationship()) rtype = str(family.get_relationship())
of.write('\t\t\t<tr class="BeginFamily">\n\t\t\t\t<td class="ColumnType">%s</td>\n' % rtype) of.write('\t\t\t<tr class="BeginFamily">\n')
of.write('\t\t\t\t<td class="ColumnType">%s</td>\n' % rtype)
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % relstr) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % relstr)
of.write('\t\t\t\t<td class="ColumnValue">') of.write('\t\t\t\t<td class="ColumnValue">')
if spouse_id: if spouse_id:
@@ -2353,21 +2414,26 @@ class IndividualPage(BasePage):
self.person_link(of, fname, spouse_name, gid) self.person_link(of, fname, spouse_name, gid)
else: else:
of.write(name) of.write(name)
of.write('</td>\n\t\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t\t</tr>\n')
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref) event = self.db.get_event_from_handle(event_ref.ref)
evtType = str(event.get_type()) evtType = str(event.get_type())
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnType">&nbsp;</td>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnType">&nbsp;</td>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % evtType) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % evtType)
of.write('\t\t\t\t<td class="ColumnValue">') of.write('\t\t\t\t<td class="ColumnValue">')
of.write(self.format_event(event, event_ref)) of.write(self.format_event(event, event_ref))
of.write('</td>\n\t\t\t</tr>\n') of.write('</td>\n')
of.write('\t\t\t</tr>\n')
for attr in family.get_attribute_list(): for attr in family.get_attribute_list():
attrType = str(attr.get_type()) attrType = str(attr.get_type())
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnType">&nbsp;</td>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnType">&nbsp;</td>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>' % attrType) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>' % attrType)
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n\t\t\t</tr>\n' % attr.get_value()) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % attr.get_value())
of.write('\t\t\t</tr>\n')
notelist = family.get_note_list() notelist = family.get_note_list()
for notehandle in notelist: for notehandle in notelist:
nobj = self.db.get_note_from_handle(notehandle) nobj = self.db.get_note_from_handle(notehandle)
@@ -2375,29 +2441,32 @@ class IndividualPage(BasePage):
text = nobj.get(markup=True) text = nobj.get(markup=True)
format = nobj.get_format() format = nobj.get_format()
if text: if text:
of.write('\t\t\t<tr>\n\t\t\t\t<td class="ColumnType">&nbsp;</td>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnType">&nbsp;</td>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Narrative')) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Narrative'))
of.write('\t\t\t\t<td class="ColumnValue">\n\t\t\t\t\t<p>') of.write('\t\t\t\t<td class="ColumnValue">\n')
of.write('\t\t\t\t\t<p>')
if format: if format:
of.write(u"<pre>%s</pre>" % text ) of.write(u"<pre>%s</pre>" % text )
else: else:
of.write(u"</p>\n\t\t\t\t\t<p>".join(text.split("\n"))) of.write(u"</p>\n\t\t\t\t\t<p>".join(text.split("\n")))
of.write('</p>\n\t\t\t\t</td>\n\t\t\t</tr>\n') of.write('</p>\n')
of.write('\t\t\t\t</td>\n')
of.write('\t\t\t</tr>\n')
def pedigree_person(self, of, person, is_spouse=False): def pedigree_person(self, of, person, is_spouse=False):
person_link = person.handle in self.ind_list
if is_spouse: if is_spouse:
of.write('<li class="spouse">') of.write('<li class="spouse">')
else: else:
of.write('<li>') of.write('<li>')
if person_link: person_link = person.handle in self.ind_list
person_name = _nd.display(person) person_name = _nd.display(person)
if person_link:
path = self.build_path(person.handle, "ppl", False) path = self.build_path(person.handle, "ppl", False)
fname = self.build_name(path, person.handle) fname = self.build_name(path, person.handle)
self.person_link(of, fname, person_name) self.person_link(of, fname, person_name)
else: else:
of.write('<li>') of.write(person_name)
of.write(_nd.display(person))
def pedigree_family(self, of): def pedigree_family(self, of):
for family_handle in self.person.get_family_handle_list(): for family_handle in self.person.get_family_handle_list():
@@ -2408,7 +2477,8 @@ class IndividualPage(BasePage):
self.pedigree_person(of,spouse,True) self.pedigree_person(of,spouse,True)
childlist = rel_family.get_child_ref_list() childlist = rel_family.get_child_ref_list()
if childlist: if childlist:
of.write('\n\t\t\t\t\t\t\t\t\t\t<ol>\n') of.write('\n')
of.write('\t\t\t\t\t\t\t\t\t\t<ol>\n')
for child_ref in childlist: for child_ref in childlist:
of.write('\t\t\t\t\t\t\t\t\t\t\t') of.write('\t\t\t\t\t\t\t\t\t\t\t')
child = self.db.get_person_from_handle(child_ref.ref) child = self.db.get_person_from_handle(child_ref.ref)
@@ -2641,36 +2711,20 @@ class NavWebReport(Report):
self.write_css(archive,self.target_path,self.css) self.write_css(archive,self.target_path,self.css)
# Copy Mainz Style Images # Copy Mainz Style Images
from_path = os.path.join(const.IMAGE_DIR,"NWeb_Mainz_Bkgd.png") imgs = ["NWeb_Mainz_Bkgd.png",
to_path = os.path.join("images","NWeb_Mainz_Bkgd.png") "NWeb_Mainz_Header.png",
self.store_file(archive,self.target_path,from_path,to_path) "NWeb_Mainz_Mid.png",
"NWeb_Mainz_MidLight.png",
from_path = os.path.join(const.IMAGE_DIR,"NWeb_Mainz_Header.png") "document.png",
to_path = os.path.join("images","NWeb_Mainz_Header.png") "favicon.ico"]
self.store_file(archive,self.target_path,from_path,to_path)
from_path = os.path.join(const.IMAGE_DIR,"NWeb_Mainz_Mid.png")
to_path = os.path.join("images","NWeb_Mainz_Mid.png")
self.store_file(archive,self.target_path,from_path,to_path)
from_path = os.path.join(const.IMAGE_DIR,"NWeb_Mainz_MidLight.png")
to_path = os.path.join("images","NWeb_Mainz_MidLight.png")
self.store_file(archive,self.target_path,from_path,to_path)
# Copy the Creative Commons icon if the a Creative Commons # Copy the Creative Commons icon if the a Creative Commons
# license is requested # license is requested
if 0 < self.copyright < 7: if 0 < self.copyright < 7:
from_path = os.path.join(const.IMAGE_DIR,"somerights20.gif") imgs += ["somerights20.gif"]
to_path = os.path.join("images","somerights20.gif")
self.store_file(archive,self.target_path,from_path,to_path)
from_path = os.path.join(const.IMAGE_DIR,"document.png") for f in imgs:
to_path = os.path.join("images","document.png") from_path = os.path.join(const.IMAGE_DIR, f)
self.store_file(archive,self.target_path,from_path,to_path) to_path = os.path.join("images", f)
# Copy GRAMPS favicon.ico to images directory
from_path = os.path.join(const.IMAGE_DIR,"favicon.ico")
to_path = os.path.join("images","favicon.ico")
self.store_file(archive, self.target_path, from_path, to_path) self.store_file(archive, self.target_path, from_path, to_path)
place_list = {} place_list = {}