Index: openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	21 Oct 2005 14:07:05 -0000	1.18.2.2
+++ openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	16 Aug 2006 17:22:31 -0000	1.18.2.3
@@ -8,6 +8,7 @@
 </description>
 
   <msg key="Add_pretty_name">Add %pretty_name%</msg>
+  <msg key="Are_you_sure_detach">Are you sure you want to remove this attachment?</msg>
   <msg key="Attach">Attach</msg>
   <msg key="attach_new">Attach a &lt;b&gt;new&lt;/b&gt;:</msg>
   <description key="attach_new">This key is going to give problems with word-order for several languages, because the &quot;attach new&quot; grammar is quite specific to English. For example the best translation in Dutch would be &quot;Nieuwe xxxx toevoegen&quot;, but we do not know xxxx yet. A work around is to write &quot;Voeg toe nieuw&quot;, but depending on what is behind it, grammar requires &quot;Voeg toe nieuwe&quot;. So, we get a very forced translation: &quot;Voeg toe nieuw(e)&quot;.
@@ -17,8 +18,13 @@
   <msg key="Attach_URL">Attach URL</msg>
   <description key="Attach_URL">Used as title on page for attaching a URL to an object.</description>
 
+  <msg key="Attachment">Attachment</msg>
+  <msg key="Can_delete">This is the only object this item is attached to.  You can choose to delete it from file storage as well.</msg>
   <msg key="Choose">Choose</msg>
+  <msg key="delete_from_fs">Delete this attachment from file storage?</msg>
   <msg key="Description">Description:</msg>
+  <msg key="Detach">Detach</msg>
+  <msg key="Detach_file_from">Detach file from %object_name%</msg>
   <msg key="File">File</msg>
   <msg key="Last_Modified">Last Modified</msg>
   <msg key="lt_Add_Attachment_Folder">Add Attachment Folder Link</msg>
@@ -46,6 +52,9 @@
   <msg key="Name">Name</msg>
   <msg key="No_such_type">No such type</msg>
   <msg key="Object">Object</msg>
+  <msg key="on_Object">on Object</msg>
+  <msg key="Only_detach">This item is attached to other objects.  You can only remove it from this object but not delete from file storage.</msg>
+  <msg key="remove">remove</msg>
   <msg key="Size">Size</msg>
   <msg key="Title">Title</msg>
   <description key="Title">Used as label in a form for the title of a new document to attach to an object.</description>
Index: openacs-4/packages/attachments/tcl/attachments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/tcl/attachments-procs.tcl,v
diff -u -r1.12.6.1 -r1.12.6.2
--- openacs-4/packages/attachments/tcl/attachments-procs.tcl	10 Dec 2005 11:56:45 -0000	1.12.6.1
+++ openacs-4/packages/attachments/tcl/attachments-procs.tcl	16 Aug 2006 17:22:31 -0000	1.12.6.2
@@ -129,6 +129,16 @@
         return "${base_url}[attachments::get_url]/go-to-attachment?object_id=$object_id&attachment_id=$attachment_id"
     }
 
+    ad_proc -public detach_url {
+        {-package_id ""}
+        {-object_id:required}
+        {-attachment_id:required}
+        {-base_url ""}
+	{-return_url ""}
+    } {
+        return "${base_url}[attachments::get_url]/detach?object_id=$object_id&attachment_id=$attachment_id&return_url=[ad_urlencode $return_url]"
+    }
+
     ad_proc -public graphic_url {
         {-package_id ""}
     } {
@@ -138,8 +148,9 @@
     ad_proc -public get_attachments {
         {-object_id:required}
         {-base_url ""}
+	{-return_url ""}
     } {
-        returns a list of attachment ids and names which are approved: {item_id name url}
+        returns a list of attachment ids and names which are approved: {item_id name url detach_url}
     } {
         set lst [db_list select_attachments {}]
         set lst_with_urls [list]
@@ -151,6 +162,7 @@
               set label [fs::get_object_prettyname -object_id $item_id]
             }
             set append_lst [list [goto_attachment_url -object_id $object_id -attachment_id $item_id -base_url $base_url]]
+	    lappend append_lst [detach_url -object_id $object_id -attachment_id $item_id -base_url $base_url -return_url $return_url]
             lappend lst_with_urls [concat [list $item_id $label] $append_lst]
         }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/attachments/www/detach.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/attachments/www/detach.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?