Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/folder-chunk.adp	13 Mar 2002 21:17:12 -0000	1.3
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	2 Apr 2002 06:50:49 -0000	1.4
@@ -20,9 +20,9 @@
 </if>
 <else>
       <td><img src="graphics/file.gif"></td>
-      <td><a href="file?file_id=@contents.file_id@">@contents.name@</a></td>
+      <td><if @contents.versioned_p@ eq t><a href="file?file_id=@contents.file_id@">@contents.name@</a></if><else>@contents.name@</else></td>
       <td>
-        [<small><a href="download/index?version_id=@contents.live_revision@">download</a><if @contents.delete_p@ eq 1 or @contents.admin_p@ eq 1>&nbsp;|&nbsp<a href="file-delete?file_id=@contents.file_id@">delete</a></if>]</td>
+        [<small><if @contents.url_p@ eq t><a href=url-goto?url_id=@contents.file_id@>go to</a><if @contents.write_p@ eq 1>&nbsp;|&nbsp;<a href="simple-edit?object_id=@contents.file_id@">edit</a></if></if><else><a href="download/index?version_id=@contents.live_revision@">download</a></else><if @contents.delete_p@ eq 1 or @contents.admin_p@ eq 1>&nbsp;|&nbsp;<a href="<if @contents.versioned_p@ eq t>file-delete?file_id=@contents.file_id@</if><else>simple-delete?folder_id=@folder_id@&object_id=@contents.file_id@</else>">delete</a></if>]</td>
       <td>@contents.content_size@</td>
       <td>@contents.type@</td>
       <td>@contents.last_modified@</td>
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.7 -r1.8
--- openacs-4/packages/file-storage/www/index.adp	13 Mar 2002 20:04:15 -0000	1.7
+++ openacs-4/packages/file-storage/www/index.adp	2 Apr 2002 06:50:49 -0000	1.8
@@ -5,7 +5,7 @@
 
 <ul>
 <if @write_p@ eq 1>
-  <li><a href="file-add?folder_id=@folder_id@">Upload a file</a>
+  <li><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>
   <li><a href="folder-create?parent_id=@folder_id@">Create a new
   folder</a>
 </if>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-add-2.tcl	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,27 @@
