Index: openacs-4/packages/ajax-filestorage-ui/ajax-filestorage-ui.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/ajax-filestorage-ui.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ajax-filestorage-ui/ajax-filestorage-ui.info 14 Nov 2007 04:19:52 -0000 1.4
+++ openacs-4/packages/ajax-filestorage-ui/ajax-filestorage-ui.info 26 Nov 2007 12:52:42 -0000 1.5
@@ -6,15 +6,15 @@
Ajax File Storage UIs
f
f
- ajaxfs2
+ ajaxfs
-
+
Hamilton Chua
- 2006-06-01
+ 2007-11-25
Solutiongrove
- 0
+ 1
-
+
@@ -24,7 +24,6 @@
-
Index: openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml 14 Nov 2007 04:19:53 -0000 1.2
+++ openacs-4/packages/ajax-filestorage-ui/catalog/ajax-filestorage-ui.en_US.ISO-8859-1.xml 26 Nov 2007 12:52:43 -0000 1.3
@@ -1,5 +1,5 @@
-
+
Alert
Browse
@@ -12,6 +12,7 @@
Confirm
Are you sure you want to delete
Copy the highlighted text to your clipboard.
+ Copy Link
Sorry, there was an error trying to create your new folder.
Create URL failed, please try again later.
Sorry, there was an error trying to delete this item.
@@ -24,6 +25,7 @@
An error occurred
Sorry, we encountered an error rendering the tree panel
An error occurred. Your changes have been reverted
+ File
File List
File to upload
This folder contains
@@ -34,7 +36,7 @@
Multiple Files
Sorry, you do not have permission to rename this folder
OK
- One moment. This may take a while depending on how large your upload is.
+ One moment. <br>This may take a while depending on how large your upload is.
Permission Denied
Properties
Your session has expired. You need to login again. <br>You will be redirected to a login page shortly
Index: openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp 14 Nov 2007 04:19:53 -0000 1.2
+++ openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp 26 Nov 2007 12:52:43 -0000 1.3
@@ -1,27 +1,24 @@
-
+
-
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl 14 Nov 2007 04:19:53 -0000 1.2
+++ openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl 26 Nov 2007 12:52:43 -0000 1.3
@@ -11,46 +11,85 @@
# - gray
# - vista
-if { [exists_and_not_null theme] } {
+if { ![exists_and_not_null theme] } {
set theme "gray"
}
-set compressjs [parameter::get -package_id [ajaxfs::get_package_id] -parameter "compressjs" -default 0]
set debug [parameter::get -package_id [ajaxfs::get_package_id] -parameter "debug" -default 1]
-
-set user_id [ad_conn user_id]
set create_url_p [parameter::get -package_id $package_id -parameter "EnableCreateUrl" -default 1]
+set multi_file_upload_p [parameter::get -package_id $package_id -parameter "EnableMultiUpload" -default 1]
+set max_file_size [parameter::get -package_id $package_id -parameter "MaximumFileSize" -default 2000000]
+set user_id [ad_conn user_id]
-if { [exists_and_not_null root_folder_id] } {
- if { ![db_0or1row "get_folder_name" "select name as instance_name from fs_folders where folder_id = :root_folder_id"] } {
- ad_return_complaint 1 "Root folder does not exist."
- ad_script_abort
+# ** autosuggest ***
+set tree_id [parameter::get -package_id [ajaxfs::get_package_id] -parameter "CategoryTreeId"]
+if { [exists_and_not_null tree_id] } {
+ set locale [ad_conn locale]
+ set sql_query "select t.name, t.name
+ from categories c, category_translations t
+ where c.category_id = t.category_id
+ and c.tree_id = $tree_id
+ and t.locale = 'en_US'
+ order by lower(t.name)
+ "
+ set suggestion_list [db_list_of_lists get_array_list $sql_query]
+ set suggestion_formatted_list {}
+ foreach suggestion $suggestion_list {
+ lappend suggestion_formatted_list "\[\"[lindex $suggestion 0]\",\"[lindex $suggestion 1]\"\]"
}
- set package_id [ajaxfs::get_root_folder -folder_id $root_folder_id]
+ append suggestions_stub [join $suggestion_formatted_list ","]
+} else {
+ set suggetsions_stub ""
}
+# ********************
if { [exists_and_not_null package_id] } {
- append options "package_id:$package_id"
- append options ",package_url:\"[apm_package_url_from_id $package_id]\""
- if { [exists_and_not_null root_folder_id] } {
- append options ",rootfolder:$root_folder_id"
+
+ set options [list]
+
+ # get the root folder
+ set rootfolder_id [fs_get_root_folder -package_id $package_id]
+ set instance_name [db_string "get_folder_name" "select name as instance_name from fs_folders where folder_id = :rootfolder_id"]
+ set roottext [db_string "get_folder_name" "select name from fs_folders where folder_id = :rootfolder_id"]
+
+ set write_p [permission::permission_p -no_cache \
+ -party_id [ad_conn user_id] \
+ -object_id ${rootfolder_id} \
+ -privilege "write"]
+ if { $write_p } { set rootwrite_p "t" } else { set rootwrite_p "f" }
+
+ lappend options "treerootnode:{text:\"$roottext\", id:\"$rootfolder_id\",\"attributes\":{\"write_p\":\"$rootwrite_p\"}}"
+
+ lappend options "package_id:$package_id"
+ lappend options "package_url:\"[apm_package_url_from_id $package_id]\""
+ lappend options "xmlhttpurl:\"[ajaxfs::get_url]\xmlhttp/\""
+
+ lappend options "rootfolder:$rootfolder_id"
+ lappend options "rootfoldername:\"$instance_name\""
+
+ if { [exists_and_not_null folder_id] && $folder_id != $rootfolder_id } {
+ lappend options "initOpenFolder:$folder_id"
+ lappend options "pathToFolder: new Array([ajaxfs::generate_path -folder_id $folder_id])"
}
- if { [exists_and_not_null folder_id] } {
- append options ",initOpenFolder:$folder_id"
- append options ",pathToFolder: new Array([ajaxfs::generate_path -folder_id $folder_id])"
- }
+
if { [exists_and_not_null public] } {
- append options ",ispublic:$public"
+ lappend options "ispublic:$public"
}
+
if { [exists_and_not_null layoutdiv] } {
- append options ",layoutdiv:\"$layoutdiv\""
- } else {
- set layoutdiv "fscontainer"
+ lappend options "layoutdiv:\"$layoutdiv\""
}
- set max_file_size [parameter::get -package_id $package_id -parameter "MaximumFileSize"]
- append options ",max_file_size:\"$max_file_size\""
- append options ",user_id:\"$user_id\""
+
+ lappend options "max_file_size:\"$max_file_size\""
+ lappend options "create_url:$create_url_p"
+ lappend options "multi_file_upload:$multi_file_upload_p"
+ lappend options "user_id:\"$user_id\""
+
+ set options [join $options ","]
+
} else {
+
ad_return_complaint 1 "Package id is required."
ad_script_abort
+
}
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ajax-filestorage-ui/lib/folder-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ajax-filestorage-ui/lib/folder.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ajax-filestorage-ui/lib/folder.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/ajax-filestorage-ui/tcl/ajax-filestorage-ui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/tcl/ajax-filestorage-ui-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ajax-filestorage-ui/tcl/ajax-filestorage-ui-procs.tcl 8 Sep 2007 14:32:51 -0000 1.2
+++ openacs-4/packages/ajax-filestorage-ui/tcl/ajax-filestorage-ui-procs.tcl 26 Nov 2007 12:52:43 -0000 1.3
@@ -90,7 +90,7 @@
-folder_id:required
} {
- Generates a comma separated list of folder_id's that start from the root folder to the give folder_id
+ Generates a comma separated list of folder_id's that start from the root folder to the given folder_id
@author Hamilton Chua (ham@solutiongrove.com)
@creation-date 2007-07-07
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ajax-filestorage-ui/www/index-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/ajax-filestorage-ui/www/index.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/ajax-filestorage-ui/www/index.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/ajax-filestorage-ui/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/doc/index.html,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ajax-filestorage-ui/www/doc/index.html 14 Nov 2007 04:19:53 -0000 1.2
+++ openacs-4/packages/ajax-filestorage-ui/www/doc/index.html 26 Nov 2007 12:52:43 -0000 1.3
@@ -12,9 +12,16 @@
Ajax File Storage User Interface
Hamilton G. Chua (ham@solutiongrove.com)
- October 2007
- v0.81d
+ November 2007
+ v1.0 Beta
What's New :
+v1.0 Beta
+
v0.81d
- context menu adds links to file properties and permissions
@@ -47,5 +54,6 @@
<div style="clear:both"></div>
<p>@notification_chunk;noquote@</p>
+