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.4 -r1.5 --- openacs-4/packages/file-storage/www/file-add.adp 27 Apr 2002 17:00:16 -0000 1.4 +++ openacs-4/packages/file-storage/www/file-add.adp 5 Sep 2002 09:29:00 -0000 1.5 @@ -1,6 +1,6 @@ - + Upload New File -@context_bar@ +@context@
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.2 -r1.3 --- openacs-4/packages/file-storage/www/file-add.tcl 27 Apr 2002 17:00:16 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-add.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -16,7 +16,7 @@ } } -properties { folder_id:onevalue - context_bar:onevalue + context:onevalue title:onevalue lock_title_p:onevalue } @@ -27,7 +27,7 @@ # set templating datasources -set context_bar [fs_context_bar_list -final "Add File" $folder_id] +set context [fs_context_bar_list -final "Add File" $folder_id] # Should probably generate the item_id and version_id now for # double-click protection Index: openacs-4/packages/file-storage/www/file-copy.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-copy.adp 3 Dec 2001 00:32:47 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-copy.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,6 +1,6 @@ - + Copy -@context_bar@ +@context@

Select the folder that you would like to copy "@file_name@" to Index: openacs-4/packages/file-storage/www/file-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-copy.tcl 22 Sep 2001 05:45:29 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-copy.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -15,7 +15,7 @@ } -properties { file_id:onevalue file_name:onevalue - context_bar:onevalue + context:onevalue } # check for read permission on the file @@ -29,6 +29,6 @@ from cr_items where item_id = :file_id"] -set context_bar [fs_context_bar_list -final "Copy" $file_id] +set context [fs_context_bar_list -final "Copy" $file_id] ad_return_template Index: openacs-4/packages/file-storage/www/file-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-delete.adp 22 Sep 2001 05:46:56 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-delete.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,6 +1,6 @@ - + Delete @title@ -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/file-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/file-storage/www/file-delete.tcl 22 Sep 2001 05:47:09 -0000 1.3 +++ openacs-4/packages/file-storage/www/file-delete.tcl 5 Sep 2002 09:29:00 -0000 1.4 @@ -17,7 +17,7 @@ file_id:onevalue file_name:onevalue blocked_p:onevalue - context_bar:onevalue + context:onevalue } # check for delete permission on the file @@ -55,7 +55,7 @@ from cr_items where item_id = :file_id" - set context_bar [fs_context_bar_list -final "Delete" $file_id] + set context [fs_context_bar_list -final "Delete" $file_id] ad_return_template } \ No newline at end of file Index: openacs-4/packages/file-storage/www/file-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-edit.adp 22 Sep 2001 05:48:40 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-edit.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,7 +1,7 @@ - + Rename @title@ Rename @title@ -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/file-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-edit.tcl 22 Sep 2001 05:48:52 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-edit.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -14,7 +14,7 @@ } } -properties { file_id:onevalue - context_bar:onevalue + context:onevalue title:onevalue } @@ -28,6 +28,6 @@ from cr_items where item_id = :file_id" -set context_bar [fs_context_bar_list -final "Rename" $file_id] +set context [fs_context_bar_list -final "Rename" $file_id] ad_return_template Index: openacs-4/packages/file-storage/www/file-move.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-move.adp 3 Dec 2001 00:32:47 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-move.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,6 +1,6 @@ - + Move -@context_bar@ +@context@

