--- ECHO_content/ECHO_helpers.py 2005/04/13 15:13:19 1.47 +++ ECHO_content/ECHO_helpers.py 2005/06/08 07:07:27 1.48 @@ -124,8 +124,11 @@ class ECHO_basis: def getLabel(self): """title""" + if not hasattr(self,'label'): + self.label="" + if self.label=="": - ret=self.getTitle + ret=self.getTitle() if ret=="": ret=self.getId() return ret @@ -262,7 +265,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() @@ -275,17 +278,17 @@ class ECHO_basis: 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() @@ -307,7 +310,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: @@ -645,6 +648,7 @@ def findObjectPath(startobject, filename paths = filename.split('/') object = startobject for path in paths: + if hasattr(object, path): object = getattr(object, path) else: