--- text_html_old.py	2007-02-18 22:01:18.000000000 +0100
+++ text_html.py	2007-02-19 12:25:38.000000000 +0100
@@ -682,7 +682,7 @@
 
         # check whether attachment exists, possibly point to upload form
         if not os.path.exists(fpath):
-            linktext = _('Create new drawing "%(filename)s"')
+            linktext = _('Create new drawing "%(filename)s (opens in new window)"')
             return wikiutil.link_tag(
                 self.request,
                 ('%s?action=AttachFile&rename=%s%s' %
@@ -713,21 +713,23 @@
                 # add alt and title tags to areas
                 map = re.sub('href\s*=\s*"((?!%TWIKIDRAW%).+?)"', r'href="\1" alt="\1" title="\1"', map)
                 # add in edit links plus alt and title attributes
-                map = map.replace('%TWIKIDRAW%"', edit_link + '" alt="' + _('Edit drawing %(filename)s') % {'filename': self.text(fname)} + '" title="' + _('Edit drawing %(filename)s') % {'filename': self.text(fname)} + '"')
+                map = map.replace('%TWIKIDRAW%"', edit_link +
+                                  '" alt="' + _('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)} +
+                                  '" title="' + _('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)} + '"')
                 # unxml, because 4.01 concrete will not validate />
                 map = map.replace('/>', '>')
-                return (map + self.image(
-                    alt=drawing,
-                    src=AttachFile.getAttachUrl(
-                    pagename, filename, self.request,
-                    addts=1),
-                    usemap='#'+mapid, css="drawing"))
+                return (map + self.image(alt="%s" % (_('Clickable drawing: %(filename)s') % {'filename': self.text(fname)}),
+                                         title="",
+                                         src=AttachFile.getAttachUrl(pagename, filename, self.request,addts=1),
+                                         usemap='#'+mapid, css="drawing"))
+  
         else:
             return wikiutil.link_tag(self.request,
                                      edit_link,
-                                     self.image(alt=url,
+                                     self.image(alt="%s" % (_('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}),
+                                                title="%s" % (_('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}),                                             
                                                 src=AttachFile.getAttachUrl(pagename, filename, self.request, addts=1), css="drawing"),
-                                     title="%s" % (_('Edit drawing %(filename)s') % {'filename': self.text(fname)}))
+                                     title="%s" % (_('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}))
 
 
     # Text ##############################################################