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

NarrativeWeb : issue 2788 and 2914 : mixed / and \\ on windows

Browse Source 
svn: r13129
This commit is contained in:
Serge Noiraud 2009-08-28 16:25:30 +00:00
parent 940b2471c4
commit 40399556c2
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,6 +524,8 @@ class BasePage(object):
of.write('\t<div class="snapshot">\n') of.write('\t<div class="snapshot">\n')
# TODO. Check if build_url_fname can be used. # TODO. Check if build_url_fname can be used.
newpath = '/'.join(['..']*3 + [newpath]) newpath = '/'.join(['..']*3 + [newpath])
if ( Utils.win ):
newpath = newpath.replace('\\','/')
self.media_link(of, photo_handle, newpath, '', up=True) self.media_link(of, photo_handle, newpath, '', up=True)
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
except (IOError, OSError), msg: except (IOError, OSError), msg:
@ -570,6 +572,8 @@ class BasePage(object):
descr = " ".join(wrapper.wrap(title)) descr = " ".join(wrapper.wrap(title))
# TODO. Check if build_url_fname can be used. # TODO. Check if build_url_fname can be used.
newpath = '/'.join(['..']*3 + [newpath]) newpath = '/'.join(['..']*3 + [newpath])
if ( Utils.win ):
newpath = newpath.replace('\\','/')
self.media_link(of, photo_handle, newpath, descr, up=True) self.media_link(of, photo_handle, newpath, descr, up=True)
except (IOError, OSError), msg: except (IOError, OSError), msg:
WarningDialog(_("Could not add photo to page"), str(msg)) WarningDialog(_("Could not add photo to page"), str(msg))
@ -1970,6 +1974,8 @@ class IndividualPage(BasePage):
if mime_type: if mime_type:
(photoUrl, thumbnailUrl) = self.report.prepare_copy_media(photo) (photoUrl, thumbnailUrl) = self.report.prepare_copy_media(photo)
thumbnailUrl = '/'.join(['..']*3 + [thumbnailUrl]) thumbnailUrl = '/'.join(['..']*3 + [thumbnailUrl])
if ( Utils.win ):
thumbnailUrl = thumbnailUrl.replace('\\','/')
person_name = _nd.display(person) person_name = _nd.display(person)
url = self.report.build_url_fname_html(person.handle, 'ppl', True) url = self.report.build_url_fname_html(person.handle, 'ppl', True)
self.person_link(of, url, person_name, thumbnailUrl=thumbnailUrl) self.person_link(of, url, person_name, thumbnailUrl=thumbnailUrl)
@ -3149,6 +3155,8 @@ class NavWebReport(Report):
of.write('\t<img') of.write('\t<img')
if height: if height:
of.write(' height="%d"' % height) of.write(' height="%d"' % height)
if ( Utils.win ):
newpath = newpath.replace('\\','/')
of.write(' src="%s"' % newpath) of.write(' src="%s"' % newpath)
of.write(' alt="%s"' % obj.get_description()) of.write(' alt="%s"' % obj.get_description())
of.write(' />\n') of.write(' />\n')
@ -3186,7 +3194,10 @@ class NavWebReport(Report):
subdirs.append(subdir) subdirs.append(subdir)
if up: if up:
subdirs = ['..']*3 + subdirs subdirs = ['..']*3 + subdirs
return '/'.join(subdirs + [fname]) nname = '/'.join(subdirs + [fname])
if ( Utils.win ):
nname = nname.replace('\\','/')
return nname
def build_url_fname_html(self, fname, subdir=None, up=False): def build_url_fname_html(self, fname, subdir=None, up=False):
return self.build_url_fname(fname, subdir, up) + self.ext return self.build_url_fname(fname, subdir, up) + self.ext
@ -3205,6 +3216,8 @@ class NavWebReport(Report):
Imagine we run gramps on Windows (heaven forbits), we don't want to Imagine we run gramps on Windows (heaven forbits), we don't want to
see backslashes in the URL. see backslashes in the URL.
""" """
if ( Utils.win ):
fname = fname.replace('\\','/')
subdirs = self.build_subdirs(subdir, fname, up) subdirs = self.build_subdirs(subdir, fname, up)
return '/'.join(subdirs + [fname]) return '/'.join(subdirs + [fname])