Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	26 Apr 2002 21:20:02 -0000	1.12
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	27 Apr 2002 17:00:16 -0000	1.13
@@ -333,8 +333,8 @@
         of ns_sets, one for each row returned. The keys for each row are as
         follows:
 
-            file_id, name, live_revision, type,
-            last_modified, content_size, sort_key
+            object_id, name, live_revision, type,
+            last_modified, new_p, content_size, write_p, delete_p, admin_p
 
         @param folder_id The folder for which to retrieve contents
         @param user_id The viewer of the contents (to make sure they have
Index: openacs-4/packages/file-storage/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/file-add.adp	5 Mar 2002 00:41:33 -0000	1.3
+++ openacs-4/packages/file-storage/www/file-add.adp	27 Apr 2002 17:00:16 -0000	1.4
@@ -25,7 +25,13 @@
 
 <tr>
 <td align=right> Title: </td>
-<td><input size=30 name=title></td>
+  <if @lock_title_p@ eq 0>
+    <td><input size=30 name=title value=@title@></td>
+  </if>
+  <else>
+      <input type=hidden name=title value=@title@>
+      <td>@title@</td>
+  </else>
 </tr>
 
 <tr>
Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-add.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-add.tcl	27 Apr 2002 17:00:16 -0000	1.2
@@ -6,6 +6,8 @@
     @cvs-id $Id$
 } {
     folder_id:integer,notnull
+    {title ""}
+    {lock_title_p 0}
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if ![fs_folder_p $folder_id] {
@@ -15,6 +17,8 @@
 } -properties {
     folder_id:onevalue
     context_bar:onevalue
+    title:onevalue
+    lock_title_p:onevalue
 }
 
 # check for write permission on the folder
@@ -28,4 +32,8 @@
 # Should probably generate the item_id and version_id now for
 # double-click protection
 
-ad_return_template
\ No newline at end of file
+# if title isn't passed in ignore lock_title_p
+if {[empty_string_p $title]} {
+    set lock_title_p 0
+}
+
Index: openacs-4/packages/file-storage/www/simple-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/simple-add-2.tcl	2 Apr 2002 06:50:49 -0000	1.1
+++ openacs-4/packages/file-storage/www/simple-add-2.tcl	27 Apr 2002 17:00:16 -0000	1.2
@@ -6,9 +6,9 @@
     @cvs-id $Id$
 } {
     folder_id:integer,notnull
-    name:notnull,trim
+    title:notnull,trim
     description
-    url
+    url:notnull,trim
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if ![fs_folder_p $folder_id] {
@@ -22,6 +22,6 @@
 ad_require_permission $folder_id write
 
 # Create the URL (for now)
-set url_id [fs::url_new -url $url -name $name -description $description -folder_id $folder_id]
+set url_id [fs::url_new -url $url -name $title -description $description -folder_id $folder_id]
 
 ad_returnredirect "?folder_id=$folder_id"
Index: openacs-4/packages/file-storage/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/simple-add.adp	2 Apr 2002 06:50:49 -0000	1.1
+++ openacs-4/packages/file-storage/www/simple-add.adp	27 Apr 2002 17:00:16 -0000	1.2
@@ -9,13 +9,19 @@
 <table border=0>
 
 <tr>
-<td align=right>Title : </td>
-<td><input type=text name=name size=40></tr>
+<td align=right> Title: </td>
+  <if @lock_title_p@ eq 0>
+    <td><input size=30 name=title value=@title@></td>
+  </if>
+  <else>
+     <td>@title@</td>
+     <input type=hidden name=title value=@title@>
+  </else>
 </tr>
 
 <tr>
 <td align=right> URL: </td>
-<td><input size=50 name=url></td>
+<td><input size=50 name=url value="http://"></td>
 </tr>
 
 <tr>
Index: openacs-4/packages/file-storage/www/simple-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/simple-add.tcl	2 Apr 2002 06:50:49 -0000	1.1
+++ openacs-4/packages/file-storage/www/simple-add.tcl	27 Apr 2002 17:00:16 -0000	1.2
@@ -1,12 +1,15 @@
 ad_page_contract {
     page to add a new nonversioned object to the system
 
-    @author Ben Adida (ben@openforce)
+    @author Ben Adida (ben@openforce)    
+    @author arjun (arjun@openforce)
     @creation-date 01 April 2002
     @cvs-id $Id$
 } {
     folder_id:integer,notnull
     {type "fs_url"}
+    {title ""}
+    {lock_title_p 0}
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if ![fs_folder_p $folder_id] {
@@ -34,4 +37,9 @@
 # Should probably generate the item_id and version_id now for
 # double-click protection
 
-ad_return_template
+
+# if title isn't passed in ignore lock_title_p
+if {[empty_string_p $title]} {
+    set lock_title_p 0
+}
+