Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl,v diff -u -r1.4.8.2 -r1.4.8.3 --- openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl 12 Jun 2004 07:24:20 -0000 1.4.8.2 +++ openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl 12 Jun 2004 19:09:48 -0000 1.4.8.3 @@ -161,10 +161,10 @@ } -ad_proc bm_context_bar_args { arg_string viewed_user_id } { +ad_proc bm_context_bar_args { arg_list viewed_user_id } { If viewed_user_id <> browsing_user_id we need to prefix the context bar args with an entry for bookmarks of the viewed user. If the - arg_string is empty it is assumed that we are on the index page and that otherwise + arg_list is empty it is assumed that we are on the index page and that otherwise the page has been linked from the index page. } { set browsing_user_id [ad_conn user_id] @@ -175,15 +175,15 @@ # he can go back to viewing his own bookmarks set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -default ""] - if { [empty_string_p $arg_string] } { + if { [empty_string_p $arg_list] } { # We are on the index page - return "\"Bookmarks of $user_name\"" + return [list "Bookmarks of $user_name"] } else { # We were linked from the index page - return "\[list \"index?viewed_user_id=$viewed_user_id\" \"Bookmarks of $user_name\"\] $arg_string" + return [linsert $arg_list 0 [list "index?viewed_user_id=$viewed_user_id" "Bookmarks of $user_name"]] } } else { - return $arg_string + return $arg_list } } Index: openacs-4/packages/bookmarks/www/bookmark-add-import.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.adp,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/bookmarks/www/bookmark-add-import.adp 6 Feb 2004 08:11:49 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmark-add-import.adp 12 Jun 2004 19:09:49 -0000 1.5.2.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ <% set hidden_form_vars " Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v diff -u -r1.5.8.1 -r1.5.8.2 --- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl 4 May 2004 04:12:34 -0000 1.5.8.1 +++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl 12 Jun 2004 19:09:49 -0000 1.5.8.2 @@ -49,7 +49,7 @@ set page_title "Add/Import Bookmarks" -set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] # get the next bookmark_id (used as primary key in bm_bookmarks) set bookmark_id [db_nextval acs_object_id_seq] Index: openacs-4/packages/bookmarks/www/bookmark-add-one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.adp,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/bookmarks/www/bookmark-add-one.adp 27 Feb 2004 16:51:04 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp 12 Jun 2004 19:09:49 -0000 1.5.2.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ Index: openacs-4/packages/bookmarks/www/bookmark-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.adp,v diff -u -r1.4.4.1 -r1.4.4.2 --- openacs-4/packages/bookmarks/www/bookmark-edit.adp 6 May 2004 05:11:58 -0000 1.4.4.1 +++ openacs-4/packages/bookmarks/www/bookmark-edit.adp 12 Jun 2004 19:09:49 -0000 1.4.4.2 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ Index: openacs-4/packages/bookmarks/www/bookmark-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.tcl,v diff -u -r1.5 -r1.5.4.1 --- openacs-4/packages/bookmarks/www/bookmark-edit.tcl 22 Sep 2003 12:06:27 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmark-edit.tcl 12 Jun 2004 19:09:49 -0000 1.5.4.1 @@ -61,7 +61,7 @@ set page_title "Edit [ad_decode $folder_p "t" "Folder" "Bookmark"]" -set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] set delete_p [bm_delete_permission_p $bookmark_id] Index: openacs-4/packages/bookmarks/www/bookmark-permissions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/bookmarks/www/bookmark-permissions.adp 6 Feb 2004 08:11:49 -0000 1.4 +++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp 12 Jun 2004 19:09:49 -0000 1.4.2.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ @viewed_user_id;noquote@ Index: openacs-4/packages/bookmarks/www/bookmark-permissions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/bookmarks/www/bookmark-permissions.tcl 30 Nov 2002 17:26:55 -0000 1.4 +++ openacs-4/packages/bookmarks/www/bookmark-permissions.tcl 12 Jun 2004 19:09:49 -0000 1.4.4.1 @@ -30,13 +30,7 @@ set page_title "Manage Permissions on all Bookmarks" -set context [bm_context_bar_args "\"[ad_quotehtml $page_title]\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] - ad_return_template - - - - - Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/bookmarks/www/bookmarks-check.tcl 11 Dec 2003 21:39:58 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl 12 Jun 2004 19:09:49 -0000 1.5.2.1 @@ -25,7 +25,7 @@ set page_title "Checking Bookmarks" -set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] set package_id [ad_conn package_id] @@ -56,7 +56,7 @@ # We want to give the user something to look at before we start contacting # the foreign hosts set cmd [list ad_context_bar --] -foreach elem [bm_context_bar_args "\"$page_title\"" $viewed_user_id] { +foreach elem [bm_context_bar_args [list $page_title] $viewed_user_id] { lappend cmd $elem } set context_bar [eval $cmd] Index: openacs-4/packages/bookmarks/www/bookmarks-export.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/bookmarks/www/bookmarks-export.adp 6 Feb 2004 08:11:49 -0000 1.4 +++ openacs-4/packages/bookmarks/www/bookmarks-export.adp 12 Jun 2004 19:09:49 -0000 1.4.2.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ Clicking on the link below (alternatively you can right click on the link Index: openacs-4/packages/bookmarks/www/bookmarks-export.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/bookmarks/www/bookmarks-export.tcl 10 Sep 2002 22:22:26 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmarks-export.tcl 12 Jun 2004 19:09:49 -0000 1.3.8.1 @@ -30,7 +30,7 @@ set page_title "Export Bookmarks to Netscape File" -set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] ad_return_template Index: openacs-4/packages/bookmarks/www/bookmarks-import.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.adp,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/bookmarks/www/bookmarks-import.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmarks-import.adp 12 Jun 2004 19:09:49 -0000 1.3.4.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ Here are the results of the import: Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v diff -u -r1.7 -r1.7.8.1 --- openacs-4/packages/bookmarks/www/bookmarks-import.tcl 20 Sep 2002 07:17:35 -0000 1.7 +++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl 12 Jun 2004 19:09:49 -0000 1.7.8.1 @@ -67,7 +67,7 @@ set page_title "Import Statistics" -set context [bm_context_bar_args "\[list \"bookmark-add-import?[export_url_vars viewed_user_id return_url]\" \"Add/Import Bookmarks\"\] \"$page_title\"" $viewed_user_id] +set context [bm_context_bar_args [list [list "bookmark-add-import?[export_url_vars viewed_user_id return_url]" "Add/Import Bookmarks"] $page_title] $viewed_user_id] # set flags to be used parsing the input file. Index: openacs-4/packages/bookmarks/www/folder-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/bookmarks/www/folder-add.adp 6 Feb 2004 08:11:49 -0000 1.4 +++ openacs-4/packages/bookmarks/www/folder-add.adp 12 Jun 2004 19:09:49 -0000 1.4.2.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ Index: openacs-4/packages/bookmarks/www/folder-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/bookmarks/www/folder-add.tcl 10 Sep 2002 22:22:26 -0000 1.3 +++ openacs-4/packages/bookmarks/www/folder-add.tcl 12 Jun 2004 19:09:49 -0000 1.3.8.1 @@ -33,7 +33,7 @@ set page_title "Create Folder" -set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] set user_id [ad_conn user_id] # get the next bookmark_id (used as primary key in bm_bookmarks) Index: openacs-4/packages/bookmarks/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.adp,v diff -u -r1.6 -r1.6.4.1 --- openacs-4/packages/bookmarks/www/search.adp 3 Oct 2003 10:52:32 -0000 1.6 +++ openacs-4/packages/bookmarks/www/search.adp 12 Jun 2004 19:09:49 -0000 1.6.4.1 @@ -1,5 +1,5 @@ -@page_title;noquote@ +@page_title@ @context;noquote@ @@ -8,7 +8,7 @@

- + @my_list.title@    Edit
@@ -26,7 +26,12 @@

-@img_html;noquote@ @others_list.title@     @edit_tag@
+ + @others_list.title@ +     + + Edit +
Index: openacs-4/packages/bookmarks/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/bookmarks/www/search.tcl 22 Sep 2003 12:06:27 -0000 1.4 +++ openacs-4/packages/bookmarks/www/search.tcl 12 Jun 2004 19:09:50 -0000 1.4.4.1 @@ -46,7 +46,7 @@ } set page_title "Searching for \"$search_text\"" -set context [bm_context_bar_args "\"[ad_quotehtml $page_title]\"" $viewed_user_id] +set context [bm_context_bar_args [list $page_title] $viewed_user_id] set package_id [ad_conn package_id]