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

* src/plugins/NavWebPage.py: Optimize separation of multiple families; Print out attributes; Print out family note

Browse Source 
svn: r4952
This commit is contained in:
Martin Hawlisch 2005-07-18 18:34:44 +00:00
parent 5ec331017e
commit 40afabedec
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-18 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/plugins/NavWebPage.py: Optimize separation of multiple families;
Print out attributes; Print out family note
2005-07-17 Don Allingham <don@gramps-project.org> 2005-07-17 Don Allingham <don@gramps-project.org>
* src/ReportUtils.py: fix private name generation * src/ReportUtils.py: fix private name generation
* src/plugins/NavWebPage.py: Add family photos to the gallery, * src/plugins/NavWebPage.py: Add family photos to the gallery,

45
gramps2/src/plugins/NavWebPage.py
View File

@ -270,11 +270,26 @@ class BasePage:
uri = url.get_path() uri = url.get_path()
descr = url.get_description() descr = url.get_description()
of.write('<tr><td class="field">%d.</td>' % index) of.write('<tr><td class="field">%d.</td>' % index)
of.write('<td class="field"><a href="%s">%s</a>' % (uri,descr)) of.write('<td class="data"><a href="%s">%s</a>' % (uri,descr))
of.write('</td></tr>\n') of.write('</td></tr>\n')
index = index + 1 index = index + 1
of.write('</table>\n') of.write('</table>\n')
def display_attr_list(self,of,attrlist=None):
if not attrlist:
return
of.write('<h4>%s</h4>\n' % _('Attributes'))
of.write('<hr>\n')
of.write('<table class="infolist" cellpadding="0" ')
of.write('cellspacing="0" border="0">\n')
for attr in attrlist:
type = attr.get_type()
value = attr.get_value()
of.write('<tr><td class="field">%s</td>' % _(type))
of.write('<td class="data">%s</td></tr>\n' % value)
of.write('</table>\n')
def display_references(self,of,db,handlelist): def display_references(self,of,db,handlelist):
if not handlelist: if not handlelist:
return return
@ -525,6 +540,7 @@ class MediaPage(BasePage):
of.write('</div>\n') of.write('</div>\n')
self.display_note_object(of, photo.get_note_object()) self.display_note_object(of, photo.get_note_object())
self.display_attr_list(of, photo.get_attribute_list())
self.display_footer(of) self.display_footer(of)
self.close_file(of) self.close_file(of)
@ -919,6 +935,7 @@ class IndividualPage(BasePage):
get_researcher().get_name()) get_researcher().get_name())
self.display_ind_general(of) self.display_ind_general(of)
self.display_ind_events(of) self.display_ind_events(of)
self.display_attr_list(of, self.person.get_attribute_list())
self.display_ind_parents(of) self.display_ind_parents(of)
self.display_ind_relationships(of) self.display_ind_relationships(of)
@ -1183,8 +1200,6 @@ class IndividualPage(BasePage):
first = True first = True
for family_handle in family_list: for family_handle in family_list:
family = self.db.get_family_from_handle(family_handle) family = self.db.get_family_from_handle(family_handle)
rtype = const.family_relations[family.get_relationship()][0]
of.write('<tr><td class="category">%s</td>\n' % rtype)
self.display_spouse(of,family,first) self.display_spouse(of,family,first)
first = False first = False
childlist = family.get_child_handle_list() childlist = family.get_child_handle_list()
@ -1218,8 +1233,9 @@ class IndividualPage(BasePage):
else: else:
name = _("unknown") name = _("unknown")
if not first: if not first:
of.write('<tr><td>&nbsp;</td></tr>\n') of.write('<tr><td colspan="3">&nbsp;</td></tr>\n')
of.write('<td>&nbsp;</td>') rtype = const.family_relations[family.get_relationship()][0]
of.write('<tr><td class="category">%s</td>\n' % rtype)
of.write('<td class="field">%s</td>\n' % relstr) of.write('<td class="field">%s</td>\n' % relstr)
of.write('<td class="data">') of.write('<td class="data">')
if spouse_id: if spouse_id:
@ -1243,6 +1259,25 @@ class IndividualPage(BasePage):
of.write('<td class="data">\n') of.write('<td class="data">\n')
of.write(self.format_event(event)) of.write(self.format_event(event))
of.write('</td>\n</tr>\n') of.write('</td>\n</tr>\n')
for attr in family.get_attribute_list():
type = attr.get_type()
value = attr.get_value()
of.write('<tr><td>&nbsp;</td>\n')
of.write('<td class="field">%s</td>' % _(type))
of.write('<td class="data">%s</td>\n</tr>\n' % value)
nobj = family.get_note_object()
if nobj:
of.write('<tr><td>&nbsp;</td>\n')
of.write('<td class="field">%s</td>\n' % _('Narrative'))
of.write('<td class="data">\n')
format = nobj.get_format()
text = nobj.get()
if format:
of.write( u"<pre>" + u"<br>".join(text.split("\n"))+u"</pre>")
else:
of.write( u"</p><p>".join(text.split("\n")))
of.write('</td>\n</tr>\n')
def pedigree_person(self,of,person,bullet='|'): def pedigree_person(self,of,person,bullet='|'):
person_link = person.handle in self.ind_list person_link = person.handle in self.ind_list