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.4 -r1.5 --- openacs-4/packages/bookmarks/www/bookmark-add-import.adp 22 May 2003 14:21:47 -0000 1.4 +++ openacs-4/packages/bookmarks/www/bookmark-add-import.adp 6 Feb 2004 08:11:49 -0000 1.5 @@ -1,7 +1,7 @@ @page_title;noquote@ @context;noquote@ - + <% set hidden_form_vars " " %> 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.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmark-add-one.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp 6 Feb 2004 08:11:49 -0000 1.4 @@ -1,7 +1,7 @@ @page_title;noquote@ -@context;noquote@ + Warning: We are not able to reach the url (@complete_url@) that you specified. Please make sure that you did not misspell the url. Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl 18 Sep 2002 12:13:17 -0000 1.4 +++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl 6 Feb 2004 08:11:49 -0000 1.5 @@ -117,7 +117,7 @@ set page_title "Inserting \"[string trim $local_title]\"" -set context [bm_context_bar_args "\[list bookmark-add-import?[export_url_vars return_url viewed_user_id] \"Add/Import Bookmarks\"\] \"[ad_quotehtml $page_title]\"" $viewed_user_id] +# set context [bm_context_bar_args "\[list bookmark-add-import?[export_url_vars return_url viewed_user_id] \"Add/Import Bookmarks\"\] \"[ad_quotehtml $page_title]\"" $viewed_user_id] set meta_description [bm_get_html_description $url_content] set meta_keywords [bm_get_html_keywords $url_content] Index: openacs-4/packages/bookmarks/www/bookmark-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmark-delete.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmark-delete.adp 6 Feb 2004 08:11:49 -0000 1.4 @@ -2,8 +2,8 @@ @page_title;noquote@ @context;noquote@ + - Are you sure that you want to delete the bookmark "@bookmark_title@"? Index: openacs-4/packages/bookmarks/www/bookmark-header.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/bookmarks/www/bookmark-header.adp 6 Feb 2004 08:11:49 -0000 1.1 @@ -0,0 +1,48 @@ + + + + + +
+ Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/bookmarks/www/bookmark-header.tcl 6 Feb 2004 08:11:49 -0000 1.1 @@ -0,0 +1,83 @@ +ad_page_contract { + Entry page for the bookmarks module + + Credit for the ACS 3 version of this module goes to: + @author David Hill (dh@arsdigita.com) + @author Aurelius Prochazka (aure@arsdigita.com) + + The upgrade of this module to ACS 4 was done by + @author Peter Marklund (pmarklun@arsdigita.com) + @author Ken Kennedy (kenzoid@io.com) + in December 2000. + + @creation-date December 2000 + @cvs-id $Id: bookmark-header.tcl,v 1.1 2004/02/06 08:11:49 maltes Exp $ +} { + viewed_user_id:integer,optional + {sort_by "name"} + +} -validate { + valid_user_id -requires {viewed_user_id:integerl} { + if { [empty_string_p [db_string user_exists "select 1 from parties where party_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""]] } { + ad_complain "The user_id in the url is invalid" + } + } + +} -properties { + page_title:onevalue + context:onevalue + bookmark:multirow + browsing_user_id:onevalue + viewed_user_id:onevalue + root_admin_p:onevalue + bookmarks_admin_p:onevalue + write_p:onevalue + sort_by:onevalue + user_name:onevalue + this_url_urlenc:onevalue + return_url_urlenc:onevalue +} + +set browsing_user_id [ad_conn user_id] + +# Is the user viewing his own bookmarks? +if { ![info exists viewed_user_id] || [string equal $viewed_user_id $browsing_user_id] } { + # The user is viewing his own bookmarks + set viewed_user_id $browsing_user_id + set context {} +} + +set this_url_urlenc [ad_urlencode [ad_conn url]] + + +# To enable non-registered users to view registered users bookmarks (if they have +# permission) we use the session_id of these users as the id in the bm_in_closed_p +# table +set in_closed_p_id [ad_decode $browsing_user_id "0" [ad_conn session_id] $browsing_user_id] + + +# In case this is the first time the user views this bookmark tree +# we need to populate the table keeping track of which bookmarks are in +# closed folders +bm_initialize_in_closed_p $viewed_user_id $in_closed_p_id + +# When we are adding a bookmark we need to know which url to return to +# A bookmark can also be added via a Bookmarklet in which case return url +# will be the page that the user is browsing. +set return_url_urlenc [ad_urlencode [ad_conn url]?[export_url_vars viewed_user_id]] + +set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""] + +set package_id [ad_conn package_id] +if { ![string equal $viewed_user_id "0"] } { + set root_folder_id [bm_get_root_folder_id [ad_conn package_id] $viewed_user_id] +} else { + set root_folder_id 0 +} + +set root_admin_p [ad_permission_p $root_folder_id admin] +set bookmarks_admin_p [ad_permission_p $package_id admin] +set write_p [bm_user_can_write_in_some_folder_p $viewed_user_id] +set tree_url [export_vars -base tree { viewed_user_id write_p user_name }] + +set permissions_url [export_vars -base bookmark-permissions { viewed_user_id user_name }] 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.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmark-permissions.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp 6 Feb 2004 08:11:49 -0000 1.4 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ @viewed_user_id;noquote@ - +
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.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmarks-export.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmarks-export.adp 6 Feb 2004 08:11:49 -0000 1.4 @@ -1,7 +1,7 @@ @page_title;noquote@ @context;noquote@ - + Clicking on the link below (alternatively you can right click on the link and choose "Save Target As..." or "Save Link As...") will deliver your bookmarks file in a traditional Netscape format. You will need to save the file on your Index: openacs-4/packages/bookmarks/www/bookmarks-user-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmarks-user-list.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmarks-user-list.adp 6 Feb 2004 08:11:49 -0000 1.4 @@ -1,8 +1,8 @@ @page_title;noquote@ -@context;noquote@ +@context;noquote@ + - No other users have stored bookmarks on which you have read permission.

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.3 -r1.4 --- openacs-4/packages/bookmarks/www/folder-add.adp 22 May 2003 14:21:47 -0000 1.3 +++ openacs-4/packages/bookmarks/www/folder-add.adp 6 Feb 2004 08:11:49 -0000 1.4 @@ -1,6 +1,7 @@ @page_title;noquote@ @context;noquote@ + Index: openacs-4/packages/bookmarks/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/bookmarks/www/index.adp 3 Oct 2003 10:52:32 -0000 1.9 +++ openacs-4/packages/bookmarks/www/index.adp 6 Feb 2004 08:11:49 -0000 1.10 @@ -14,26 +14,9 @@ set delete_anchor "Delete" %> - + - -[Not your account! Add / Import | - -Export | - Create New Folder | -Check Links | -Javascript version | -View bookmarks of other users - | Manage access permissions on all bookmarks -]

- - -Bookmarks Administration - - -

- Sort by: [ namename | access dateaccess date ] @@ -130,7 +113,7 @@ Key to bookmark display: - +
  • Unreachable links appear like this. These links may not be completely dead, but they were unreachable by our server on last attempt.
  • Unreachable links appear like this. These links may not be completely dead, but they were unreachable by our server on last attempt.