Index: openacs-4/packages/dotlrn/www/master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/master.tcl 23 Jan 2002 06:29:14 -0000 1.9 +++ openacs-4/packages/dotlrn/www/master.tcl 23 Jan 2002 07:41:04 -0000 1.10 @@ -2,9 +2,6 @@ # sloan specifc master # - - - # if we have a portal_id show navbar set user_id [ad_verify_and_get_user_id] @@ -40,15 +37,16 @@ if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} { set navbar "" - append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html ""] + append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html ""] if {$show_control_panel} { if {$link_control_panel} { - append navbar "
" -separator "
" -post_html "
" -separator "
" -post_html "
Group Admin
" + append navbar "
Group Admin
" } else { - append navbar "
Group Admin
" + append navbar "
Group Admin
" } + } else { + append navbar "" } - } else { set navbar "" set portal_id "" @@ -61,7 +59,7 @@ if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} { set navbar "" - append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html ""] + append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html ""] append navbar "
" -separator "
" -post_html "
" -separator "
" -post_html "
" @@ -79,9 +77,9 @@ append navbar [portal::list_pages -return_url $return_url -portal_id $portal_id -link_all $link_all -link "switch-page" -pre_html "\n
" -separator "
\n
" -post_html "
\n"] if {$link_control_panel} { - append navbar "
Control Panel
" + append navbar "
Control Panel
" } else { - append navbar "
Control Panel
" + append navbar "
Control Panel
" } } else {