--- ECHO_content/ECHO_Nav.py 2004/08/31 17:26:05 1.42 +++ ECHO_content/ECHO_Nav.py 2004/10/28 13:38:39 1.48 @@ -12,9 +12,9 @@ from Products.PageTemplates.ZopePageTemp import os.path from Globals import package_home import urllib -from ECHO_helpers import displayTypes,checkOnlyOneInGroup +from ECHO_helpers import * from ECHO_collection import content_html - +from types import * from Globals import DTMLFile @@ -51,6 +51,7 @@ class ECHO_ZCatalogElement(SimpleItem): self.weight=weight self.content=contentType + manage_options= SimpleItem.manage_options+( {'label':'Main Config','action':'changeECHO_ZCatalogElementForm'}, ) @@ -75,7 +76,7 @@ class ECHO_ZCatalogElement(SimpleItem): def changeECHO_ZCatalogElementForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_ZCatalogElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_ZCatalogElement.zpt')).__of__(self) return pt() def changeECHO_ZCatalogElement(self,title,field,catalogId,baseUrl,weight,contentType,RESPONSE=None): @@ -116,7 +117,7 @@ class ECHO_ZCatalogElement(SimpleItem): def manage_addECHO_ZCatalogElementForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_ZCatalogElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_content/zpt/AddECHO_ZCatalogElement.zpt')).__of__(self) return pt() def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None): @@ -140,9 +141,9 @@ class ECHO_contentType(Image): def changeECHO_contentTypeForm(self): """Change the description text""" - pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_contentType.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_contentType.zpt')).__of__(self) return pt() - + def changeECHO_contentType(self,description,RESPONSE=None): """Change the Content""" self.description=description @@ -238,7 +239,7 @@ class ECHO_sqlElement(SimpleItem): def changeECHO_sqlElementForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_sqlElement.zpt')).__of__(self) return pt() def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None): @@ -293,7 +294,7 @@ class ECHO_sqlElement(SimpleItem): def manage_addECHO_sqlElementForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_sqlElement.zpt')).__of__(self) return pt() def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None): @@ -321,15 +322,18 @@ class ECHO_pageTemplate(ZopePageTemplate def changeECHO_pageTemplateMainForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'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,suffix=None,prefix=None): """change""" self.weight=weight self.contentType=contentType self.label=label self.description=description + self.isAlwaysClickable=isAlwaysClickable + self.suffix=suffix + self.prefix=prefix if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -337,6 +341,7 @@ class ECHO_pageTemplate(ZopePageTemplate def getLabel(self): if hasattr(self,'label'): return self.label.encode('utf-8') + else: return 0 @@ -366,7 +371,7 @@ class ECHO_pageTemplate(ZopePageTemplate def manage_addECHO_pageTemplateForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt')).__of__(self) return pt() from urllib import quote @@ -426,7 +431,7 @@ class ECHO_navigation(Folder): def ECHO_cacheManageForm(self): """change form""" - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_cacheManageForm').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_cacheManageForm')).__of__(self) pt.content_type="text/html" return pt() @@ -438,9 +443,13 @@ class ECHO_navigation(Folder): self.setCache(managerName=cacheManagerName) if deleteCache: + try: self.deleteCache() + except: + for roots in self.ZopeFind(self,obj_metatypes=['ECHO_root'],search_sub=1): + roots[1].deleteCache() + - print activateCache self.activateCache=activateCache if RESPONSE is not None: @@ -462,8 +471,10 @@ class ECHO_navigation(Folder): return "changed all CM in: "+self.title - displayedMetaTypes=displayTypes + + displayableMetaTypes=displayTypes + def getImageViewers(self): """images""" viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject']) @@ -478,22 +489,26 @@ class ECHO_navigation(Folder): self.id=id self.title=title self.pathToHierarchy=pathToHierarchy - + self.displayedMetaTypes=displayTypes + manage_options = Folder.manage_options+( {'label':'Main Config','action':'ECHO_navigationConfigForm'}, {'label':'Cache','action':'ECHO_cacheManageForm'}, ) - + displayedMetaTypes=displayTypes + def ECHO_navigationConfigForm(self): """configForm""" - pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_navigation.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_navigation.zpt')).__of__(self) return pt() - def ECHO_navigationConfig(self,title,pathToHierarchy,RESPONSE=None): + def ECHO_navigationConfig(self,title,pathToHierarchy,displayedMetaTypes=displayTypes,RESPONSE=None): """config""" self.title=title self.pathToHierarchy=pathToHierarchy + self.displayedMetaTypes=toList(displayedMetaTypes)[0:] + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -596,14 +611,15 @@ class ECHO_navigation(Folder): if (temp[x][1].meta_type=="ECHO_sqlElement") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"): for z in temp[x][1].getNavList(): - listNav.append((z[0],z[1],None)) + listNav.append((z[0],z[1],None,'','')) else: # add label falls existiert und nicht leer if hasattr(temp[x][1],'label'): + if not temp[x][1].label=='': try: - label=temp[x][1].label.encode('utf-8','ignore') + label=temp[x][1].getLabel() except: label=temp[x][1].label else: @@ -614,9 +630,9 @@ class ECHO_navigation(Folder): if location: loc=getattr(temp[x][1],'location','top') if (loc==location): - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1])) + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) else: - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1])) + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) return listNav @@ -642,17 +658,44 @@ class ECHO_navigation(Folder): def isSelectedPath(self,item): """test is path is already selected""" - found=re.search("\?(.*)/",item[1]) + + testStr=re.sub("/index_html",'',self.REQUEST.get('URL','')) + + #falls exakte Übereinstimmung dann immer 1 + if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''): + + return 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: + if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? + + return 2 + else: + return 1 + + if (getattr(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"): @@ -813,7 +856,7 @@ class ECHO_navigation(Folder): def manage_addECHO_navigationForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_navigation.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_navigation.zpt')).__of__(self) return pt() def manage_addECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):