--- ECHO_content/ECHO_helpers.py 2010/10/11 13:15:00 1.103
+++ ECHO_content/ECHO_helpers.py 2012/01/17 18:39:07 1.103.2.3
@@ -19,7 +19,7 @@ import bz2
import xmlrpclib
import sys
import logging
-import amara
+#import amara
#erstzt logging
def logger(txt,method,txt2):
@@ -131,6 +131,9 @@ class ECHO_basis:
"""return utf-8 encoded string object for string or unicode object s"""
return utf8ify(s)
+ def getBrowserType(self):
+ """returns browserType object"""
+ return browserType(self)
def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):
return ECHO_collection.manage_addECHO_locale(self,lang,title,label)
@@ -324,9 +327,7 @@ class ECHO_basis:
def getOverview(self):
"""map overview graphics"""
#return self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['overview'])[0][1]
- if self.hasOverview():
- return getattr(self, 'overview')
- return None
+ return getattr(self, 'overview', None)
def getMapAreas(self):
"""returns the list of MapAreas"""
@@ -441,10 +442,10 @@ class ECHO_basis:
def createMapImg(self):
"""generate img-tag for map"""
- bt = BrowserCheck(self)
+ bt = browserType(self)
tag = ""
src = self.getOverview().absolute_url()
- if bt.isN4:
+ if bt['isN4']:
# N4 needs ilayer to create an id
tag += ''%src
else:
@@ -458,7 +459,7 @@ class ECHO_basis:
def createMapLink(self, ob, text=None, target="_blank"):
"""generate map link"""
- bt = BrowserCheck(self)
+ bt = browserType(self)
id = ob.getFullId()
url = ob.getTargetUrl()
if url == "":
@@ -480,7 +481,7 @@ class ECHO_basis:
tiptext = ob.getTip()
tag = ""
- if bt.isN4:
+ if bt['isN4']:
# N4 needs layer for highlighting
tag += '" + text + ""
@@ -494,7 +495,7 @@ class ECHO_basis:
def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil", circlesrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/kreis", target="_blank",backLink=None,alternativArrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil_blau"):
"""generate map link image, text and other stuff"""
- bt = BrowserCheck(self)
+ bt = browserType(self)
id = ob.getFullId()
link = ob.getLinkId()
url = ob.getTargetUrl()
@@ -511,7 +512,7 @@ class ECHO_basis:
tiptext = ob.getTip()
tag = ""
- if bt.isN4:
+ if bt['isN4']:
#
# N4 needs layer and img elements
#
@@ -574,7 +575,7 @@ class ECHO_basis:
if float(rot) < 0:
marksrc = circlesrc
- if bt.isIEWin and bt.versIE > 5:
+ if bt['isIEWin'] and bt['versIE'] > 5:
# IE/Win 5.5 has "feature" for PNG transparency
tag += ''%(id,marksrc,rot,marksrc,rot)
else:
@@ -589,7 +590,7 @@ class ECHO_basis:
tag += ''
else:
# DOM - Area
- if bt.isIE:
+ if bt['isIE']:
# IE needs transparent img for area
tag += '
"+ret+"Rerenderd all links to resources in: "+self.title+"\n")
-
- for resource in resources:
- x=str(resource[1].copyIndex_meta2echo_resource())+"
"
- if RESPONSE is not None:
- RESPONSE.write(x+"\n")
-
- ret+=x
- if RESPONSE is not None:
- #RESPONSE.redirect('./manage_main')
- RESPONSE.write( "