Select the folder that you would like to move "@file_name@" under Index: openacs-4/packages/file-storage/www/file-move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/file-move.tcl 22 Sep 2001 05:50:43 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-move.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -16,7 +16,7 @@ } -properties { file_id:onevalue file_name:onevalue - context_bar:onevalue + context:onevalue } # check they have write permission on the file (is this really the @@ -31,7 +31,7 @@ :1 := file_storage.get_title(:file_id); end;"] -set context_bar [fs_context_bar_list -final "Move" $file_id] +set context [fs_context_bar_list -final "Move" $file_id] ad_return_template Index: openacs-4/packages/file-storage/www/file.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/file-storage/www/file.adp 24 Apr 2002 20:06:25 -0000 1.6 +++ openacs-4/packages/file-storage/www/file.adp 5 Sep 2002 09:29:00 -0000 1.7 @@ -1,7 +1,7 @@ - + @title@ @title@ -@context_bar@ +@context@

  • Title: @title@ (edit) Index: openacs-4/packages/file-storage/www/file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/file-storage/www/file.tcl 24 Apr 2002 20:06:25 -0000 1.6 +++ openacs-4/packages/file-storage/www/file.tcl 5 Sep 2002 09:29:00 -0000 1.7 @@ -19,7 +19,7 @@ owner:onevalue version:multirow show_all_versions_p:onevalue - context_bar:onevalue + context:onevalue file_path:onevalue } @@ -30,7 +30,7 @@ #set templating datasources set user_id [ad_conn user_id] -set context_bar [fs_context_bar_list $file_id] +set context [fs_context_bar_list $file_id] set show_administer_permissions_link_p [ad_parameter "ShowAdministerPermissionsLinkP"] Index: openacs-4/packages/file-storage/www/folder-contents.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-contents.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/folder-contents.adp 26 Apr 2002 21:07:10 -0000 1.1 +++ openacs-4/packages/file-storage/www/folder-contents.adp 5 Sep 2002 09:29:00 -0000 1.2 @@ -1,7 +1,7 @@ - + @folder_name@ @folder_name@ -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/folder-contents.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-contents.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/file-storage/www/folder-contents.tcl 22 May 2002 16:42:31 -0000 1.6 +++ openacs-4/packages/file-storage/www/folder-contents.tcl 5 Sep 2002 09:29:00 -0000 1.7 @@ -20,7 +20,7 @@ } -properties { folder_id:onevalue folder_name:onevalue - context_bar:onevalue + context:onevalue recurse_p:onevalue n_past_days:onevalue orderby:onevalue @@ -111,6 +111,6 @@ ] set folder_name [fs::get_object_name -object_id $folder_id] -set context_bar [fs_context_bar_list -final Contents $folder_id] +set context [fs_context_bar_list -final Contents $folder_id] ad_return_template Index: openacs-4/packages/file-storage/www/folder-create.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-create.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/folder-create.adp 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/file-storage/www/folder-create.adp 5 Sep 2002 09:29:00 -0000 1.2 @@ -1,6 +1,6 @@ - + Create New Folder -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/folder-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-create.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/folder-create.tcl 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/file-storage/www/folder-create.tcl 5 Sep 2002 09:29:00 -0000 1.2 @@ -14,7 +14,7 @@ } } -properties { parent_id:onevalue - context_bar:onevalue + context:onevalue } # check that they have write permission on the parent folder @@ -23,6 +23,6 @@ # set templating datasources -set context_bar [fs_context_bar_list -final "Create New Folder" $parent_id] +set context [fs_context_bar_list -final "Create New Folder" $parent_id] ad_return_template Index: openacs-4/packages/file-storage/www/folder-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/folder-delete.adp 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/file-storage/www/folder-delete.adp 5 Sep 2002 09:29:00 -0000 1.2 @@ -1,6 +1,6 @@ - + Delete @folder_name@ -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/folder-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/folder-delete.tcl 25 Sep 2001 16:54:29 -0000 1.2 +++ openacs-4/packages/file-storage/www/folder-delete.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -31,7 +31,7 @@ folder_id:onevalue folder_name:onevalue blocked_p:onevalue - context_bar:onevalue + context:onevalue } # check for delete permission on the folder @@ -62,7 +62,7 @@ set folder_name [db_string folder_name " select label from cr_folders where folder_id = :folder_id"] - set context_bar [fs_context_bar_list -final "Delete" $folder_id] + set context [fs_context_bar_list -final "Delete" $folder_id] ad_return_template Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/fs_master.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/fs_master.tcl'. Fisheye: No comparison available. Pass `N' to diff? 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.14 -r1.15 --- openacs-4/packages/file-storage/www/index.adp 29 May 2002 23:02:19 -0000 1.14 +++ openacs-4/packages/file-storage/www/index.adp 5 Sep 2002 09:29:00 -0000 1.15 @@ -1,7 +1,7 @@ - + @folder_name@ @folder_name@ -@context_bar@ +@context@
    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.16 -r1.17 --- openacs-4/packages/file-storage/www/index.tcl 29 Jul 2002 03:53:15 -0000 1.16 +++ openacs-4/packages/file-storage/www/index.tcl 5 Sep 2002 09:29:00 -0000 1.17 @@ -22,7 +22,7 @@ write_p:onevalue admin_p:onevalue delete_p:onevalue - context_bar:onevalue + context:onevalue } # Don't allow delete if root folder @@ -77,6 +77,6 @@ form get_values n_past_days_form n_past_days folder_id } -set context_bar [fs_context_bar_list $folder_id] +set context [fs_context_bar_list $folder_id] ad_return_template Index: openacs-4/packages/file-storage/www/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/master.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/file-storage/www/master.adp 5 Sep 2002 09:29:00 -0000 1.1 @@ -0,0 +1,11 @@ + +File Storage System : @title@ +@context@ + +

    @title@

    + +@context_bar@ + +
    + + Index: openacs-4/packages/file-storage/www/master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/master.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/file-storage/www/master.tcl 5 Sep 2002 09:29:00 -0000 1.1 @@ -0,0 +1 @@ +set context_bar [eval ad_context_bar $context] Index: openacs-4/packages/file-storage/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/search.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/search.adp 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/file-storage/www/search.adp 5 Sep 2002 09:29:00 -0000 1.2 @@ -1,6 +1,6 @@ - + Search Results -@context_bar@ +@context@

    Your search on "@query@" did not return any results. Index: openacs-4/packages/file-storage/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/search.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/search.tcl 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/file-storage/www/search.tcl 5 Sep 2002 09:29:00 -0000 1.2 @@ -9,11 +9,11 @@ } -properties { results:multirow query:onevalue - context_bar:onevalue + context:onevalue } set user_id [ad_conn user_id] -set context_bar "Search" +set context "Search" # Bash the query to lowercase 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.2 -r1.3 --- openacs-4/packages/file-storage/www/simple-add.adp 27 Apr 2002 17:00:16 -0000 1.2 +++ openacs-4/packages/file-storage/www/simple-add.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,6 +1,6 @@ - + Create @pretty_name@ -@context_bar@ +@context@ 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.2 -r1.3 --- openacs-4/packages/file-storage/www/simple-add.tcl 27 Apr 2002 17:00:16 -0000 1.2 +++ openacs-4/packages/file-storage/www/simple-add.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -18,7 +18,7 @@ } } -properties { folder_id:onevalue - context_bar:onevalue + context:onevalue } # check for write permission on the folder @@ -32,7 +32,7 @@ return -code error "No such type" } -set context_bar [fs_context_bar_list -final "Add $pretty_name" $folder_id] +set context [fs_context_bar_list -final "Add $pretty_name" $folder_id] # Should probably generate the item_id and version_id now for # double-click protection 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 -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/simple-edit.adp 2 Apr 2002 06:50:49 -0000 1.1 +++ openacs-4/packages/file-storage/www/simple-edit.adp 5 Sep 2002 09:29:00 -0000 1.2 @@ -1,6 +1,6 @@ - + Edit @pretty_name@ -@context_bar@ +@context@ 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 -r1.1 -r1.2 --- openacs-4/packages/file-storage/www/simple-edit.tcl 2 Apr 2002 06:50:49 -0000 1.1 +++ openacs-4/packages/file-storage/www/simple-edit.tcl 5 Sep 2002 09:29:00 -0000 1.2 @@ -15,7 +15,7 @@ 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] +set context [fs_context_bar_list -final "Edit URL" $folder_id] # Should probably generate the item_id and version_id now for # double-click protection Index: openacs-4/packages/file-storage/www/version-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-add.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/version-add.adp 22 Sep 2001 05:58:13 -0000 1.2 +++ openacs-4/packages/file-storage/www/version-add.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,6 +1,6 @@ - + Upload New Version of @title@ -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/version-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/version-add.tcl 22 Sep 2001 05:58:27 -0000 1.2 +++ openacs-4/packages/file-storage/www/version-add.tcl 5 Sep 2002 09:29:00 -0000 1.3 @@ -15,7 +15,7 @@ } -properties { file_id:onevalue title:onevalue - context_bar:onevalue + context:onevalue } # check for write permission on the file @@ -31,6 +31,6 @@ from cr_items where item_id = :file_id)" -set context_bar [fs_context_bar_list -final "Upload New Version" $file_id] +set context [fs_context_bar_list -final "Upload New Version" $file_id] ad_return_template Index: openacs-4/packages/file-storage/www/version-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/version-delete.adp 22 Sep 2001 05:59:32 -0000 1.2 +++ openacs-4/packages/file-storage/www/version-delete.adp 5 Sep 2002 09:29:00 -0000 1.3 @@ -1,6 +1,6 @@ - + Delete @version_name@ -@context_bar@ +@context@ Index: openacs-4/packages/file-storage/www/version-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/file-storage/www/version-delete.tcl 22 Sep 2001 05:59:51 -0000 1.4 +++ openacs-4/packages/file-storage/www/version-delete.tcl 5 Sep 2002 09:29:00 -0000 1.5 @@ -17,7 +17,7 @@ version_id:onevalue version_name:onevalue title:onevalue - context_bar:onevalue + context:onevalue } # check for delete permission on the version @@ -66,6 +66,6 @@ where i.item_id = r.item_id and revision_id = :version_id" - set context_bar [fs_context_bar_list -final "Delete Version" $item_id] + set context [fs_context_bar_list -final "Delete Version" $item_id] ad_return_template }