--- ECHO_content/ECHO_Nav.py 2004/04/15 11:24:56 1.14 +++ ECHO_content/ECHO_Nav.py 2004/06/07 13:37:26 1.31 @@ -12,6 +12,8 @@ from Products.PageTemplates.ZopePageTemp import os.path from Globals import package_home import urllib +from ECHO_helpers import displayTypes,checkOnlyOneInGroup +from ECHO_collection import content_html class ECHO_contentType(Image): """ContentType Object""" @@ -177,21 +179,32 @@ class ECHO_pageTemplate(ZopePageTemplate 'html/ECHO_pageTemplateDefault.html') manage_options=ZopePageTemplate.manage_options+( - {'label':'Weight and Type','action':'changeECHO_pageTemplateWeightForm'}, + {'label':'Main Config','action':'changeECHO_pageTemplateWeightForm'}, ) + def content_html(self): + """content_html""" + return content_html(self,'pageTemplate') + def changeECHO_pageTemplateWeightForm(self): """change""" pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self) return pt() - def changeECHO_pageTemplateWeight(self,weight,contentType,RESPONSE=None): + def changeECHO_pageTemplateWeight(self,weight,contentType,label,RESPONSE=None): """change""" self.weight=weight self.contentType=contentType - + self.label=label + if RESPONSE is not None: RESPONSE.redirect('manage_main') + + def getLabel(self): + if hasattr(self,'label'): + return self.label.encode('utf-8') + else: + return 0 def getWeight(self): """get weight""" @@ -225,7 +238,7 @@ def manage_addECHO_pageTemplateForm(self from urllib import quote -def manage_addECHO_pageTemplate(self, id, weight= 0,contentType=0,title=None, text=None, +def manage_addECHO_pageTemplate(self, id, label, weight= 0,contentType=0,title=None, text=None, REQUEST=None, submit=None): "Add a Page Template with optional file content." @@ -235,6 +248,7 @@ def manage_addECHO_pageTemplate(self, id self._setObject(id, ECHO_pageTemplate(id, text)) ob = getattr(self, id) setattr(ob,'weight',weight) + setattr(ob,'label',label) setattr(ob,'contentType',contentType) if title: ob.pt_setTitle(title) @@ -268,8 +282,12 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" - displayedMetaTypes=['ECHO_group','ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink'] + displayedMetaTypes=displayTypes + def getR(self): + """re""" + return self.REQUEST + def __init__(self,id,title,pathToHierarchy): """init""" self.id=id @@ -294,20 +312,20 @@ class ECHO_navigation(Folder): RESPONSE.redirect('manage_main') - def getColls(self,obj,depth): + def getColls(self,obj,depth,checkOnly="no"): nav={} #print "HERE",obj. - for keys in obj.__dict__.keys(): - x=getattr(obj,keys) - if hasattr(x,"meta_type"): - if x.meta_type in self.displayedMetaTypes: - if depth>1: - nav[x.getId()]=(self.getColls(x,depth-1),x) - else: - nav[x.getId()]=(None,x) + for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes): + x=x_objs[1] + if checkOnly=="yes": + x = checkOnlyOneInGroup(x) + if depth>1: + nav[x.getId()]=(self.getColls(x,depth-1),x) + else: + nav[x.getId()]=(None,x) return nav - def createNavHash(self,depth): + def createNavHash(self,depth,checkOnly="no"): """Auslesen des Hierarchiebuames""" temp=self.pathToHierarchy[0:] temp=re.sub("/",".",temp) @@ -316,23 +334,16 @@ class ECHO_navigation(Folder): objtemp=eval(temp) nav={} obj=objtemp - - #exec(obj) - #objtemp = compile(temp,'','single') - #obj=eval(objtemp) - #print obj - - #print obj.__dict__.keys() for keys in obj.__dict__.keys(): x=getattr(obj,keys) if hasattr(x,"meta_type"): - #print x.meta_type + if x.meta_type in self.displayedMetaTypes: if depth>1: - nav[x.getId()]=(self.getColls(x,int(depth)-1),x) + nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x) else: nav[x.getId()]=(None,x) @@ -354,7 +365,7 @@ class ECHO_navigation(Folder): tempObj=self.pathToHierarchy[0:] tempObj=re.sub("/",".",tempObj) tempObj="self.aq_parent"+tempObj - + #print tempObj objtemp=eval(tempObj) obj=objtemp @@ -382,17 +393,17 @@ class ECHO_navigation(Folder): if not temp[x][1].title == "": if temp[x][1].meta_type=="ECHO_sqlElement": for z in temp[x][1].getNavList(): - listNav.append((z[0],z[1])) + listNav.append((z[0],z[1],None)) else: - # add label fals existiert und nicht leer + # add label falls existiert und nicht leer if hasattr(temp[x][1],'label'): if not temp[x][1].label=='': - label=temp[x][1].label + label=temp[x][1].label.encode('utf-8') else: - label=temp[x][1].title + label=temp[x][1].title.encode('utf-8') else: - label=temp[x][1].title + label=temp[x][1].title.encode('utf-8') listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1])) @@ -428,14 +439,14 @@ class ECHO_navigation(Folder): def isSelectedPath(self,item): """test is path is already selected""" - found=re.search("\?(.*)",item[1]) + found=re.search("\?(.*)/",item[1]) if found: temp=re.sub(" ","%20",found.group(0)) #print temp+"::"+self.REQUEST['QUERY_STRING'] if ("?"+self.REQUEST['QUERY_STRING'])==temp: return 1 - if re.search(item[1],self.REQUEST['URL']): + if re.search(item[1]+"/",self.REQUEST['URL']): return 1 else: return 0 @@ -509,10 +520,20 @@ class ECHO_navigation(Folder): return len(self.barFromHash(self.createNavHash(0))) + def startOfHierarchy(self,list): + splitted=self.pathToHierarchy.split("/") + last=splitted[len(splitted)-1] + #print last,list + try: + nr=list.index(last) + except: + nr=0 + return nr+1 + def secondNavElements(self): """Zweite Ordnung""" - hash=self.createNavHash(2) + hash=self.createNavHash(2,checkOnly="no") actual_url=self.REQUEST['URL'] ult_temp=re.sub(self.absolute_url(),"",actual_url) @@ -520,13 +541,12 @@ class ECHO_navigation(Folder): splitted=ult_temp.split("/") - - ## if splitted[len(splitted)-1]=="index_html": -## start=[splitted[len(splitted)-2]] -## else: -## start=[splitted[len(splitted)-1]] - - start=[splitted[2]] + #print "AU",self.absolute_url(),splitted + #start=[splitted[2]] #orig + startNr= self.startOfHierarchy(splitted) + + start=[splitted[startNr]] + #print start keys=self.barFromHash(hash,start=start) @@ -551,7 +571,10 @@ class ECHO_navigation(Folder): ## else: ## start=[splitted[len(splitted)-1]] - start=splitted[2:order+1] + #start=splitted[2:order+1] #orig + startNr= self.startOfHierarchy(splitted) + #print startNr + start=splitted[startNr:order+startNr-1] #print start keys=self.barFromHash(hash,start=start) @@ -609,6 +632,7 @@ def createPath(url1,url2): if temp2[0]==test: del temp2[0] + #print "CP:"+url1+"::"+url2+"::"+url1+"/"+string.join(temp2,"/") return url1+"/"+string.join(temp2,"/") def sortWeight(x,y):