ECHO_content/ECHO_Nav.py - diff

Return to ECHO_Nav.py CVS log

Up to [Repository] / ECHO_content

version 1.67, 2005/12/04 09:10:55	version 1.68, 2005/12/05 17:18:43
Line 634 class ECHO_navigation(Folder):	Line 634 class ECHO_navigation(Folder):

def barFromHash(self,hash,start=None,sortField=None,location=None):	def barFromHash(self,hash,start=None,sortField=None,location=None):
"""Erzeuge Navigations Element"""	"""Erzeuge Navigations Element"""
#print "hash",hash
listNav=[]	listNav=[]
if not start:	if not start:
temp=hash	temp=hash
Line 866 class ECHO_navigation(Folder):	Line 866 class ECHO_navigation(Folder):
"""Zweite Ordnung Navigationselemente"""	"""Zweite Ordnung Navigationselemente"""

hash=self.createNavHash(2,checkOnly="no")	hash=self.createNavHash(2,checkOnly="no")

actual_url=self.REQUEST['URL']	actual_url=self.REQUEST['URL']

ult_temp=re.sub(self.absolute_url(),"",actual_url)	ult_temp=re.sub(self.absolute_url(),"",actual_url)
Line 966 def createPath(self,url1,url2):	Line 967 def createPath(self,url1,url2):
vp=vp[1:]	vp=vp[1:]

url2=url2.replace(vp+"/",'')	url2=url2.replace(vp+"/",'')
	else:
	temp1=url1.split("/")
	temp2=url2.split("/")
	for test in temp1:
	if temp2[0]==test:
	del temp2[0]

	url2= string.join(temp2,"/")

return url1+"/"+url2	return url1+"/"+url2