--- ECHO_content/ECHO_Nav.py	2004/04/04 14:56:05	1.10
+++ ECHO_content/ECHO_Nav.py	2004/04/15 11:24:56	1.14
@@ -1,6 +1,7 @@
 # Objekte zur Erzeugung von Navigationselementen
 
-
+from Globals import DTMLFile
+from OFS.Image import Image,cookId
 from OFS.Folder import Folder
 from OFS.SimpleItem import SimpleItem
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -12,6 +13,66 @@ import os.path
 from Globals import package_home
 import urllib
 
+class ECHO_contentType(Image):
+    """ContentType Object"""
+
+    meta_type="ECHO_contentType"
+
+    
+    manage_options=Image.manage_options+(
+        {'label':'Change Description','action':'changeECHO_contentTypeForm'},
+       )
+
+    def changeECHO_contentTypeForm(self):
+        """Change the description text"""
+        pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_contentType.zpt').__of__(self)
+        return pt()
+
+    def changeECHO_contentType(self,description,RESPONSE=None):
+        """Change the Content"""
+        self.description=description
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+manage_addECHO_contentTypeForm=DTMLFile('dtml/ECHO_contentTypeAdd',globals(),
+                             Kind='ECHO_contentType',kind='ECHO_contentType')
+
+def manage_addECHO_contentType(self, id, file=None, title='', precondition='', content_type='', description='',
+                    REQUEST=None):
+    """
+    Add a new Image object.
+
+    Creates a new Image object 'id' with the contents of 'file'.
+    """
+
+    id=str(id)
+    title=str(title)
+    content_type=str(content_type)
+    precondition=str(precondition)
+
+    id, title = cookId(id, title, file)
+
+    self=self.this()
+
+    # First, we create the image without data:
+    self._setObject(id, ECHO_contentType(id,title,'',content_type, precondition))
+
+    self._getOb(id).description=description
+        
+    # Now we "upload" the data.  By doing this in two steps, we
+    # can use a database trick to make the upload more efficient.
+    if file:
+        self._getOb(id).manage_upload(file)
+    if content_type:
+        self._getOb(id).content_type=content_type
+
+    if REQUEST is not None:
+        try:    url=self.DestinationURL()
+        except: url=REQUEST['URL1']
+        REQUEST.RESPONSE.redirect('%s/manage_main' % url)
+    return id
+
+
 class ECHO_sqlElement(SimpleItem):
     """Erzeuge navigation aus sql-abfrage"""
     meta_type="ECHO_sqlElement"
@@ -207,7 +268,7 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
-    displayedMetaTypes=['ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
+    displayedMetaTypes=['ECHO_group','ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
     
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -316,7 +377,7 @@ class ECHO_navigation(Folder):
                     """nothing"""
                     return []
             #print "TEMP",temp,self.tempSorted(temp, field=sortField)
-        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":
@@ -327,7 +388,7 @@ class ECHO_navigation(Folder):
                     if hasattr(temp[x][1],'label'):
                         if not temp[x][1].label=='':
                             label=temp[x][1].label
-                            print "HAS LABEL",label
+                            
                         else:
                             label=temp[x][1].title
                     else:
@@ -347,7 +408,7 @@ class ECHO_navigation(Folder):
 
     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):
@@ -422,7 +483,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:
@@ -433,16 +494,21 @@ class ECHO_navigation(Folder):
     def mainNavElements(self):
         """print main navigation bar"""
         keys=""
-        print "NAVELEMENT",self.getId()
+        #print "NAVELEMENT",self.getId()
         #try:
       
         keys=self.barFromHash(self.createNavHash(0))
-
+        
         #except:
         #    keys=""
             
         return keys
-    
+
+    def numberOfMainNavElements(self):
+	"""number of main elements"""
+
+	return len(self.barFromHash(self.createNavHash(0))) 
+
     def secondNavElements(self):
         """Zweite Ordnung"""