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

Fix two things in nar web:

Browse Source 
1/fix bug that not scaled images are not printed out on webpage
  2/remove annoying warning dialogs on every missing images, and 
    replace it by one warning dialog at the end of the report


svn: r13913
This commit is contained in:
Benny Malengier 2009-12-25 11:44:20 +00:00
parent a52492c6ae
commit 862d1446d0
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,7 @@ _VGAP = 10
_HGAP = 30 _HGAP = 30
_SHADOW = 5 _SHADOW = 5
_XOFFSET = 5 _XOFFSET = 5
_WRONGMEDIAPATH = []
wrapper = TextWrapper() wrapper = TextWrapper()
wrapper.break_log_words = True wrapper.break_log_words = True
@ -2676,10 +2677,12 @@ class MediaPage(BasePage):
# display the image # display the image
if initial_image_path != newpath: if initial_image_path != newpath:
url = self.report.build_url_fname(newpath, None, self.up) url = self.report.build_url_fname(newpath,
mediadisplay += Html("a", href = url) + ( None, self.up)
Html("img", width = new_width, height = new_height, src = url, mediadisplay += Html("a", href = url) + (
alt = html_escape(self.page_title)) Html("img", width=new_width,
height=new_height, src=url,
alt=html_escape(self.page_title))
) )
else: else:
dirname = tempfile.mkdtemp() dirname = tempfile.mkdtemp()
@ -2806,6 +2809,9 @@ class MediaPage(BasePage):
newpath = os.path.join(to_dir, handle) + ext newpath = os.path.join(to_dir, handle) + ext
fullpath = Utils.media_path_full(db, photo.get_path()) fullpath = Utils.media_path_full(db, photo.get_path())
if not os.path.isfile(fullpath):
_WRONGMEDIAPATH.append([ photo.get_gramps_id(), fullpath])
return None
try: try:
if self.report.archive: if self.report.archive:
self.report.archive.add(fullpath, str(newpath)) self.report.archive.add(fullpath, str(newpath))
@ -5078,6 +5084,14 @@ class NavWebReport(Report):
# if an archive is being used, close it? # if an archive is being used, close it?
if self.archive: if self.archive:
self.archive.close() self.archive.close()
if len(_WRONGMEDIAPATH) > 0:
error = '\n'.join([_('ID=%(grampsid)s, path=%(dir)s') % {
'grampsid': x[0],
'dir': x[1]} for x in _WRONGMEDIAPATH[:10]])
if len(_WRONGMEDIAPATH) > 10:
error += '\n ...'
WarningDialog(_("Missing media objects:"), error)
self.progress.close() self.progress.close()
def build_person_list(self): def build_person_list(self):