Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/attachments/www/attach.adp	9 Nov 2008 23:29:22 -0000	1.11
+++ openacs-4/packages/attachments/www/attach.adp	29 May 2009 16:16:10 -0000	1.12
@@ -2,91 +2,81 @@
 <property name="title">#attachments.lt_Attach_a_File_to_pret#</property>
 <property name="context">@context;noquote@</property>
 
-#attachments.lt_You_are_attaching_a_d#
+<p>#attachments.lt_You_are_attaching_a_d#</p>
 
-<p>
+<p>#attachments.lt_To_attach_a_file_alre#</p>
 
-<small>
-#attachments.lt_To_attach_a_file_alre#
-</small>
-
-<p>
-@fs_context_bar_html;noquote@
-<p>
 <if @write_permission_p@ eq 1>
-#attachments.attach_new#  &nbsp;&nbsp;     <a href="file-add?folder_id=@folder_id@&@passthrough_vars@">#attachments.File#</a>
+#attachments.attach_new#
+      &nbsp;
+      <a href="@file_add_url@">#attachments.File#</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="simple-add?folder_id=@folder_id@&@passthrough_vars@">#attachments.URL#</a>
+      <a href="@simple_add_url@">#attachments.URL#</a>
 </if>
-<p>
+
+
+<p class="attach-fs-bar">@fs_context_bar_html;noquote@</p>
+
 <if @contents:rowcount@ gt 0>
-  <table width="85%" cellpadding="5" cellspacing="0" class="table-display">
-    <tr class="table-header">
-      <td>&nbsp;</td>
-      <td>#attachments.Name#</td>
-      <td>#attachments.Action#</td>
-      <td>#attachments.Size#</td>
-      <td>#attachments.Type#</td>
-      <td>#attachments.Last_Modified#</td>
-    </tr>
+  <table width="95%" class="list-table">
+    <thead>
+      <tr class="list-header">
+        <th>#attachments.Type#</th>
+        <th>#attachments.Name#</th>
+        <th>#attachments.Action#</th>
+        <th>#attachments.Size#</th>
+        <th>#attachments.Last_Modified#</th>
+      </tr>
+    </thead>
+<tbody>
 <multiple name="contents">
 <if @contents.rownum@ odd>
     <tr class="odd">
 </if>
 <else>
     <tr class="even">
 </else>
-    <tr>
-<if @contents.type@ eq "folder">
-      <td><img src="graphics/folder.gif"></td>
+    <if @contents.type@ eq "folder">
       <td>
-        <a href="attach?folder_id=@contents.object_id@&@passthrough_vars@">@contents.name@</a>
-<if @contents.new_p@ and @contents.content_size@ gt 0>(&nbsp;new&nbsp;)</if>
+        <img src="graphics/folder.gif" alt="#file-storage.Folder#">
+        #file-storage.folder_type_pretty_name#
       </td>
+      <td>
+        <a href="@contents.name_url@">@contents.name@</a>
+      </td>
       <td>&nbsp;</td>
       <td>
         #attachments.lt_contentscontent_size_#<if @contents.content_size@ ne 1>s</if>
       </td>
-      <td>#file-storage.folder_type_pretty_name#</td>
       <td>@contents.last_modified@</td>
-</if>
-<else>
-<if @contents.type@ eq "url">
-      <td><img src="graphics/file.gif"></td>
+    </if>
+    <else>
       <td>
-      @contents.name@
-<if @contents.new_p@>(&nbsp;new&nbsp;)</if>
+        <img src="graphics/file.gif" alt="@contents.type@">
+        @contents.type@
       </td>
