Index: openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl 2 Oct 2003 21:15:33 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl 2 Oct 2003 22:15:49 -0000 1.5 @@ -7,32 +7,16 @@ node_id:integer,optional } -if ([string equal [ad_conn package_url] "/"]) { +if { [string equal [ad_conn package_url] "/"] } { set page_title "New community" set subsite_pretty_name "Community name" } else { set page_title "New subcommunity" set subsite_pretty_name "Subcommunity name" } -set context [list [list "." "Communities"] $page_title] +set context [list $page_title] -set master_template_options [list] -lappend master_template_options [list "Default" "/www/default-master"] -lappend master_template_options [list "Community" "/packages/acs-subsite/www/group-master"] -set current_master [parameter::get -parameter DefaultTemplate] -set found_p 0 -foreach elm $master_template_options { - if { [string equal $current_master [lindex $elm 1]] } { - set found_p 1 - break - } -} -if { !$found_p } { - lappend master_template [list $current_master $current_master] -} - - ad_form -name subsite -cancel_url . -form { {node_id:key} {instance_name:text @@ -48,7 +32,7 @@ {master_template:text(select) {label "Template"} {help_text "Choose the layout and navigation you want for your community."} - {options $master_template_options} + {options [subsite::get_template_options]} } } -on_submit { set folder [site_node::verify_folder_name \