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

4523: WebCal generates wrong path slash -\ instead of /

Browse Source 
svn: r18074
This commit is contained in:
Michiel Nauta 2011-08-27 09:51:58 +00:00
parent 41dfd5e55e
commit a7bfa88f3b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/webreport/WebCal.py
View File

@ -380,7 +380,7 @@ class WebCalReport(Report):
""" """
# number of subdirectories up to reach root # number of subdirectories up to reach root
subdirs = '../'*nr_up subdirs = ['..'] * nr_up
# Header contants # Header contants
xmllang = xml_lang() xmllang = xml_lang()
@ -395,10 +395,10 @@ class WebCalReport(Report):
body.attr = "id = '%(idtag)s'" % { 'idtag' : body_id } body.attr = "id = '%(idtag)s'" % { 'idtag' : body_id }
# GRAMPS favicon # GRAMPS favicon
fname1 = os.path.join(subdirs, "images", "favicon2.ico") fname1 = "/".join(subdirs + ["images", "favicon2.ico"])
# _CALENDARSCREEN stylesheet # _CALENDARSCREEN stylesheet
fname2 = os.path.join(subdirs, "styles", _CALENDARSCREEN) fname2 = "/".join(subdirs + ["styles", _CALENDARSCREEN])
# create additional meta tags # create additional meta tags
meta = Html("meta", attr = _META1) + ( meta = Html("meta", attr = _META1) + (
@ -412,14 +412,14 @@ class WebCalReport(Report):
# add printer stylesheet to webcalendar() and one_day() only # add printer stylesheet to webcalendar() and one_day() only
if add_print: if add_print:
fname = os.path.join(subdirs, "styles", _CALENDARPRINT) fname = "/".join(subdirs + ["styles", _CALENDARPRINT])
links += Html("link",rel = "stylesheet", href = fname,type = "text/css", media = "print", indent = False) links += Html("link",rel = "stylesheet", href = fname,type = "text/css", media = "print", indent = False)
# add horizontal menu if css == Blue or Visually because there is no menus # add horizontal menu if css == Blue or Visually because there is no menus
if CSS[self.css]["navigation"]: if CSS[self.css]["navigation"]:
# Link to Navigation Menus stylesheet # Link to Navigation Menus stylesheet
fname = os.path.join(subdirs, "styles", "Web_Navigation-Menus.css") fname = "/".join(subdirs + ["styles", "Web_Navigation-Menus.css"])
links.extend( links.extend(
Html("link", href = fname, type = "text/css", media = "screen", rel = "stylesheet") Html("link", href = fname, type = "text/css", media = "screen", rel = "stylesheet")
) )