Diff for /ECHO_content/ECHO_collection.py between versions 1.29 and 1.34

version 1.29, 2004/04/05 12:07:57 version 1.34, 2004/04/07 17:27:49
Line 195  class ECHO_layoutTemplate(ZopePageTempla Line 195  class ECHO_layoutTemplate(ZopePageTempla
   
     meta_type="ECHO_layoutTemplate"      meta_type="ECHO_layoutTemplate"
   
     manage_options=ZopePageTemplate.manage_options+(      #manage_options=ZopePageTemplate.manage_options+(
         {'label':'Set back to Standard','action':'changeECHO_layoutTemplateToStandardForm'},      #    {'label':'Set back to Standard','action':'changeECHO_layoutTemplateToStandardForm'},
         )      #    )
   
   
     def __init__(self, id, text=None, content_type=None,EchoType=None):      def __init__(self, id, text=None, content_type=None,EchoType=None):
Line 212  class ECHO_layoutTemplate(ZopePageTempla Line 212  class ECHO_layoutTemplate(ZopePageTempla
             text = open(self._default_content_fn).read()              text = open(self._default_content_fn).read()
         self.pt_edit(text, content_type)          self.pt_edit(text, content_type)
   
     def changeECHO_layoutTemplateToStandardForm(self):     ##  def changeECHO_layoutTemplateToStandardForm(self):
         """change form"""  ##         """change form"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_pageTemplateWeightForm.zpt').__of__(self)  ##         pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_pageTemplateWeightForm.zpt').__of__(self)
         return pt()  ##         return pt()
   
   
     def changeECHO_pageTemplateWeight(self,templateKind):  
         """change form"""          """change form"""
   
   
Line 237  def manage_addECHO_layoutTemplate(self, Line 237  def manage_addECHO_layoutTemplate(self,
         EchoTypes=EchoType          EchoTypes=EchoType
                   
     for singleType in EchoTypes:      for singleType in EchoTypes:
   
         id = str(singleType)+"_template"          id = str(singleType)+"_template"
         if REQUEST is None:          if REQUEST is None:
             self._setObject(id, ECHO_layoutTemplate(id, text,EchoType=singleType))              self._setObject(id, ECHO_layoutTemplate(id, text,EchoType=singleType))
Line 336  class ECHO_resource(Folder): Line 337  class ECHO_resource(Folder):
     def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):      def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
         """Änderung der Properties"""          """Änderung der Properties"""
                   
               try:        
         coordsnew=[ string.split(x,",") for x in coords]          coordsnew=[ string.split(x,",") for x in coords]
                   except:
           coordsnew=[]    
                   
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)          setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
   
Line 542  class ECHO_collection(Folder, Persistent Line 544  class ECHO_collection(Folder, Persistent
         except:          except:
             return None              return None
           
       def getSecondaryLink(self):
           """secondary link"""
           try:
               return self.secondaryLink
           except:
               return ""
   
       def getSecondaryLinkTitle(self):
           """secondary link"""
           try:
               return self.secondaryLinkTitle
           except:
               return ""
           
     def getCollectionTreeXML(self):      def getCollectionTreeXML(self):
         """Tree as XML"""          """Tree as XML"""
   
Line 630  class ECHO_collection(Folder, Persistent Line 646  class ECHO_collection(Folder, Persistent
   
             return []              return []
                   
     def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,imageTag=""):      def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
         #print "CO",coords          #print "CO",coords
   
         self.id = id          self.id = id
Line 646  class ECHO_collection(Folder, Persistent Line 662  class ECHO_collection(Folder, Persistent
         self.sortfield=sortfield          self.sortfield=sortfield
         coordsnew=[ string.split(x,",") for x in coords]          coordsnew=[ string.split(x,",") for x in coords]
         self.coords=coordsnew          self.coords=coordsnew
           self.secondaryLinkTitle=secondaryLinkTitle
           self.secondaryLink=secondaryLink
       self.bgcolour=bgcolor
   
   
     manage_options = Folder.manage_options+(      manage_options = Folder.manage_options+(
Line 704  class ECHO_collection(Folder, Persistent Line 723  class ECHO_collection(Folder, Persistent
     security.declarePublic('changeECHO_collection')      security.declarePublic('changeECHO_collection')
   
   
     def changeECHO_collection(self,title,label,description,contentType,responsible,weight,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag=""):      def getBgcolour(self):
           """colour"""
           if hasattr(self,'bgcolour') and not (self.bgcolour==""):
               return self.bgcolour
           else:
               return "#dddddd"
           
       def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour=""):
         """Änderung der Properties"""          """Änderung der Properties"""
   
           self.secondaryLink=secondaryLink
           self.secondaryLinkTitle=secondaryLinkTitle
         self.imageTag=imageTag          self.imageTag=imageTag
       self.bgcolour=bgcolour
       
           if coords:
         coordsnew=[ string.split(x,",") for x in coords]          coordsnew=[ string.split(x,",") for x in coords]
               self.coords=coordsnew[0:]
           else:
               coordsnew=None
               self.coords=None
   
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)          setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
                   
         self.coords=coordsnew[0:]      
           
         self.sortfield=sortfield          self.sortfield=sortfield
   
         if RESPONSE is not None:          if RESPONSE is not None:
Line 734  class ECHO_collection(Folder, Persistent Line 770  class ECHO_collection(Folder, Persistent
                   
         if 'index.html' in self.__dict__.keys():          if 'index.html' in self.__dict__.keys():
             return getattr(self,'index.html')()              return getattr(self,'index.html')()
           
         elif 'overview' in self.__dict__.keys():          elif 'overview' in self.__dict__.keys():
             return self.showOverview()              return self.showOverview()
                       elif hasattr(self,'collection_index_template'):
               return self.collection_index_template()    
                   
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_standard.zpt').__of__(self)          pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_standard.zpt').__of__(self)
         pt.content_type="text/html"          pt.content_type="text/html"
Line 823  def manage_addECHO_collectionForm(self): Line 861  def manage_addECHO_collectionForm(self):
         return pt()          return pt()
   
   
 def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",credits=None,RESPONSE=None,imageTag=""):  def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
     """add a echo collection"""      """add a echo collection"""
           
   
     newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,imageTag)      newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="")
   
     self._setObject(id,newObj)      self._setObject(id,newObj)
   
Line 863  class ECHO_root(Folder,Persistent,Implic Line 901  class ECHO_root(Folder,Persistent,Implic
         if not obj:          if not obj:
             obj = self              obj = self
                           
         entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection,ECHO_externalLink,ECHO_pageTemplate'])          entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection','ECHO_externalLink','ECHO_pageTemplate'])
   
         for entry in entries:          for entry in entries:
                                   setattr(entry[1],'contentType',entry[1].content_type)
                 entry[1].contentType == entry[1].content_type                  #entry[1].contentType == entry[1].content_type
   
                 if entry[1].meta_type == 'ECHO_collection':                  if entry[1].meta_type == 'ECHO_collection':
                     entry[1].patchContentType(entry[1])                          entry[1].patchContentType(entry[1])    

Removed from v.1.29  
changed lines
  Added in v.1.34


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>