Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 21 Oct 2018 17:50:09 -0000 1.17
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 16 May 2019 09:54:29 -0000 1.17.2.1
@@ -1,10 +1,10 @@
ad_page_contract {
-
+
@author rhs@mit.edu
@author bquinn@arsidigta.com
@creation-date 2000-09-09
@cvs-id $Id$
-
+
} {
{expand:integer,multiple ""}
{new_parent:integer ""}
@@ -57,29 +57,29 @@
set head ""
db_foreach path_select {} {
if {$node_id != $root_id && $admin_p == "t"} {
- set href [export_vars -base . {expand:multiple {root_id $node_id}}]
- append head [subst {}]
+ set href [export_vars -base . {expand:multiple {root_id $node_id}}]
+ append head [subst {}]
}
if {$name eq ""} {
- append head "$obj_name:"
+ append head "$obj_name:"
} else {
- append head $name
+ append head $name
}
-
+
if {$node_id != $root_id && $admin_p == "t"} {
- append head ""
+ append head ""
}
-
+
if {$directory_p == "t"} {
- append head "/"
+ append head "/"
}
} if_no_rows {
append head " "
}
if {[llength $expand] == 0} {
- lappend expand $root_id
+ lappend expand $root_id
if { $parent_id ne "" } {
lappend expand $parent_id
}
@@ -92,85 +92,85 @@
-key node_id \
-has_checkboxes \
-bulk_actions {
- "Allow for view (Publish)" "allow-for-view"
+ "Allow for view (Publish)" "allow-for-view"
} \
-bulk_action_method post \
-bulk_action_export_vars { return_url } \
-elements {
- checkbox {
- display_template {
-
-
-
-
-
-
-
-
-
-
-
-
- }
- }
- name {
+ checkbox {
+ display_template {
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+ name {
label "URL"
html "align left"
- display_template {
- @nodes.tree_indent;noquote@
-
- @nodes.name;noquote@
-
-
- @nodes.name;noquote@
-
+ display_template {
+ @nodes.tree_indent;noquote@
+
+ @nodes.name;noquote@
+
+
+ @nodes.name;noquote@
+
-
- 
-
-
+
+
+
+
-
-
-
-
- }
+
+
+
+
+ }
} instance {
label "Instance"
html "align left"
- display_template {
-
-
-
-
-
-
-
-
-
- @nodes.instance;noquote@
-
- }
+ display_template {
+
+
+
+
+
+
+
+
+
+ @nodes.instance;noquote@
+
+ }
} type {
label "Package Type"
html "align left"
- display_template {
- @nodes.type;noquote@
- }
+ display_template {
+ @nodes.type;noquote@
+ }
}
}
@@ -194,100 +194,100 @@
&& $mylevel > 2
} {
continue
- }
-
+ }
+
if {$directory_p == "t"} {
- set add_folder_url "?[export_vars {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
- if {$object_id eq ""} {
- set mount_url [export_vars -base mount {expand:multiple root_id node_id}]
- set new_app_url "?[export_vars {expand:multiple root_id {new_application $node_id}}]"
- } else {
- # This makes sure you can't unmount the thing that is serving the page you're looking at.
- if {[ad_conn node_id] != $node_id} {
- set unmount_url [export_vars -base unmount {expand:multiple root_id node_id}]
- }
-
- # Add a link to control permissioning
- if {$object_admin_p} {
- set permissions_url [export_vars -base ../../permissions/one {object_id}]
- set rename_url "?[export_vars {expand:multiple root_id {rename_application $node_id}}]"
- set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
- }
- # Is the object a package?
- if {$package_id ne ""} {
- if {$object_admin_p && ($parameter_count > 0)} {
- set parameters_url [export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]
- }
- }
- }
+ set add_folder_url "?[export_vars {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
+ if {$object_id eq ""} {
+ set mount_url [export_vars -base mount {expand:multiple root_id node_id}]
+ set new_app_url "?[export_vars {expand:multiple root_id {new_application $node_id}}]"
+ } else {
+ # This makes sure you can't unmount the thing that is serving the page you're looking at.
+ if {[ad_conn node_id] != $node_id} {
+ set unmount_url [export_vars -base unmount {expand:multiple root_id node_id}]
+ }
+
+ # Add a link to control permissioning
+ if {$object_admin_p} {
+ set permissions_url [export_vars -base ../../permissions/one {object_id}]
+ set rename_url "?[export_vars {expand:multiple root_id {rename_application $node_id}}]"
+ set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
+ }
+ # Is the object a package?
+ if {$package_id ne ""} {
+ if {$object_admin_p && ($parameter_count > 0)} {
+ set parameters_url [export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]
+ }
+ }
+ }
}
-
+
if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
- set delete_url [export_vars -base delete {expand:multiple root_id node_id}]
+ set delete_url [export_vars -base delete {expand:multiple root_id node_id}]
}
-
+
# use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
set indent ""
if { $mylevel != 1 } {
- if { $mylevel == 2 } {
- append indent " "
- } else {
- for {set i 1} {$i <4*$mylevel} {incr i} {
- append indent " "
- }
- }
+ if { $mylevel == 2 } {
+ append indent " "
+ } else {
+ for {set i 1} {$i <4*$mylevel} {incr i} {
+ append indent " "
+ }
+ }
}
set expand_mode 0
if {!$root_p && $n_children > 0} {
- set expand_mode 1
- set urlvars [list]
- foreach n $expand {
- if {$n == $node_id} {
- set expand_mode 2
- lappend open_nodes "$node_id"
- } else {
- lappend urlvars "expand=$n"
- }
- }
-
- if { $expand_mode == 1} {
- lappend urlvars "expand=$node_id"
- }
-
- lappend urlvars "root_id=$root_id"
-
- set expand_url "[join $urlvars "&"]"
+ set expand_mode 1
+ set urlvars [list]
+ foreach n $expand {
+ if {$n == $node_id} {
+ set expand_mode 2
+ lappend open_nodes "$node_id"
+ } else {
+ lappend urlvars "expand=$n"
+ }
+ }
+
+ if { $expand_mode == 1} {
+ lappend urlvars "expand=$node_id"
+ }
+
+ lappend urlvars "root_id=$root_id"
+
+ set expand_url "[join $urlvars "&"]"
} else {
- set expand_url ""
+ set expand_url ""
}
-
+
set name_url [export_vars {expand:multiple {root_id $node_id}}]
-
+
set action_type 0
set action_form_part ""
-
+
if {$object_id eq ""} {
- if {$new_application == $node_id} {
-
- set action_type "new_app"
- set action_form_part "[export_vars -form {expand:multiple root_id node_id new_package_id}] [apm_application_new_checkbox]"
-
- #Generate a package_id for double click protection
- set new_package_id [db_nextval acs_object_id_seq]
- } else {
- set action_form_part "(none)"
- }
+ if {$new_application == $node_id} {
+
+ set action_type "new_app"
+ set action_form_part "[export_vars -form {expand:multiple root_id node_id new_package_id}] [apm_application_new_checkbox]"
+
+ #Generate a package_id for double click protection
+ set new_package_id [db_nextval acs_object_id_seq]
+ } else {
+ set action_form_part "(none)"
+ }
} elseif {$rename_application == $node_id} {
- set action_type "rename_app"
- set action_form_part [export_vars -form {expand:multiple root_id node_id rename_package_id}]
-
+ set action_type "rename_app"
+ set action_form_part [export_vars -form {expand:multiple root_id node_id rename_package_id}]
+
} else {}
-
+
if {$node_id == $new_parent} {
- set parent_id $new_parent
- set node_type $new_type
- set action_type "new_folder"
- set action_form_part [export_vars -form {expand:multiple parent_id node_type root_id}]
+ set parent_id $new_parent
+ set node_type $new_type
+ set action_type "new_folder"
+ set action_form_part [export_vars -form {expand:multiple parent_id node_type root_id}]
}
multirow append nodes \
@@ -308,7 +308,7 @@
db_foreach services_select {} {
if {$parameter_count > 0} {
- set href [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
+ set href [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
append services [subst {$instance_name}]
}
} if_no_rows {