Index: openacs-4/packages/acs-subsite/www/site-map/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/site-map/index.adp 13 Jan 2005 13:55:51 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/site-map/index.adp 19 Jan 2005 14:52:57 -0000 1.3 @@ -21,4 +21,7 @@ + + Edit Site Map + Index: openacs-4/packages/acs-subsite/www/site-map/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/site-map/index.tcl 13 Jan 2005 13:55:51 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/site-map/index.tcl 19 Jan 2005 14:52:47 -0000 1.3 @@ -18,20 +18,14 @@ set root_id [ad_conn node_id] } -# We do a check for the admin privilege because a user could have -# admin privilege on a site_node that has other site_nodes beneath it -# that the user does not have admin privilege on. If we don't do this -# check, the user could end up making changes on site_nodes that he -# does not have the admin privilege for. +# Check if the user has site-wide-admin privileges +set site_wide_admin_p [acs_user::site_wide_admin_p] + array set node [site_node::get -node_id $root_id] set parent_id $node(parent_id) set object_id $node(object_id) -if {![empty_string_p $object_id]} { - ad_require_permission $object_id admin -} - if {![empty_string_p $new_parent]} { set javascript "onLoad=\"javascript:document.new_parent.name.focus();document.new_parent.name.select()\"" } elseif {![empty_string_p $new_application]} { @@ -46,7 +40,7 @@ set parent_link ".?[export_url_vars expand:multiple root_id=$parent_id]" -set page_title "Site Map " +set page_title "[ad_system_name] Site Map" set context [list $page_title] set user_id [ad_conn user_id] @@ -86,7 +80,6 @@ -key node_id \ -elements { name_instance { - label "
Instance
" html "align left" display_template { @nodes.tree_indent;noquote@ @@ -114,7 +107,6 @@ } } instance_url { - label "
URL
" html "align left" display_template { @@ -134,7 +126,7 @@ - @nodes.instance_url;noquote@ + (@nodes.instance_url;noquote@) } }