Index: openacs-4/packages/logger/lib/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/master.adp,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/logger/lib/master.adp 5 Jan 2004 20:23:50 -0000 1.1 +++ openacs-4/packages/logger/lib/master.adp 25 Apr 2005 11:25:01 -0000 1.1.2.1 @@ -14,9 +14,10 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + - + + Index: openacs-4/packages/logger/lib/master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/master.tcl,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/logger/lib/master.tcl 5 Jan 2004 20:23:50 -0000 1.1 +++ openacs-4/packages/logger/lib/master.tcl 25 Apr 2005 11:25:01 -0000 1.1.2.1 @@ -3,3 +3,4 @@ set package_url [ad_conn package_url] if { ![info exists header_stuff] } { set header_stuff {} } +if { ![info exists project_id] } { set project_id {} } Index: openacs-4/packages/logger/lib/nav-bar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/nav-bar.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/logger/lib/nav-bar.tcl 17 Sep 2004 21:06:03 -0000 1.1.2.1 +++ openacs-4/packages/logger/lib/nav-bar.tcl 25 Apr 2005 11:25:01 -0000 1.1.2.2 @@ -29,18 +29,36 @@ lappend link_list "Add Entry" if {![empty_string_p $project_manager_url]} { - lappend link_list [list "${project_manager_url}"] - lappend link_list {} - lappend link_list "Projects" + + if {[empty_string_p project_id]} { + lappend link_list [list "${project_manager_url}"] + lappend link_list {} + lappend link_list "Projects" - lappend link_list [list "${project_manager_url}processes"] - lappend link_list {} - lappend link_list "Processes" + lappend link_list [list "${project_manager_url}processes"] + lappend link_list {} + lappend link_list "Processes" - lappend link_list [list "${project_manager_url}tasks"] - lappend link_list {} - lappend link_list "Tasks" + lappend link_list [list "${project_manager_url}tasks"] + lappend link_list {} + lappend link_list "Tasks" + } else { + set project_item_id [logger::util::project_manager_project_id -project_id $project_id] + + lappend link_list [list [export_vars -base "${project_manager_url}one" {project_item_id}]] + lappend link_list {} + lappend link_list "View Project" + + lappend link_list [list "${project_manager_url}processes"] + lappend link_list {} + lappend link_list "Processes" + + lappend link_list [list [export_vars -base "${project_manager_url}tasks" {project_item_id}]] + lappend link_list {} + lappend link_list "Tasks" + } + } } Index: openacs-4/packages/logger/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.adp,v diff -u -r1.16.2.1 -r1.16.2.2 --- openacs-4/packages/logger/www/index.adp 17 Sep 2004 21:06:05 -0000 1.16.2.1 +++ openacs-4/packages/logger/www/index.adp 25 Apr 2005 11:25:01 -0000 1.16.2.2 @@ -1,6 +1,8 @@ @instance_name@ - + + @passed_project_id@ +

There are no projects in this instance of logger. Index: openacs-4/packages/logger/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v diff -u -r1.22.2.1 -r1.22.2.2 --- openacs-4/packages/logger/www/index.tcl 17 Sep 2004 21:06:05 -0000 1.22.2.1 +++ openacs-4/packages/logger/www/index.tcl 25 Apr 2005 11:25:01 -0000 1.22.2.2 @@ -51,9 +51,11 @@ if { $num_package_projects == 1 } { set project_id $package_projects } + set passed_project_id 0 } else { # Assume at least one project, if one is selected set num_package_projects 1 + set passed_project_id $project_id } # Default to the current projection