Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/index.adp	2 Sep 2003 09:58:55 -0000	1.6
+++ openacs-4/packages/bookmarks/www/index.adp	22 Sep 2003 16:06:18 -0000	1.7
@@ -7,8 +7,6 @@
 set bookmark_bgcolor  [ad_parameter BookmarkBGColor bookmarks "#ffffff"]
 set edit_anchor "<font size=-1>Edit</font>"
 set delete_anchor "<font size=-1>Delete</font>"
-
-set user_name_url [ad_urlencode @user_name@]
 %>
 
 
@@ -19,11 +17,10 @@
 <a href=bookmarks-export?viewed_user_id=@viewed_user_id@>Export</a> |</if>
 <if @write_p@ eq "t"> <a href=folder-add?return_url=index&viewed_user_id=@viewed_user_id@>Create New Folder</a> |</if>
 <a href=bookmarks-check?return_url=index&viewed_user_id=@viewed_user_id@>Check Links</a> |
-<if @browsing_user_id@ eq @viewed_user_id@><a href="javascript:launch_window('tree?viewed_user_id=@viewed_user_id@&write_p=@write_p@&user_name=@user_name_url@')">Javascript version</a> |</if>
+<if @browsing_user_id@ eq @viewed_user_id@><a href="javascript:launch_window('@tree_url@')">Javascript version</a> |</if>
 <a href=bookmarks-user-list>View bookmarks of other users</a> 
-<if @root_admin_p@ eq "1"> | <a href="bookmark-permissions?viewed_user_id=@viewed_user_id@&user_name=@user_name_url@">Manage access permissions on all bookmarks</a> </if>
+<if @root_admin_p@ eq "1"> | <a href="@permissions_url@">Manage access permissions on all bookmarks</a> </if>
 ] 
-
 <p>
 
 <if @bookmarks_admin_p@ eq "1">
Index: openacs-4/packages/bookmarks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/index.tcl	10 Sep 2002 22:22:26 -0000	1.6
+++ openacs-4/packages/bookmarks/www/index.tcl	22 Sep 2003 16:06:18 -0000	1.7
@@ -146,7 +146,9 @@
 
 }
 
+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 }]
 
 ad_return_template