version 1.64, 2005/10/28 17:49:45
|
version 1.65, 2005/11/24 18:31:31
|
Line 676 class ECHO_navigation(Folder):
|
Line 676 class ECHO_navigation(Folder):
|
|
|
loc=getattr(temp[x][1],'location','top') |
loc=getattr(temp[x][1],'location','top') |
if (loc==location): |
if (loc==location): |
listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) |
|
|
|
|
listNav.append((label,createPath(self,self.absolute_url(),temp[x][1].absolute_url(relative=1))+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) |
else: |
else: |
listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) |
|
|
|
|
listNav.append((label,createPath(self,self.absolute_url(),temp[x][1].absolute_url(relative=1))+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) |
|
#print self.REQUEST |
return listNav |
return listNav |
|
|
def tempSorted(self,hash,field="weight"): |
def tempSorted(self,hash,field="weight"): |
Line 781 class ECHO_navigation(Folder):
|
Line 784 class ECHO_navigation(Folder):
|
|
|
description=temp[x][1].title |
description=temp[x][1].title |
|
|
url=createPath(self.absolute_url(),temp[key][1].absolute_url()) |
|
|
url=createPath(self,self.absolute_url(),temp[key][1].absolute_url(relative=1)) |
|
|
if (self.REQUEST['URL']==url) | (self.REQUEST['URL']==url+"/index_html"): |
if (self.REQUEST['URL']==url) | (self.REQUEST['URL']==url+"/index_html"): |
html=html+startTag+"[%s]" % description+endTag |
html=html+startTag+"[%s]" % description+endTag |
Line 927 def manage_addECHO_navigation(self,id,ti
|
Line 931 def manage_addECHO_navigation(self,id,ti
|
|
|
|
|
|
|
def createPath(url1,url2): |
def createPath(self,url1,url2): |
temp1=url1.split("/") |
#bugfix in absolute_url, ploetzlich erschein in absolute_url der physikalische pfad. |
temp2=url2.split("/") |
|
for test in temp1: |
vp="/".join(self.REQUEST['VirtualRootPhysicalPath']) |
if temp2[0]==test: |
if vp[0]=="/": |
del temp2[0] |
vp=vp[1:] |
|
|
|
url2=url2.replace(vp+"/",'') |
|
|
|
|
#print "CP:"+url1+"::"+url2+"::"+url1+"/"+string.join(temp2,"/") |
return url1+"/"+url2 |
return url1+"/"+string.join(temp2,"/") |
|
|
|
def sortWeight(x,y): |
def sortWeight(x,y): |
#print x[1],y[1] |
#print x[1],y[1] |