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

* src/plugins/NavWebPage.py: Use researcher info from Gramps

Browse Source 
session, not from the database.


svn: r4944
This commit is contained in:
Alex Roitman 2005-07-15 21:31:09 +00:00
parent 4a5d7553c5
commit 2b69463196
2 changed files with 19 additions and 15 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-15 Alex Roitman <shura@gramps-project.org>
* src/plugins/NavWebPage.py: Use researcher info from Gramps
session, not from the database.
2005-07-15 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-07-15 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/plugins/NavWebPage.py: Avoid some segfaults; HTML validation fixes; * src/plugins/NavWebPage.py: Avoid some segfaults; HTML validation fixes;
Show all names of a person; Show all images of person/source and Show all names of a person; Show all images of person/source and

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

@ -50,7 +50,7 @@ import gtk
#------------------------------------------------------------------------ #------------------------------------------------------------------------
import RelLib import RelLib
import const import const
import GrampsKeys from GrampsCfg import get_researcher
import GenericFilter import GenericFilter
import Sort import Sort
import Report import Report
@ -301,7 +301,7 @@ class IndividualListPage(BasePage):
of = self.create_file("individuals") of = self.create_file("individuals")
self.display_header(of,_('Individuals'), self.display_header(of,_('Individuals'),
db.get_researcher().get_name()) get_researcher().get_name())
msg = _("This page contains an index of all the individuals in the " msg = _("This page contains an index of all the individuals in the "
"database, sorted by their last names. Selecting person's name " "database, sorted by their last names. Selecting person's name "
@ -353,7 +353,7 @@ class PlaceListPage(BasePage):
BasePage.__init__(self, title, options, archive, media_list) BasePage.__init__(self, title, options, archive, media_list)
of = self.create_file("places") of = self.create_file("places")
self.display_header(of,_('Places'), self.display_header(of,_('Places'),
db.get_researcher().get_name()) get_researcher().get_name())
msg = _("This page contains an index of all the places in the " msg = _("This page contains an index of all the places in the "
"database, sorted by their title. Clicking on a place's " "database, sorted by their title. Clicking on a place's "
@ -422,7 +422,7 @@ class PlacePage(BasePage):
of = self.create_file(place.get_handle()) of = self.create_file(place.get_handle())
place_name = ReportUtils.place_name(db,place_handle) place_name = ReportUtils.place_name(db,place_handle)
self.display_header(of,"%s - %s" % (_('Places'), place_name), self.display_header(of,"%s - %s" % (_('Places'), place_name),
db.get_researcher().get_name()) get_researcher().get_name())
self.display_first_image_as_thumbnail(of, db, place.get_media_list()) self.display_first_image_as_thumbnail(of, db, place.get_media_list())
@ -491,7 +491,7 @@ class MediaPage(BasePage):
os.path.join(self.html_dir,newpath)) os.path.join(self.html_dir,newpath))
title = photo.get_description() title = photo.get_description()
self.display_header(of, "%s - %s" % (_('Gallery'), title), db.get_researcher().get_name()) self.display_header(of, "%s - %s" % (_('Gallery'), title), get_researcher().get_name())
of.write('<div class="summaryarea">\n') of.write('<div class="summaryarea">\n')
of.write('<h3>%s</h3>\n' % title) of.write('<h3>%s</h3>\n' % title)
@ -534,7 +534,7 @@ class SurnameListPage(BasePage):
BasePage.__init__(self, title, options, archive, media_list) BasePage.__init__(self, title, options, archive, media_list)
of = self.create_file("surnames") of = self.create_file("surnames")
self.display_header(of,_('Surnames'), self.display_header(of,_('Surnames'),
db.get_researcher().get_name()) get_researcher().get_name())
of.write('<h3>%s</h3>\n' % _('Surnames')) of.write('<h3>%s</h3>\n' % _('Surnames'))
of.write('<p>%s</p>\n' % _( of.write('<p>%s</p>\n' % _(
@ -593,7 +593,7 @@ class IntroductionPage(BasePage):
of = self.create_file("introduction") of = self.create_file("introduction")
self.display_header(of,_('Introduction'), self.display_header(of,_('Introduction'),
db.get_researcher().get_name()) get_researcher().get_name())
of.write('<h3>%s</h3>\n' % _('Introduction')) of.write('<h3>%s</h3>\n' % _('Introduction'))
@ -638,7 +638,7 @@ class HomePage(BasePage):
of = self.create_file("index") of = self.create_file("index")
self.display_header(of,_('Home'), self.display_header(of,_('Home'),
db.get_researcher().get_name()) get_researcher().get_name())
of.write('<h3>%s</h3>\n' % _('Home')) of.write('<h3>%s</h3>\n' % _('Home'))
@ -682,7 +682,7 @@ class SourcesPage(BasePage):
of = self.create_file("sources") of = self.create_file("sources")
self.display_header(of,_('Sources'), self.display_header(of,_('Sources'),
db.get_researcher().get_name()) get_researcher().get_name())
handle_list = list(handle_set) handle_list = list(handle_set)
@ -721,7 +721,7 @@ class SourcePage(BasePage):
BasePage.__init__(self, title, options, archive, media_list) BasePage.__init__(self, title, options, archive, media_list)
of = self.create_file(source.get_handle()) of = self.create_file(source.get_handle())
source_name = source.get_title() source_name = source.get_title()
self.display_header(of,"%s - %s" % (_('Sources'), source_name),db.get_researcher().get_name()) self.display_header(of,"%s - %s" % (_('Sources'), source_name),get_researcher().get_name())
self.display_first_image_as_thumbnail(of, db, source.get_media_list()) self.display_first_image_as_thumbnail(of, db, source.get_media_list())
@ -761,7 +761,7 @@ class GalleryPage(BasePage):
BasePage.__init__(self, title, options, archive, media_list) BasePage.__init__(self, title, options, archive, media_list)
of = self.create_file("gallery") of = self.create_file("gallery")
self.display_header(of, _('Gallery'), db.get_researcher().get_name()) self.display_header(of, _('Gallery'), get_researcher().get_name())
of.write('<h3>%s</h3>\n<p>' % _('Gallery')) of.write('<h3>%s</h3>\n<p>' % _('Gallery'))
@ -810,7 +810,7 @@ class DownloadPage(BasePage):
of = self.create_file("download") of = self.create_file("download")
self.display_header(of,_('Download'), self.display_header(of,_('Download'),
db.get_researcher().get_name()) get_researcher().get_name())
of.write('<h3>%s</h3>\n' % _('Download')) of.write('<h3>%s</h3>\n' % _('Download'))
@ -829,7 +829,7 @@ class ContactPage(BasePage):
of = self.create_file("contact") of = self.create_file("contact")
self.display_header(of,_('Contact'), self.display_header(of,_('Contact'),
db.get_researcher().get_name()) get_researcher().get_name())
of.write('<div class="summaryarea">\n') of.write('<div class="summaryarea">\n')
of.write('<h3>%s</h3>\n' % _('Contact')) of.write('<h3>%s</h3>\n' % _('Contact'))
@ -853,7 +853,7 @@ class ContactPage(BasePage):
except (IOError,OSError),msg: except (IOError,OSError),msg:
ErrorDialog(str(msg)) ErrorDialog(str(msg))
r = db.get_researcher() r = get_researcher()
of.write('<blockquote>\n') of.write('<blockquote>\n')
of.write('%s<br>\n' % r.name) of.write('%s<br>\n' % r.name)
@ -909,7 +909,7 @@ class IndividualPage(BasePage):
of = self.create_file(person.handle) of = self.create_file(person.handle)
self.display_header(of, self.sort_name, self.display_header(of, self.sort_name,
self.db.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_ind_relationships(of) self.display_ind_relationships(of)