--- ECHO_content/ECHO_helpers.py 2005/03/22 20:50:21 1.46 +++ ECHO_content/ECHO_helpers.py 2005/06/09 11:12:59 1.51 @@ -6,6 +6,7 @@ import string import xml.dom.minidom import types from Products.PageTemplates.PageTemplateFile import PageTemplateFile +from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from OFS.SimpleItem import SimpleItem from Globals import package_home import Globals @@ -124,7 +125,15 @@ class ECHO_basis: def getLabel(self): """title""" - + if not hasattr(self,'label'): + self.label="" + + if self.label=="": + ret=self.getTitle() + if ret=="": + ret=self.getId() + return ret + return self.decode(self.label) try: return self.label.encode('utf-8','ignore') @@ -177,10 +186,23 @@ class ECHO_basis: """add a map area to this object""" if (newarea.id is None): # create new id - areas = self.getMapAreas() - newarea.id = "a%02d"%len(areas) + ids = [a.id for a in self.getMapAreas()] + i = len(ids) + while ("a%02d"%i in ids): + # if it exists, try the next one + i += 1 + newarea.id = "a%02d"%i self._setObject(newarea.id, newarea) + def getMapText(self): + """returns the MapText""" + # get (the first) contained MapText + res = self.ZopeFind(self, obj_metatypes=('ECHO_mapText')) + if len(res) > 0: + text = res[0][1] + return text + return None + def ECHO_graphicEntry(self): """change map coordinates""" if self.hasParentOverview(): @@ -229,10 +251,7 @@ class ECHO_basis: """create area calls for JavaScript""" dynamical="\n" for ob in areas: - if ob.isTypeArrow(): - dynamical+="""addArea('%s', 'overview', %s, 'arrow');\n"""%(ob.getFullId(),ob.getCoordString()) - else: - dynamical+="""addArea('%s', 'overview', %s, 'area');\n"""%(ob.getFullId(),ob.getCoordString()) + dynamical+="""addArea('%s', 'overview', %s, '%s');\n"""%(ob.getFullId(),ob.getCoordString(),ob.getType()) return dynamical def createMapHead(self): @@ -257,7 +276,7 @@ class ECHO_basis: """generate img-tag for map of parent""" return self.aq_parent.createMapImg() - def createMapLink(self, ob, text=None): + def createMapLink(self, ob, text=None, target="_blank"): """generate map link""" bt = BrowserCheck(self) id = ob.getFullId() @@ -266,26 +285,26 @@ class ECHO_basis: text = ob.getLabel() if text is None: text = "link" - tiptext = ob.getText() + tiptext = ob.getTip() tag = "" if bt.isN4: # N4 needs layer for highlighting - tag += '" else: # a-element - tag = '" return tag - def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil"): + def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil",target="_blank"): """generate map link image, text and other stuff""" bt = BrowserCheck(self) id = ob.getFullId() link = ob.getLinkId() - tiptext = ob.getText() + tiptext = ob.getTip() tag = "" if bt.isN4: @@ -302,7 +321,7 @@ class ECHO_basis: tag += '' else: # create a-element - tag = ''%(id,id,id,link) + tag = ''%(id,id,id,link,target) if ob.isTypeArrow(): rot = ob.angle if bt.isIEWin and bt.versIE > 5: @@ -311,6 +330,14 @@ class ECHO_basis: else: # arrow image tag += ''%(id,arrowsrc,rot) + elif ob.isTypeText(): + # div for area + tag += '
4: @@ -877,7 +905,8 @@ class MapArea(SimpleItem): self.id = id self.label = label self.setType(type) - self.text = text + self.tip = tip + self.volatile = volatile def setCoords(self, coords): """sets the coords""" @@ -912,6 +941,8 @@ class MapArea(SimpleItem): self.type = MapArea.TYPE_ARROW elif type == MapArea.TYPE_AREA: self.type = MapArea.TYPE_AREA + elif type == MapArea.TYPE_TEXT: + self.type = MapArea.TYPE_TEXT else: self.type = MapArea.TYPE_AREA @@ -923,6 +954,10 @@ class MapArea(SimpleItem): """returns if the type is arrow""" return self.type == MapArea.TYPE_ARROW + def isTypeText(self): + """returns if the type is text""" + return self.type == MapArea.TYPE_TEXT + def getAngle(self): """returns the angle""" return self.angle @@ -931,18 +966,31 @@ class MapArea(SimpleItem): """sets the angle""" self.angle = angle - def getText(self): + def getTip(self): """returns the popup text""" - if self.text is None: + # patch old version + if not hasattr(self, 'tip'): + self.tip = self.text + + if self.tip is None: if hasattr(self, 'aq_parent'): parent = self.aq_parent if parent.contentType == 'text-popup': return parent.description - return self.text + return self.tip - def setText(self, text): + def setTip(self, text): """sets the text""" - self.text = text + self.tiptext = text + + def getText(self): + """returns the text fpr the area""" + if hasattr(self, 'aq_parent'): + parent = self.aq_parent + text = parent.getMapText() + if text is not None: + return text.document_src() + return "" def getLabel(self): """returns the link label""" @@ -960,7 +1008,67 @@ class MapArea(SimpleItem): return self.aq_parent.id return self.id - # call this to initialize framework classes, which # does the right thing with the security assertions. Globals.InitializeClass(MapArea) + + +class MapText(ZopePageTemplate): + """class to hold text for map areas""" + + meta_type = 'ECHO_mapText' + # Create a SecurityInfo for this class. + security = ClassSecurityInfo() + security.setDefaultAccess("allow") + + _default_content_fn = os.path.join(package_home(globals()), + 'html', 'ECHO_mapText_default.html') + + def __init__(self, id, text=None, content_type=None): + self.id = str(id) + self.ZBindings_edit(self._default_bindings) + if text is None: + text = open(self._default_content_fn).read() + self.pt_edit(text, content_type) + +# Product registration and Add support +manage_addMapTextForm = PageTemplateFile( + 'zpt/AddECHO_mapText', globals(), __name__='manage_addMapTextForm') + +def manage_addMapText(self, id, title=None, text=None, + REQUEST=None, submit=None): + "Add a Map Text with optional file content." + + id = str(id) + if REQUEST is None: + self._setObject(id, MapText(id, text)) + ob = getattr(self, id) + if title: + ob.pt_setTitle(title) + return ob + else: + file = REQUEST.form.get('file') + headers = getattr(file, 'headers', None) + if headers is None or not file.filename: + zpt = MapText(id, text) + else: + zpt = MapText(id, file, headers.get('content_type')) + + self._setObject(id, zpt) + if title: + ob = getattr(self, id) + ob.pt_setTitle(title) + + try: + u = self.DestinationURL() + except AttributeError: + u = REQUEST['URL1'] + + if submit == " Add and Edit ": + u = "%s/%s" % (u, urllib.quote(id)) + REQUEST.RESPONSE.redirect(u+'/manage_main') + return '' + +# call this to initialize framework classes, which +# does the right thing with the security assertions. +Globals.InitializeClass(MapText)