Index: openacs-4/packages/logger/www/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/nav-bar.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/logger/www/lib/nav-bar.tcl	30 Apr 2003 12:21:30 -0000	1.3
+++ openacs-4/packages/logger/www/lib/nav-bar.tcl	1 May 2003 07:21:18 -0000	1.4
@@ -1,5 +1,6 @@
 # Set up links in the navbar that the user has access to
 
+set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 set package_url [ad_conn package_url]
 set page_url [ad_conn url]
@@ -9,30 +10,38 @@
 # The links used in the navbar on format url1 label1 url2 label2 ...
 set link_list {}
 
+# Log entries page
+set index_urls [list "${package_url}" "${package_url}index"]
+lappend link_list $index_urls
+lappend link_list {}
+lappend link_list "Log entries"
+
+# My log entrie page
 if { [ad_conn user_id] != 0 } {
-    lappend link_list "${package_url}"
-    lappend link_list "Log entries"
+    lappend link_list $index_urls
+    lappend link_list [list [list selected_user_id $user_id]]
+    lappend link_list "My log entries"
 }
 
+# The admin index page
 if { $admin_p } {
-    lappend link_list "${package_url}admin/"
+    lappend link_list [list "${package_url}admin/"]
+    lappend link_list {}
     lappend link_list "Admin"
 }
 
 # Convert the list to a multirow and add the selected_p attribute
 multirow create links name url selected_p
-foreach {url label} $link_list {
-    if { [regexp {/$} $url match] } {
-        # Index page - special case as we additionally need to check for a URL with
-        # the index word in it
-        set selected_p [expr [logger::ui::navbar_link_selected_p $url] || \
-                            [logger::ui::navbar_link_selected_p ${url}index]]
-    } else {
-        # Not an index page
-        set selected_p [logger::ui::navbar_link_selected_p $url]
+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
+        }
     }
 
-    multirow append links $label $url $selected_p
+    multirow append links $label "$url?[export_vars $param_list]" $selected_p
 }
 
 ad_return_template