--- ECHO_content/ECHO_Nav.py 2004/08/31 17:26:05 1.42 +++ ECHO_content/ECHO_Nav.py 2004/09/01 14:32:32 1.43 @@ -324,12 +324,13 @@ class ECHO_pageTemplate(ZopePageTemplate pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self) return pt() - def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None): + def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None): """change""" self.weight=weight self.contentType=contentType self.label=label self.description=description + self.isAlwaysClickable=isAlwaysClickable if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -642,17 +643,35 @@ class ECHO_navigation(Folder): def isSelectedPath(self,item): """test is path is already selected""" + 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: + if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? + + return 2 + else: + return 1 + + if (item[2].meta_type=="ECHO_pageTemplate") and (re.search(item[1],self.REQUEST['URL'])): + if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? + + return 2 + else: return 1 if re.search(item[1]+"/",self.REQUEST['URL']): - return 1 + if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? + + return 2 + else: + return 1 else: return 0 + + def buttonsFromHash(self,hash,start=None,orientation="horizontal"):