Index: openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/lib/Attic/nav-bar.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl 20 May 2004 17:30:07 -0000 1.2.2.1 +++ openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl 2 Jul 2004 23:13:50 -0000 1.2.2.2 @@ -4,7 +4,15 @@ set package_id [ad_conn package_id] set package_url [ad_conn package_url] set page_url [ad_conn url] +set page_query [ad_conn query] +if {[string is false [empty_string_p $page_query]]} { + set page_query "?$page_query" +} + +set logger_url [pm::util::logger_url] + + set admin_p [permission::permission_p -object_id $package_id -privilege admin] # The links used in the navbar on format url1 label1 url2 label2 ... @@ -16,17 +24,21 @@ lappend link_list {} lappend link_list "Tasks" - lappend link_list [list "${package_url}index"] + lappend link_list [list "${package_url}?assignee_id=${user_id}"] lappend link_list {} lappend link_list "Projects" lappend link_list [list "${package_url}processes"] lappend link_list {} lappend link_list "Processes" + lappend link_list [list "${logger_url}?user_id=${user_id}"] + lappend link_list {} + lappend link_list "Logger" + lappend link_list [list "${package_url}task-select-project"] lappend link_list {} - lappend link_list "New task" + lappend link_list "Add task" } if { $admin_p } { @@ -40,13 +52,15 @@ multirow create links name url selected_p foreach {url_list param_list label} $link_list { set selected_p 0 + foreach url $url_list { - set selected_p [logger::ui::navbar_link_selected_p $url $param_list] - if { $selected_p } { - break + + if {[string equal "$page_url$page_query" $url]} { + set selected_p 1 } } + if { ![empty_string_p $param_list] } { append url "?[export_vars $param_list]" }