--- ECHO_content/ECHO_helpers.py	2008/09/08 19:23:18	1.91
+++ ECHO_content/ECHO_helpers.py	2008/09/08 19:36:52	1.92
@@ -456,6 +456,17 @@ class ECHO_basis:
         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
         tiptext = ob.getTip()
         tag = ""
 
@@ -481,7 +492,7 @@ class ECHO_basis:
                 
                 if float(rot) < 0:
                     marksrc = circlesrc
-                tag += '<a href="%s"><img border="0" src="%s&rot=%s" /></a>'%(link,marksrc,rot)
+                tag += '<a %s><img border="0" src="%s&rot=%s" /></a>'%(href,marksrc,rot)
             elif ob.isTypeText():
                 # N4 - Text
                 tag += '<div id="t.%s" class="maptext"'%(id)
@@ -490,7 +501,7 @@ class ECHO_basis:
                 tag += '</div>'
             else:
                 # N4 - Area
-                tag += '<a href="%s"><img border="0" width="1000" height="1000" src="trans_img"'%(link)
+                tag += '<a %s><img border="0" width="1000" height="1000" src="trans_img"'%(href)
                 if tiptext:
                     tag += ' alt="%s"'%tiptext
                 tag += ' /></a>'
@@ -499,7 +510,7 @@ class ECHO_basis:
             #
             # (more or less) DOM capable browser
             #
-            tag = '<a id="b.%s" class="mapmarklink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s">'%(id,id,id,link,target)
+            tag = '<a id="b.%s" class="mapmarklink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" %s %s>'%(id,id,id,href,targetattr)
             if ob.isTypeArrow():
                 # DOM - Arrow
                 rot = ob.angle