Index: openacs-4/packages/contacts/lib/contacts-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/contacts/lib/contacts-master.tcl	1 Feb 2007 15:27:20 -0000	1.16
+++ openacs-4/packages/contacts/lib/contacts-master.tcl	8 Feb 2008 17:13:27 -0000	1.17
@@ -15,77 +15,53 @@
 lappend link_list "${package_url}"
 lappend link_list "[_ contacts.Contacts]"
 lappend link_list "contacts"
-lappend link_list ""
 
+
 if { ![parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] } {
-    set addlist [list [list [list "text" "[_ contacts.Add_Employee]"] [list "url" "${package_url}add/employee"] ] \
-		     [list [list "text" "[_ contacts.Add_Person]"] [list "url" "${package_url}add/person"] ] \
-		     [list [list "text" "[_ contacts.Add_Organization]"] [list "url" "${package_url}add/organization"] ] \
-		     ]
-    
-    ah::yui::menu_from_list -varname "oMenu1" \
-	-id "basicmenu1" \
-	-menulist $addlist \
-	-arrayname "yuimenu1" \
-	-options "context:new Array(\"menu1\",\"tl\",\"bl\"),hidedelay:1" \
-	-css "/resources/contacts/yuimenu/menu.css"
+    lappend link_list "${package_url}add/employee"
+    lappend link_list "[_ contacts.Add_Employee]"
+    lappend link_list "add_employee"
 
-        
-    set action_script1 $yuimenu1(show)
-
-    lappend link_list "javascript:void(0)" ; # HREF
-    lappend link_list "[_ contacts.Add]" ; # Title
-    lappend link_list "menu1" ; # ID
-    lappend link_list "$action_script1" ; # Mouseover
+    lappend link_list "${package_url}add/person"
+    lappend link_list "[_ contacts.Add_Person]"
+    lappend link_list "add_person"
+    
+    lappend link_list "${package_url}add/organization"
+    lappend link_list "[_ contacts.Add_Organization]"
+    lappend link_list "add_organization"
 }
 
-set addlist [list [list [list "text" "[_ contacts.Advanced_Search]"] [list "url" "${package_url}search"] ] \
-		 [list [list "text" "[_ contacts.Saved_Searches]"] [list "url" "${package_url}searches"] ] \
-		]
+lappend link_list "${package_url}search"
+lappend link_list "[_ contacts.Advanced_Search]"
+lappend link_list "advanced_search"
 
-ah::yui::menu_from_list -varname "oMenu2" \
-    -id "basicmenu2" \
-    -menulist $addlist \
-    -arrayname "yuimenu2" \
-    -options "context:new Array(\"menu2\",\"tl\",\"bl\"),hidedelay:1" \
-    -css "/resources/contacts/yuimenu/menu.css"
+lappend link_list "${package_url}searches"
+lappend link_list "[_ contacts.Saved_Searches]"
+lappend link_list "saved_searches"
 
-set action_script1 $yuimenu2(show)
-
-lappend link_list "javascript:void(0)" ; # HREF
-lappend link_list "[_ contacts.Search]" ; # Title
-lappend link_list "menu2" ; # ID
-lappend link_list "$action_script1" ; # Mouseover
-
-
 # this should be taken care of by a callback...
 if { [apm_package_enabled_p tasks] } {
     lappend link_list "${package_url}tasks"
     lappend link_list "[_ tasks.Tasks]"
     lappend link_list "tasks"
-    lappend link_list ""
     
     lappend link_list "${package_url}processes"
     lappend link_list "[_ tasks.Processes]"
     lappend link_list "processes"
-    lappend link_list ""
 }
 
 lappend link_list "${package_url}messages"
 lappend link_list "[_ contacts.Messages]"
 lappend link_list "messages"
-lappend link_list ""
 
 lappend link_list "${package_url}settings"
 lappend link_list "[_ contacts.Settings]"
 lappend link_list "settings"
-lappend link_list ""
 
 if { [permission::permission_p -object_id [ad_conn package_id] -privilege "admin"] } {
     lappend link_list "${package_url}admin/"
     lappend link_list "[_ contacts.Admin]"
     lappend link_list "admin"
-    lappend link_list ""
 }
 
 
@@ -94,10 +70,10 @@
 set page_query [ad_conn query]
 
 # Convert the list to a multirow and add the selected_p attribute
-multirow create links label url id mouseover selected_p
+multirow create links label url id selected_p
 
 set navbar {}
-foreach {url label id mouseover} $link_list {
+foreach {url label id} $link_list {
     set selected_p 0
 
     if {[string equal $page_url $url]} {
@@ -109,7 +85,7 @@
 	}
     }
     lappend navbar [list [subst $url] $label]
-    multirow append links $label [subst $url] $id $mouseover $selected_p
+    multirow append links $label [subst $url] $id $selected_p
 }
 
 if { [parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] } {
@@ -128,9 +104,4 @@
 }
 
 
-# Finalize the Javascript menus
-set js_script $yuimenu1(render)
-append js_script $yuimenu2(render)
-set js_script [ah::enclose_in_script -script ${js_script} ]
-
 ad_return_template