-      <td>
-        <small>[
-<a href="attach-2?item_id=@contents.object_id@&@passthrough_vars@">#attachments.Choose#</a>
-          ]</small>
-      </td>
-      <td>&nbsp;</td>
-      <td>@contents.type@</td>
+      <if @contents.type@ eq "url">
+        <td>@contents.name@</td>
+        <td>
+          <a href="@contents.action_url@" class="button">#attachments.Choose#</a>
+        </td>
+        <td>&nbsp;</td>
+      </if>
+      <else>
+        <td>
+          <if @contents.title@ eq nil>@contents.name@</if>
+          <else>@contents.title@</else>
+        </td>
+        <td>
+          <a href="@contents.action_url@" class="button">#attachments.Choose#</a>
+        </td>
+        <td>#attachments.lt_contentscontent_size__1#<if @contents.content_size@ ne 1>s</if></td>
+      </else>
       <td>@contents.last_modified@</td>
-</if>
-<else>
-      <td><img src="graphics/file.gif"></td>
-      <td>
-      <if @contents.title@ eq nil>@contents.name@</if>
-      <else>@contents.title@</else>
-<if @contents.new_p@>
-        (&nbsp;new&nbsp;)
-</if>
-      </td>
-      <td>
-        <small>[
-<a href="attach-2?item_id=@contents.object_id@&@passthrough_vars@">#attachments.Choose#</a>
-        ]</small>
-      </td>
-      <td>#attachments.lt_contentscontent_size__1#<if @contents.content_size@ ne 1>s</if></td>
-      <td>@contents.type@</td>
-      <td>@contents.last_modified@</td>
-</else>
-</else>
+    </else>
     </tr>
-</multiple>
+  </multiple>
+  </tbody>
   </table>
 </if>
 <else>
Index: openacs-4/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/attachments/www/attach.tcl	13 Jan 2005 13:56:08 -0000	1.9
+++ openacs-4/packages/attachments/www/attach.tcl	29 May 2009 16:16:10 -0000	1.10
@@ -15,12 +15,18 @@
 
 set user_id [ad_conn user_id]
 
+# Since object_id varname is also used for fs objects in the multirow
+# let's keep the object_id to attach to in another var, otherwise
+# choosing an existing file wouldn't work...
+
+set to_object_id $object_id
+
 # We require the write permission on an object
-permission::require_permission -object_id $object_id -privilege write
+permission::require_permission -object_id $to_object_id -privilege write
 
 # Give the object a nasty name if it doesn't have a pretty name
 if {[empty_string_p $pretty_object_name]} {
-    set pretty_object_name "[_ attachments.Object] #$object_id"
+    set pretty_object_name "[_ attachments.Object] #$to_object_id"
 }
 
 # Load up file storage information
@@ -47,13 +53,30 @@
 set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]]
 
 # Folder contents
-db_multirow -unclobber contents select_folder_contents {} {
+db_multirow -unclobber -extend {name_url action_url} contents select_folder_contents {} {
     set name [lang::util::localize $name]
+    if { $type eq "folder" } {
+        set name_url [export_vars -base "attach" { {folder_id $object_id} {object_id $to_object_id} return_url pretty_object_name}]
+    } else {
+        set action_url [export_vars -base "attach-2" {{item_id $object_id} {object_id $to_object_id} return_url pretty_object_name}]
+    }
+
 }
 
-set passthrough_vars "object_id=$object_id&return_url=[ns_urlencode $return_url]&pretty_object_name=[ns_urlencode $pretty_object_name]"
+set passthrough_vars "object_id=$to_object_id&return_url=[ns_urlencode $return_url]&pretty_object_name=[ns_urlencode $pretty_object_name]"
 
 set fs_context_bar_html [attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id]
 
 set context "[_ attachments.Attach]"
 
+template::head::add_style -style "
+.attach-fs-bar {
+    background-color: #F0EFF0;
+    color: inherit;
+    border-bottom: thin solid #555;
+}"
+
+# Build URLs
+set file_add_url [export_vars -base "file-add" { {object_id $to_object_id} folder_id return_url pretty_object_name}]
+
+set simple_add_url [export_vars -base "simple-add" { {object_id $to_object_id} folder_id return_url pretty_object_name}]