--- ECHO_content/ECHO_helpers.py 2005/07/20 11:30:28 1.57 +++ ECHO_content/ECHO_helpers.py 2005/09/12 22:23:44 1.60 @@ -352,7 +352,7 @@ class ECHO_basis: tag += ">" + text + "" return tag - 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"): + 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) id = ob.getFullId() @@ -368,7 +368,18 @@ class ECHO_basis: if ob.isTypeArrow(): # N4 - Arrow rot = ob.angle - marksrc = arrowsrc + + if hasattr(getattr(self,link),'link'): + cLink=getattr(self,link).link + # if existing delete virtuell path + cLink=cLink.replace('/'.join(self.REQUEST['VirtualRootPhysicalPath']),'') + + if backLink and hasattr(getattr(self,link),'link') and backLink==self.REQUEST['SERVER_URL']+cLink.lstrip(): + marksrc=alternativArrowsrc + else: + marksrc = arrowsrc + + if float(rot) < 0: marksrc = circlesrc tag += ''%(link,marksrc,rot) @@ -393,7 +404,22 @@ class ECHO_basis: if ob.isTypeArrow(): # DOM - Arrow rot = ob.angle - marksrc = arrowsrc + + if hasattr(getattr(self,link),'link'): + cLink=getattr(self,link).link + # if existing delete virtuell path + cLink=cLink.replace('/'.join(self.REQUEST['VirtualRootPhysicalPath']),'') + + if backLink and hasattr(getattr(self,link),'link') and backLink==self.REQUEST['SERVER_URL']+cLink.lstrip(): + marksrc=alternativArrowsrc + else: + marksrc = arrowsrc + + try: + rot=float(rot) + except: + rot=0 + if float(rot) < 0: marksrc = circlesrc if bt.isIEWin and bt.versIE > 5: @@ -1106,7 +1132,8 @@ class MapText(Folder,ZopePageTemplate): # 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') @@ -1121,6 +1148,8 @@ class MapText(Folder,ZopePageTemplate): """create locale""" return ECHO_collection.manage_addECHO_localeForm(self) + manage_main=ZopePageTemplate.pt_editForm + def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None): """manage add echo locale in map""" ECHO_collection.manage_addECHO_locale(self,lang,title,label,text,content_type)