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

* src/ReportUtils.py: fix typo

Browse Source 
* src/plugins/NavWebPage.py: handle contact page issues, including
random commas and missing image.


svn: r5208
This commit is contained in:
Don Allingham 2005-09-21 14:20:46 +00:00
parent 089a8c4d06
commit fd28cfeac7
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-21 Don Allingham <don@gramps-project.org>
* src/ReportUtils.py: fix typo
* src/plugins/NavWebPage.py: handle contact page issues, including
random commas and missing image.
2005-09-20 Don Allingham <don@gramps-project.org> 2005-09-20 Don Allingham <don@gramps-project.org>
* src/ImgManip.py: update thumbnail if out of date * src/ImgManip.py: update thumbnail if out of date

2
gramps2/src/ReportUtils.py
View File

@ -1602,7 +1602,7 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""):
'male_name' : person_name, 'male_name' : person_name,
'female_name' : person_name, 'female_name' : person_name,
'burial_date' : bdate, 'burial_date' : bdate,
'burial_place' : bplace 'burial_place' : bplace,
'month_year' : bdate, 'month_year' : bdate,
'modified_date' : bdate, 'modified_date' : bdate,
} }

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

@ -1238,11 +1238,14 @@ class ContactPage(BasePage):
(newpath,thumb_path) = self.copy_media(obj,False) (newpath,thumb_path) = self.copy_media(obj,False)
self.store_file(archive,self.html_dir,obj.get_path(), self.store_file(archive,self.html_dir,obj.get_path(),
newpath) newpath)
dirpath = self.build_path(note_id,'img')
of.write('<div class="rightwrap">\n') of.write('<div class="rightwrap">\n')
of.write('<table><tr>') of.write('<table><tr>')
of.write('<td height="205">') of.write('<td height="205">')
of.write('<img height="200" ') of.write('<img height="200" ')
of.write('src="%s.%s" ' % (note_id,self.ext)) of.write('src="%s" ' % thumb_path)
of.write('alt="%s" />' % obj.get_description()) of.write('alt="%s" />' % obj.get_description())
of.write('</td></tr></table>\n') of.write('</td></tr></table>\n')
of.write('</div>\n') of.write('</div>\n')
@ -1252,11 +1255,18 @@ class ContactPage(BasePage):
r = get_researcher() r = get_researcher()
of.write('<div id="researcher">\n') of.write('<div id="researcher">\n')
of.write('%s<br />\n' % r.name) if r.name:
of.write('%s<br />\n' % r.addr) of.write('%s<br />\n' % r.name.replace(',,,',''))
of.write('%s, %s, %s<br />\n' % (r.city,r.state,r.postal)) if r.addr:
of.write('%s<br />\n' % r.country) of.write('%s<br />\n' % r.addr)
of.write('%s<br />\n' % r.email)
text = "".join([r.city,r.state,r.postal])
if text:
of.write('%s<br />\n' % text)
if r.country:
of.write('%s<br />\n' % r.country)
if r.email:
of.write('%s<br />\n' % r.email)
of.write('</div>\n') of.write('</div>\n')
of.write('<div class="fullclear"></div>\n') of.write('<div class="fullclear"></div>\n')