+ad_page_contract {
+    Add a nonversioned item
+
+    @author Kevin Scaldeferri (kevin@arsdigita.com)
+    @creation-date 6 Nov 2000
+    @cvs-id $Id: simple-add-2.tcl,v 1.1 2002/04/02 06:50:49 ben Exp $
+} {
+    folder_id:integer,notnull
+    name:notnull,trim
+    description
+    url
+} -validate {
+    valid_folder -requires {folder_id:integer} {
+	if ![fs_folder_p $folder_id] {
+	    ad_complain "The specified parent folder is not valid."
+	}
+    }
+
+} 
+
+# Check for write permission on this folder
+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]
+
+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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-add.adp	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,33 @@
+<master src="fs_master">
+<property name="title">Create @pretty_name@</property>
+<property name="context_bar">@context_bar@</property>
+
+<form method=POST action="simple-add-2">
+<input type=hidden name="folder_id" value="@folder_id@">
+<input type=hidden name="type" value="@type@">
+
+<table border=0>
+
+<tr>
+<td align=right>Title : </td>
+<td><input type=text name=name size=40></tr>
+</tr>
+
+<tr>
+<td align=right> URL: </td>
+<td><input size=50 name=url></td>
+</tr>
+
+<tr>
+<td valign=top align=right> Description: </td>
+<td colspan=2><textarea rows=5 cols=50 name=description wrap=soft></textarea></td>
+</tr>
+
+<tr>
+<td></td>
+<td><input type=submit value="Create">
+</td>
+</tr>
+
+</table>
+</form>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-add.tcl	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,37 @@
+ad_page_contract {
+    page to add a new nonversioned object to the system
+
+    @author Ben Adida (ben@openforce)
+    @creation-date 01 April 2002
+    @cvs-id $Id: simple-add.tcl,v 1.1 2002/04/02 06:50:49 ben Exp $
+} {
+    folder_id:integer,notnull
+    {type "fs_url"}
+} -validate {
+    valid_folder -requires {folder_id:integer} {
+	if ![fs_folder_p $folder_id] {
+	    ad_complain "The specified parent folder is not valid."
+	}
+    }
+} -properties {
+    folder_id:onevalue
+    context_bar:onevalue
+}
+
+# check for write permission on the folder
+
+ad_require_permission $folder_id write
+
+# set templating datasources
+
+set pretty_name [fs::simple_get_type_pretty_name -type $type]
+if {[empty_string_p $pretty_name]} {
+    return -code error "No such type"
+}
+
+set context_bar [fs_context_bar_list -final "Add $pretty_name" $folder_id]
+
+# Should probably generate the item_id and version_id now for
+# double-click protection
+
+ad_return_template
Index: openacs-4/packages/file-storage/www/simple-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-delete.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-delete.tcl	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,18 @@
+ad_page_contract {
+    page to confirm and delete a simple fs object
+
+    @author Ben Adida (ben@openforce)
+    @creation-date 10 Nov 2000
+    @cvs-id $Id: simple-delete.tcl,v 1.1 2002/04/02 06:50:49 ben Exp $
+} {
+    object_id:integer,notnull
+    folder_id:notnull
+}
+
+# check for delete permission on the file
+ad_require_permission $object_id delete
+
+# Delete
+fs::simple_delete -object_id $object_id
+
+ad_returnredirect "./?folder_id=$folder_id"
Index: openacs-4/packages/file-storage/www/simple-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/simple-edit-2.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-edit-2.tcl	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,22 @@
+ad_page_contract {
+    Edit a nonversioned item
+
+    @author Ben Adida
+    @creation-date 01 April 2002
+    @cvs-id $Id: simple-edit-2.tcl,v 1.1 2002/04/02 06:50:49 ben Exp $
+} {
+    object_id:notnull
+    url
+    name
+    description
+} 
+
+# Check for write permission on this folder
+ad_require_permission $object_id write
+
+# edit the URL
+fs::url_edit -url_id $object_id -name $name -description $description -url $url
+
+set folder_id [db_string select_folder_id "select folder_id from fs_simple_objects where object_id= :object_id"]
+
+ad_returnredirect "?folder_id=$folder_id"
Index: openacs-4/packages/file-storage/www/simple-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-edit.adp	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,32 @@
+<master src="fs_master">
+<property name="title">Edit @pretty_name@</property>
+<property name="context_bar">@context_bar@</property>
+
+<form method=POST action="simple-edit-2">
+<input type=hidden name="object_id" value="@object_id@">
+
+<table border=0>
+
+<tr>
+<td align=right>Title : </td>
+<td><input type=text name=name size=40 value="@name@"></tr>
+</tr>
+
+<tr>
+<td align=right> URL: </td>
+<td><input size=50 name=url value="@url@"></td>
+</tr>
+
+<tr>
+<td valign=top align=right> Description: </td>
+<td colspan=2><textarea rows=5 cols=50 name=description wrap=soft>@description@</textarea></td>
+</tr>
+
+<tr>
+<td></td>
+<td><input type=submit value="Edit">
+</td>
+</tr>
+
+</table>
+</form>
Index: openacs-4/packages/file-storage/www/simple-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/simple-edit.tcl	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,23 @@
+ad_page_contract {
+    page to edit a new nonversioned object
+
+    @author Ben Adida
+    @creation-date 01 April 2002
+    @cvs-id $Id: simple-edit.tcl,v 1.1 2002/04/02 06:50:49 ben Exp $
+} {
+    object_id:notnull
+}
+
+# check for write permission on the item
+ad_require_permission $object_id write
+
+# Load up some data
+db_1row select_item_info "select name, url, description, folder_id from fs_urls_full where url_id= :object_id"
+
+set pretty_name "$name"
+set context_bar [fs_context_bar_list -final "Edit URL" $folder_id]
+
+# Should probably generate the item_id and version_id now for
+# double-click protection
+
+ad_return_template
Index: openacs-4/packages/file-storage/www/url-goto.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/url-goto.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage/www/url-goto.tcl	2 Apr 2002 06:50:49 -0000	1.1
@@ -0,0 +1,21 @@
+ad_page_contract {
+    go to a URL
+
+    @author Ben Adida (ben@openforce)
+    @creation-date 01 April 2002
+    @cvs-id $Id: url-goto.tcl,v 1.1 2002/04/02 06:50:49 ben Exp $
+} {
+    url_id:notnull
+} 
+
+# Check for write permission on this folder
+ad_require_permission $url_id read
+
+# Check the URL
+set url [db_string select_url "select url from fs_urls where url_id= :url_id" -default ""]
+
+if {![empty_string_p $url]} {
+    ad_returnredirect $url
+} else {
+    return -code error "no such URL"
+}