Index: openacs-4/packages/cms/lib/folder-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/lib/folder-items.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/cms/lib/folder-items.tcl	18 May 2005 21:46:26 -0000	1.1.2.2
+++ openacs-4/packages/cms/lib/folder-items.tcl	31 May 2005 05:04:14 -0000	1.1.2.3
@@ -67,5 +67,5 @@
 	set file_size "-"
     }
 
-    set copy [clipboard::render_bookmark $mount_point $item_id [ad_conn package_url]]
+    set copy [clipboard::ui::render_bookmark $mount_point $item_id [ad_conn package_url]]
 }
Index: openacs-4/packages/cms/tcl/clipboard-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/clipboard-procs.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/cms/tcl/clipboard-procs.tcl	9 May 2005 22:44:48 -0000	1.5
+++ openacs-4/packages/cms/tcl/clipboard-procs.tcl	31 May 2005 05:04:14 -0000	1.5.2.1
@@ -82,24 +82,6 @@
     }
 }
 
-ad_proc -public clipboard::render_bookmark { mount_point id package_url} {
-
-  Compile and eval a chunk of ADP for the bookmark
-
-} {
-    set img_checked "${package_url}resources/checked.gif"
-    set img_unchecked "${package_url}resources/unchecked.gif"
-    
-    set clipboardfloats_p [clipboard::floats_p]
-
-    set code "<a href=\"javascript:markx('@package_url@', '@mount_point@', '@id@',
-    '@img_checked@', '@img_unchecked@', '@clipboardfloats_p@')\" title=\"Copy this item to the clipboard\">
-    <img src=\"@img_unchecked@\" border=\"0\" name=\"mark@id@\"> </a>"
-
-    set compiled_code [template::adp_compile -string $code]
-    return [template::adp_eval compiled_code]
-}
-
 ad_proc -public clipboard::get_bookmark_icon { clip mount_point item_id {row_ref row} } {
 
   Use this function as part of the multirow query to
Index: openacs-4/packages/cms/tcl/clipboard-ui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/clipboard-ui-procs.tcl,v
diff -u -r1.3 -r1.3.8.1
--- openacs-4/packages/cms/tcl/clipboard-ui-procs.tcl	1 Nov 2003 08:45:38 -0000	1.3
+++ openacs-4/packages/cms/tcl/clipboard-ui-procs.tcl	31 May 2005 05:04:14 -0000	1.3.8.1
@@ -236,7 +236,20 @@
   }
 }
   
+ad_proc -public clipboard::ui::render_bookmark { mount_point id package_url} {
+
+  Compile and eval a chunk of ADP for the bookmark
+
+} {
+    set img_checked "${package_url}resources/checked.gif"
+    set img_unchecked "${package_url}resources/unchecked.gif"
     
-    
+    set clipboardfloats_p [clipboard::floats_p]
 
+    set code "<a href=\"javascript:markx('@package_url@', '@mount_point@', '@id@',
+    '@img_checked@', '@img_unchecked@', '@clipboardfloats_p@')\" title=\"Copy this item to the clipboard\">
+    <img src=\"@img_unchecked@\" border=\"0\" name=\"mark@id@\"> </a>"
 
+    set compiled_code [template::adp_compile -string $code]
+    return [template::adp_eval compiled_code]
+}