--- ECHO_content/ECHO_helpers.py	2008/08/21 07:58:21	1.89
+++ ECHO_content/ECHO_helpers.py	2008/09/08 19:23:18	1.91
@@ -419,20 +419,33 @@ class ECHO_basis:
         """generate map link"""
         bt = BrowserCheck(self)
         id = ob.getFullId()
-        link = ob.getLinkId()
+        url = ob.getTargetUrl()
+        if url == "":
+            # ECHOResource with empty link -> no link
+            href = 'href="#" onclick="return false;"'
+        else:
+            href = 'href="%s"'%ob.getLinkId()
+        
+        if target is None:
+            targetattr = ""
+        else:
+            targetattr = 'target="%s"'%target
+             
         if text is None:
             text = ob.getLabel()
+            
         if text is None:
             text = "link"
+            
         tiptext = ob.getTip()
         tag = ""
         if bt.isN4:
             # N4 needs layer for highlighting
-            tag += '<ilayer id="a.%s"><a class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s"'%(id,id,id,link,target)
+            tag += '<ilayer id="a.%s"><a class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" %s %s'%(id,id,id,href,targetattr)
             tag += ">" + text + "</a></ilayer>"
         else:
             # a-element
-            tag = '<a id="a.%s" class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s"'%(id,id,id,link,target)
+            tag = '<a id="a.%s" class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" %s %s'%(id,id,id,href,targetattr)
             if tiptext:
                 tag += ' title="%s"'%tiptext
             tag += ">" + text + "</a>"
@@ -1229,6 +1242,21 @@ class MapArea(SimpleItem):
                 return self.aq_parent.label or self.aq_parent.id
         return self.label
 
+    def getTargetUrl(self):
+        """returns the URL of the linked object"""
+        if hasattr(self, 'aq_parent'):
+            p = self.aq_parent
+            # ECHOResource and ECHOLink have 'link' attribute
+            if hasattr(p, 'link'):
+                if p.link is None:
+                    # return empty string for empty link
+                    return ""
+                else:
+                    return p.link
+                
+        # return None for unknown type
+        return None
+
     def setLabel(self, label):
         """sets the label"""
         self.label = label