Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v diff -u -r1.37 -r1.38 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 16 Jan 2007 23:18:35 -0000 1.37 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 5 May 2007 13:07:35 -0000 1.38 @@ -490,16 +490,20 @@ {-sections_multirow "sections"} {-subsections_multirow "subsections"} {-section ""} + {-url ""} } { Defines the page flow of the subsite TODO: add an image TODO: add link_p/selected_p for subsections } { - set pageflow [get_pageflow_struct] + set pageflow [get_pageflow_struct -url $url] + if {$url eq ""} { + set base_url [subsite::get_element -element url] + } else { + set base_url $url + } - set base_url [subsite::get_element -element url] - template::multirow create $sections_multirow name label title url selected_p link_p template::multirow create $subsections_multirow name label title url selected_p link_p @@ -632,7 +636,9 @@ } } -ad_proc -public subsite::get_pageflow_struct {} { +ad_proc -public subsite::get_pageflow_struct { + {-url ""} +} { Defines the page flow structure. } { # This is where the page flow structure is defined @@ -645,7 +651,12 @@ set pageflow [list] - set subsite_url [subsite::get_element -element url] + if {$url eq ""} { + set subsite_url [subsite::get_element -element url] + } else { + set substie_url $url + } + set subsite_id [ad_conn subsite_id] array set subsite_sitenode [site_node::get -url $subsite_url] set subsite_node_id $subsite_sitenode(node_id)