Index: openacs-4/packages/acs-admin/www/subsites.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/acs-admin/www/subsites.adp 8 Sep 2015 11:42:30 -0000 1.1.2.1 +++ openacs-4/packages/acs-admin/www/subsites.adp 9 Sep 2015 08:13:27 -0000 1.1.2.2 @@ -14,7 +14,7 @@
-#acs-subsite.Create_new_subsite# +#acs-subsite.Create_new_subsite#
Index: openacs-4/packages/acs-admin/www/subsites.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/acs-admin/www/subsites.tcl 8 Sep 2015 11:42:30 -0000 1.1.2.1 +++ openacs-4/packages/acs-admin/www/subsites.tcl 9 Sep 2015 08:13:27 -0000 1.1.2.2 @@ -18,53 +18,62 @@ } else { set too_many_subsites_p 0 - db_multirow -extend { admin_url path_pretty parameter_url } subsites subsite_admin_urls {} { - set admin_url "${node_url}admin/" - set parameter_url [export_vars -base /shared/parameters {package_id {return_url "[ad_conn url]"}}] - set path_pretty $instance_name - array set node [site_node::get -node_id $node_id] - set parent_id $node(parent_id) - - while { $parent_id ne "" } { - array unset node - array set node [site_node::get -node_id $parent_id] - set path_pretty "$node(instance_name) > $path_pretty" - set parent_id $node(parent_id) - } + db_multirow -extend { admin_url path_pretty parameter_url} subsites subsite_admin_urls {} { + set admin_url "${node_url}admin/" + set parameter_url [export_vars -base /shared/parameters {package_id {return_url "[ad_conn url]"}}] + set path_pretty $instance_name + array set node [site_node::get -node_id $node_id] + set parent_id $node(parent_id) + + while { $parent_id ne "" } { + array unset node + array set node [site_node::get -node_id $parent_id] + set path_pretty "$node(instance_name) > $path_pretty" + set parent_id $node(parent_id) + } } multirow sort subsites path_pretty template::list::create \ - -name subsites \ - -multirow subsites \ - -elements { - path_pretty { - label "Subsite Name" - html {align left} - } - node_url { - label "Pages" - link_html { title "Pages of Subsite" } - link_url_col node_url + -name subsites \ + -multirow subsites \ + -elements { + path_pretty { + label "Subsite Name" + html {align left} + } + node_url { + label "Pages" + link_html { title "Pages of Subsite" } + link_url_col node_url display_template {\#acs-admin.Pages#} - html {align left} - } - - admin_url { - label "Subsite Administration" - link_html { title "Subsite Administration" } - link_url_col admin_url - display_template {