--- ECHO_content/ECHO_Nav.py 2004/02/03 16:58:31 1.3 +++ ECHO_content/ECHO_Nav.py 2004/02/09 11:45:46 1.6 @@ -17,7 +17,7 @@ class ECHO_sqlElement(SimpleItem): meta_type="ECHO_sqlElement" baseUrl="" - def __init__(self,id,title,query,field,baseUrl,weight): + def __init__(self,id,title,query,field,baseUrl,weight,content_type): """init""" self.id=id self.title=title @@ -25,33 +25,43 @@ class ECHO_sqlElement(SimpleItem): self.field=field self.baseUrl=baseUrl self.weight=weight + self.content=content_type manage_options= SimpleItem.manage_options+( {'label':'Main Config','action':'changeECHO_sqlElementForm'}, ) def getWeight(self): - if has_attr('weight'): - return weight - + """get weight""" + if hasattr(self,'weight'): + return self.weight else: return 0 + def getContent_type(self): + """get weight""" + + if hasattr(self,'content_type'): + return self.content_type + else: + return 0 def changeECHO_sqlElementForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_sqlElement.zpt').__of__(self) + + pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self) return pt() - def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,RESPONSE=None): + def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,content_type,RESPONSE=None): """change""" self.title=title self.query=query self.field=field self.baseUrl=baseUrl self.weight=weight - + self.content_type=content_type + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -70,14 +80,14 @@ class ECHO_sqlElement(SimpleItem): return ret -def manage_AddECHO_sqlElementForm(self): +def manage_addECHO_sqlElementForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_sqlElement.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self) return pt() -def manage_AddECHO_sqlElement(self,id,title,query,field,baseUrl,RESPONSE=None): +def manage_addECHO_sqlElement(self,id,title,query,field,baseUrl,weight,content_type,RESPONSE=None): """Add an ECHO_sqlelement""" - self._setObject(id,ECHO_sqlElement(id,title,query,field,baseUrl)) + self._setObject(id,ECHO_sqlElement(id,title,query,field,baseUrl,weight,content_type)) if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -88,16 +98,38 @@ class ECHO_pageTemplate(ZopePageTemplate meta_type="ECHO_pageTemplate" _default_content_fn = os.path.join(package_home(globals()), - 'ECHO_pageTemplateDefault.html') + 'html/ECHO_pageTemplateDefault.html') manage_options=ZopePageTemplate.manage_options+( - {'label':'Weight','action':'changeECHO_pageTemplateWeightForm'}, + {'label':'Weight and Type','action':'changeECHO_pageTemplateWeightForm'}, ) def changeECHO_pageTemplateWeightForm(self): - """change""" - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self) - return pt() + """change""" + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self) + return pt() + + def changeECHO_pageTemplateWeight(self,weight,content_type,RESPONSE=None): + """change""" + self.weight=weight + self.content_type=content_type + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + def getWeight(self): + """get weight""" + if hasattr(self,'weight'): + return self.weight + else: + return 0 + + def getContent_Type(self): + """get weight""" + if hasattr(self,'weight'): + return self.weight + else: + return 0 @@ -109,15 +141,15 @@ class ECHO_pageTemplate(ZopePageTemplate ## text = open(self._default_cont).read() ## self.pt_edit(text, content_type) -def manage_AddECHO_pageTemplateForm(self): +def manage_addECHO_pageTemplateForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_pageTemplate.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt').__of__(self) return pt() from urllib import quote -def manage_AddECHO_pageTemplate(self, id, weight= 0,title=None, text=None, +def manage_addECHO_pageTemplate(self, id, weight= 0,content_type=0,title=None, text=None, REQUEST=None, submit=None): "Add a Page Template with optional file content." @@ -127,6 +159,7 @@ def manage_AddECHO_pageTemplate(self, id self._setObject(id, ECHO_pageTemplate(id, text)) ob = getattr(self, id) setattr(ob,'weight',weight) + setattr(ob,'content_type',content_type) if title: ob.pt_setTitle(title) return ob @@ -171,7 +204,7 @@ class ECHO_navigation(Folder): def ECHO_navigationConfigForm(self): """configForm""" - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_navigation.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_navigation.zpt').__of__(self) return pt() def ECHO_navigationConfig(self,title,pathToHierarchy,RESPONSE=None): @@ -210,7 +243,7 @@ class ECHO_navigation(Folder): #objtemp = compile(temp,'','single') #obj=eval(objtemp) - print obj + #print obj #print obj.__dict__.keys() @@ -219,6 +252,7 @@ class ECHO_navigation(Folder): 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) else: @@ -228,26 +262,47 @@ class ECHO_navigation(Folder): #print nav return nav - def barFromHash(self,hash,start=None): + def barFromHash(self,hash,start=None,sortField=None): """Erzeuge Navigations Element""" #print "hash",hash listNav=[] if not start: temp=hash + sortField="weight" else: # list mit pfad zum hash temp=hash - for x in start: - temp=temp[x][0] + print "HI",sortField + if not sortField: + tempObj=self.pathToHierarchy[0:] + tempObj=re.sub("/",".",tempObj) + tempObj="self.aq_parent"+tempObj + + objtemp=eval(tempObj) + + obj=objtemp + + for x in start: - for x in temp.keys(): - if temp[x][1].meta_type=="ECHO_sqlElement": - for z in temp[x][1].getNavList(): - listNav.append((z[0],z[1])) - else: - listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url()))) - print self.absolute_url(),"::",temp[x][1].absolute_url() - #print listNav + obj=getattr(obj,x) + + if hasattr(obj,'sortfield'): + sortField=obj.sortfield + else: + sortField='weight' + for x in start: + temp=temp[x][0] + print "HELL",sortField + for x in self.tempSorted(temp, field=sortField): + 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])) + else: + listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url()))) + + print self.getId(),start + print listNav #html="" #for k in listNav: @@ -256,6 +311,26 @@ class ECHO_navigation(Folder): return listNav + def tempSorted(self,hash,field="weight"): + ls=[] + print "SORT",field + for x in hash.keys(): + #print hash[x][1] + if hasattr(hash[x][1],field): + weight=getattr(hash[x][1],field) + #print weight + else: + weight=0 + + ls.append((x,weight)) + + ls.sort(sortWeight) + + return [x[0] for x in ls] + + + + def isSelectedPath(self,item): """test is path is already selected""" found=re.search("\?(.*)",item[1]) @@ -294,7 +369,7 @@ class ECHO_navigation(Folder): temp=temp[x][0] #print temp - for key in temp.keys(): + for key in self.tempSorted(temp): description=temp[x][1].title @@ -313,6 +388,7 @@ class ECHO_navigation(Folder): def mainNavBar(self): """print main navigation bar""" keys="" + print "NAVBAR",self.getId() try: keys=self.buttonsFromHash(self.createNavHash(0)) except: @@ -323,11 +399,13 @@ class ECHO_navigation(Folder): def mainNavElements(self): """print main navigation bar""" keys="" + print "NAVELEMENT",self.getId() + #try: + + keys=self.barFromHash(self.createNavHash(0)) - try: - keys=self.barFromHash(self.createNavHash(0)) - except: - keys="" + #except: + # keys="" return keys @@ -350,7 +428,7 @@ class ECHO_navigation(Folder): start=[splitted[2]] #print start - + keys=self.barFromHash(hash,start=start) @@ -382,12 +460,12 @@ class ECHO_navigation(Folder): return keys -def manage_AddECHO_navigationForm(self): +def manage_addECHO_navigationForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/AddECHO_navigation.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_navigation.zpt').__of__(self) return pt() -def manage_AddECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None): +def manage_addECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None): """Add an ECHO_root""" self._setObject(id,ECHO_navigation(id,title,pathToHierarchy)) @@ -407,5 +485,8 @@ def createPath(url1,url2): del temp2[0] return url1+"/"+string.join(temp2,"/") - + +def sortWeight(x,y): + #print x[1],y[1] + return cmp(x[1],y[1])