--- zogiLib/zogiLib.py 2006/11/14 09:47:20 1.67 +++ zogiLib/zogiLib.py 2008/11/20 10:44:24 1.70 @@ -358,7 +358,7 @@ class zogiLib(Folder): return {} - def zogilibPath(self, otherbase=None): + def zogilibPathOLD(self, otherbase=None): """returns an URL to the zogiLib instance""" url = self.REQUEST['URL1'] # should end with "/" @@ -373,6 +373,20 @@ class zogiLib(Folder): url += '/' return url + def zogilibPath(self, otherbase=None): + """returns an URL to the zogiLib instance""" + url = self.absolute_url() + # should end with "/" + if len(url) > 0 and url[-1] != '/': + url += '/' + if type(otherbase) is str: + url += otherbase + else: + url += self.basePath + # should still end with "/" + if len(url) > 0 and url[-1] != '/': + url += '/' + return url def zogilibAction(self, action, otherbase=None): """returns a URL with zogilib path and action""" url = self.zogilibPath(otherbase) @@ -464,7 +478,7 @@ class zogiLib(Folder): # make shure to remove unused parameter del self.REQUEST.SESSION['scalerDiv'] - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/zogilib_img_div')).__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/img_div')).__of__(self) return pt() def index_html(self): @@ -901,7 +915,7 @@ def manage_addZogiLibPageTemplate(self, id = 'main_%s'%layout self._setObject(id, zogiLibPageTemplate(id)) ob = getattr(self, id) - ob.pt_edit(open(os.path.join(package_home(globals()),'zpt/main_%s.zpt'%layout)).read(),None) + ob.pt_edit(open(os.path.join(package_home(globals()),'zpt/main_%s.zpt'%layout)).read(),'text/html') if title: ob.pt_setTitle(title) try: