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.16 -r1.17
--- openacs-4/packages/attachments/tcl/attachments-procs.tcl	13 Feb 2009 22:13:06 -0000	1.16
+++ openacs-4/packages/attachments/tcl/attachments-procs.tcl	29 May 2009 18:13:24 -0000	1.17
@@ -195,28 +195,30 @@
         {-folder_id:required}
         {-final ""}
         {-extra_vars ""}
+        {-multirow "fs_context"}
     } {
+        Create a multirow with cols (url title) for the file-storage bar
+        starting at folder_id
+    } {
+
         set root_folder_id [attachments::get_root_folder]
 
         set cbar_list [fs_context_bar_list -extra_vars $extra_vars -folder_url "attach" -file_url "attach" -root_folder_id $root_folder_id -final $final $folder_id]
 
-        if {![empty_string_p $root_folder_id]} {
-            set cbar_html "<a href=\"attach?${extra_vars}&folder_id=$root_folder_id\">[_ attachments.Top]</a> &gt; "
+        template::multirow create $multirow url label
+    
+        if { $root_folder_id ne "" && $cbar_list ne "" } {
+            template::multirow append $multirow "attach?${extra_vars}&folder_id=$root_folder_id" [_ attachments.Top]
+            foreach elm $cbar_list {
+                if { [llength elm] > 1 } {
+                    template::multirow append $multirow [lindex $elm 0] [lindex $elm 1]
+                } else {
+                    template::multirow append $multirow "" $elm
+                }
+            }
         } else {
-            set cbar_html "[_ attachments.Top] &gt; "
+            template::multirow append $multirow "" [_ attachments.Top]
         }
-	set length_list [llength $cbar_list]
-	set aux 1
-        foreach el $cbar_list {
-            if {$aux == $length_list } {
-                append cbar_html "$el"
-            } else {
-                append cbar_html "<a href=\"[lindex $el 0]\">[lindex $el 1]</a> &gt; "
-            }
-	    incr aux
-        }
-
-        return $cbar_html
     }
     
 }
Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/attachments/www/attach.adp	29 May 2009 16:16:10 -0000	1.12
+++ openacs-4/packages/attachments/www/attach.adp	29 May 2009 18:13:24 -0000	1.13
@@ -1,5 +1,5 @@
 <master>
-<property name="title">#attachments.lt_Attach_a_File_to_pret#</property>
+<property name="&doc">doc</property>
 <property name="context">@context;noquote@</property>
 
 <p>#attachments.lt_You_are_attaching_a_d#</p>
@@ -15,7 +15,23 @@
 </if>
 
 
-<p class="attach-fs-bar">@fs_context_bar_html;noquote@</p>
+<div class="attach-fs-bar">
+      <ul class="compact">
+        <if @fs_context:rowcount@ not nil>
+          #file-storage.Folder#:&nbsp;
+          <multiple name="fs_context">
+            <li>
+              <if @fs_context.url@ not nil>
+                <a href="@fs_context.url@">@fs_context.label@</a> @separator@
+              </if>
+              <else>
+                @fs_context.label@
+              </else>
+            </li>
+          </multiple>
+        </if>
+      </ul>
+</div>
 
 <if @contents:rowcount@ gt 0>
   <table width="95%" class="list-table">
Index: openacs-4/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/attachments/www/attach.tcl	29 May 2009 16:16:10 -0000	1.10
+++ openacs-4/packages/attachments/www/attach.tcl	29 May 2009 18:13:24 -0000	1.11
@@ -31,7 +31,7 @@
 
 # Load up file storage information
 if {[empty_string_p $folder_id]} {
-    set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id]
+    set folder_id [attachments::get_root_folder]
 } 
 
 # sanity check
@@ -65,15 +65,18 @@
 
 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]
+# Context bar
+set separator [parameter::get -package_id [ad_conn subsite_id] -parameter ContextBarSeparator -default ">"]
+attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id -multirow fs_context
 
+set doc(title) [_ attachments.lt_Attach_a_File_to_pret]
 set context "[_ attachments.Attach]"
 
 template::head::add_style -style "
 .attach-fs-bar {
-    background-color: #F0EFF0;
-    color: inherit;
-    border-bottom: thin solid #555;
+    border-top: thin solid #555;
+    margin: 0.8em 0;
+    padding-left: 0.5em;
 }"
 
 # Build URLs