--- ECHO_content/ECHO_Nav.py 2004/10/28 14:15:02 1.49
+++ ECHO_content/ECHO_Nav.py 2005/01/31 11:15:50 1.53
@@ -31,6 +31,7 @@ from Globals import package_home
import urllib
from ECHO_helpers import displayTypes,checkOnlyOneInGroup
from ECHO_collection import content_html
+import zLOG
try:
from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
@@ -296,14 +297,14 @@ def manage_addECHO_sqlElement(self,id,ti
RESPONSE.redirect('manage_main')
-class ECHO_pageTemplate(ZopePageTemplate):
+class ECHO_pageTemplate(ZopePageTemplate,ECHO_basis):
"""pageTemplate Objekt"""
meta_type="ECHO_pageTemplate"
_default_content_fn = os.path.join(package_home(globals()),
'html/ECHO_pageTemplateDefault.html')
- manage_options=ZopePageTemplate.manage_options+(
+ manage_options=ZopePageTemplate.manage_options+ECHO_basis.manage_options+(
{'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
)
@@ -328,14 +329,7 @@ class ECHO_pageTemplate(ZopePageTemplate
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
-
- def getLabel(self):
- if hasattr(self,'label'):
- return self.label.encode('utf-8')
-
- else:
- return 0
-
+
def getWeight(self):
"""get weight"""
if hasattr(self,'weight'):
@@ -413,6 +407,30 @@ class ECHO_navigation(Folder):
"""Navigations Element"""
meta_type="ECHO_Navigation"
+ def linkBar(self,parent):
+ """linkbarer balken"""
+ str=""
+
+
+ while not(parent.meta_type == "ECHO_root"):
+ fragment="""%s"""%(parent.absolute_url(),parent.label)
+ str=fragment+"/"+str
+ parent=parent.aq_parent
+
+ return str
+
+ def decode(self,str):
+ """decoder"""
+ if not str:
+ return ""
+ if type(str)==StringType:
+
+ return str
+ else:
+ try:
+ return str.encode('utf-8')
+ except:
+ return str.encode('latin-1')
def ECHOFormatListStr(self,list,search="\n",replace="
"):
"""formatiert liste im str"""
if list:
@@ -617,13 +635,14 @@ class ECHO_navigation(Folder):
label=temp[x][1].title.encode('utf-8')
else:
label=temp[x][1].title.encode('utf-8')
-
+
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],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
+ listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),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],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
+ listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
return listNav
@@ -633,7 +652,10 @@ class ECHO_navigation(Folder):
for x in hash.keys():
#print hash[x][1]
if hasattr(hash[x][1],field):
- weight=getattr(hash[x][1],field)
+ try:
+ weight=int(getattr(hash[x][1],field))
+ except:
+ weight=getattr(hash[x][1],field)
#print weight
else:
weight=0
@@ -768,7 +790,9 @@ class ECHO_navigation(Folder):
return nr+1
def secondNavElements(self):
- """Zweite Ordnung"""
+ """Zweite Ordnung Navigationselemente
+
+ """
hash=self.createNavHash(2,checkOnly="no")
actual_url=self.REQUEST['URL']