Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/file-storage/www/index.adp	6 Mar 2003 16:34:14 -0000	1.17.2.1
+++ openacs-4/packages/file-storage/www/index.adp	28 Mar 2003 13:19:04 -0000	1.17.2.2
@@ -3,45 +3,48 @@
 <property name="header">@folder_name@</property>
 <property name="context">@context@</property>
 
-<table width="100%">
-<if @write_p@ true>
-  <tr>
-    <td colspan=2>
-      <a href="file-add?folder_id=@folder_id@">Upload a file</a>
-      &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="simple-add?folder_id=@folder_id@">Create a URL</a>
-      &nbsp;&nbsp;|&nbsp;&nbsp;
-	<a href="folder-create?parent_id=@folder_id@">Create a new folder</a>
-<if @admin_p@ true and @root_folder_p@ false>
-      &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="folder-edit?folder_id=@folder_id@">Rename this folder</a>
-</if>
-<if @delete_p@ true and @root_folder_p@ false and @n_contents@ eq 0>
-      &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="folder-delete?folder_id=@folder_id@">Delete this folder</a>
-</if>
-</td><td>
-<formtemplate id="n_past_days_form">
-      Show files modified in the past <formwidget id="n_past_days"> days as new.
-</formtemplate>
+<table width="100%" border="0">
+  <if @write_p@ true>
+    <tr>
+      <td colspan=2>
+        <a href="file-add?folder_id=@folder_id@">Upload a file</a>
+        &nbsp;|&nbsp;
+        <a href="simple-add?folder_id=@folder_id@">Add a URL</a>
+      </td>
+      <td align="right">
+        <formtemplate id="n_past_days_form">
+          Show files modified in the past <formwidget id="n_past_days"> days as new.
+        </formtemplate>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="3">
+        <a href="folder-create?parent_id=@folder_id@">Create a new folder</a>
 
-</td></tr>
-<if @admin_p@ true and @show_administer_permissions_link_p@ true>
+        <if @admin_p@ true and @root_folder_p@ false>
+          &nbsp;|&nbsp;
+          <a href="folder-edit?folder_id=@folder_id@">Rename this folder</a>
+        </if>
+        
+        <if @delete_p@ true and @root_folder_p@ false and @n_contents@ eq 0>
+          &nbsp;|&nbsp;
+          <a href="folder-delete?folder_id=@folder_id@">Delete this folder</a>
+        </if>
+
+        <if @admin_p@ true and @show_administer_permissions_link_p@ true>
+          &nbsp;|&nbsp;
+          <a href="/permissions/one?object_id=@folder_id@">Folder permissions</a>
+        </if>
+
+        <if @up_url@ not nil>
+          &nbsp;|&nbsp;
+          <a href="@up_url@">Up to @up_name@</a>
+        </if>
+  
+      </td>
+    </tr>
+  </if>
   <tr><td colspan="2"><br></td></tr>
-  <tr>
-    <td colspan=2>
-      <a href="/permissions/one?object_id=@folder_id@">
-        Modify permissions on this folder
-      </a>
-    </td>
-  </tr>
-</if>
-</if>
-  <tr><td colspan="2"><br></td></tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
 </table>
 
 
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/file-storage/www/index.tcl	10 Sep 2002 22:22:56 -0000	1.18
+++ openacs-4/packages/file-storage/www/index.tcl	28 Mar 2003 13:19:04 -0000	1.18.2.1
@@ -79,4 +79,10 @@
 
 set context [fs_context_bar_list $folder_id]
 
+set up_url {}
+if { [llength $context] > 1 } {
+    set up_url [lindex [lindex $context end-1] 0]
+    set up_name [lindex [lindex $context end-1] 1]
+}
+
 ad_return_template