Changes from sls:

- New freelance view for /intranet/users/

sql/oracle/intranet-views.sql

@@ -101,6 +101,7 @@ insert into im_views (view_id, view_name, visible_for) values (10, 'user_list',
 insert into im_views (view_id, view_name, visible_for) values (11, 'user_view', 'view_users');
 insert into im_views (view_id, view_name, visible_for) values (12, 'user_contact', 'view_users');
 insert into im_views (view_id, view_name, visible_for) values (13, 'user_community', 'view_users');
+insert into im_views (view_id, view_name, visible_for) values (14, 'freelancer_list', 'view_users');
 insert into im_views (view_id, view_name, visible_for) values (20, 'project_list', 'view_projects');
 insert into im_views (view_id, view_name, visible_for) values (21, 'project_costs', 'view_projects');
 insert into im_views (view_id, view_name, visible_for) values (22, 'project_status', 'view_projects');
@@ -232,6 +233,40 @@ insert into im_view_columns values (206,10,NULL,'Home Phone',
 commit;
 
 
+--------------------------------------------------------------
+-- FreelancersListPage
+--
+delete from im_view_columns where column_id >= 1400 and column_id < 1499;
+--
+-- insert into im_view_columns values (1407,14,NULL,'#',
+-- '$user_id','','',6,'');
+
+insert into im_view_columns values (1400,14,NULL,'Name',
+'"<a href=/intranet/users/view?user_id=$user_id>$name</a>"','','',2,'');
+
+insert into im_view_columns values (1401,14,NULL,'Email',
+'"<a href=mailto:$email>$email</a>"','','',3,'');
+
+-- insert into im_view_columns values (1402,14,NULL,'Status',
+-- '$status','','',4,'');
+
+insert into im_view_columns values (1403,14,NULL,'MSM',
+'"<A HREF=\"http://arkansasmall.tcworks.net:8080/message/msn/$msn_email\">
+<IMG SRC=\"http://arkansasmall.tcworks.net:8080/msn/$msn_email\"
+width=21 height=22 border=0 ALT=\"MSN Status\"></A>"','','',5,'');
+
+insert into im_view_columns values (1404,14,NULL,'Work Phone',
+'$work_phone','','',6,'');
+
+insert into im_view_columns values (1405,14,NULL,'Cell Phone',
+'$cell_phone','','',7,'');
+
+insert into im_view_columns values (1406,14,NULL,'Home Phone',
+'$home_phone','','',8,'');
+--
+commit;
+
+
 
 -------------------------------------------------------------------
 -- UsersViewPage

tcl/intranet-design-procs.tcl

@@ -163,11 +163,13 @@ ad_proc -public im_table_with_title { title body } {
 # Navigation Bars
 # --------------------------------------------------------
 
-ad_proc -public im_user_navbar { default_letter base_url next_page_url prev_page_url export_var_list } {
+ad_proc -public im_user_navbar { default_letter base_url next_page_url prev_page_url export_var_list {select_label ""} } {
     Returns rendered HTML code for a horizontal sub-navigation
     bar for /intranet/users/.
     The lower part of the navbar also includes an Alpha bar.<br>
     Default_letter==none marks a special behavious, printing no alpha-bar.
+
+    @param select_label Label of a menu item to highlight
 } {
     # -------- Defaults -----------------------------
     set user_id [ad_get_user_id]
@@ -201,7 +203,7 @@ ad_proc -public im_user_navbar { default_letter base_url next_page_url prev_page
     # Get the Subnavbar
     set parent_menu_sql "select menu_id from im_menus where name='Users'"
     set parent_menu_id [db_string parent_admin_menu $parent_menu_sql]
-    set navbar [im_sub_navbar $parent_menu_id "" $alpha_bar "tabnotsel"]
+    set navbar [im_sub_navbar $parent_menu_id "" $alpha_bar "tabnotsel" $select_label]
 
     return $navbar
 }
@@ -483,7 +485,7 @@ ad_proc -public im_admin_navbar { } {
 
 
 
-ad_proc -public im_sub_navbar { parent_menu_id {bind_vars ""} {title ""} {title_class "pagedesriptionbar"} } {
+ad_proc -public im_sub_navbar { parent_menu_id {bind_vars ""} {title ""} {title_class "pagedesriptionbar"} {select_label ""} } {
     Setup a sub-navbar with tabs for each area, highlighted depending
     on the local URL and enabled depending on the user permissions.
     @param parent_menu_id id of the parent menu in im_menus
@@ -491,6 +493,8 @@ ad_proc -public im_sub_navbar { parent_menu_id {bind_vars ""} {title ""} {title_
     @title string to go into the line below the menu tabs
     @title_class CSS class of the title line
 } {
+    ns_log Notice "im_sub_navbar: parent_menu_id=$parent_menu_id, bind_vars=$bind_vars, title=$title, select_label=$select_label"
+
     set user_id [ad_get_user_id]
     set url_stub [ns_conn url]
 
@@ -531,7 +535,12 @@ ad_proc -public im_sub_navbar { parent_menu_id {bind_vars ""} {title ""} {title_
         set selected 0
         set url_length [expr [string length $url] - 1]
         set url_stub_chopped [string range $url_stub 0 $url_length]
-        if {!$found_selected && [string equal $url_stub $url]} {
+
+	ns_log Notice "im_sub_navbar: check select for label='$label' against select_label='$select_label'"
+
+        if {[string equal $label $select_label]} {
+	    
+	    ns_log Notice "im_sub_navbar: highlight menu_name='$name'"
             # Make sure we only highligh one menu item..
             set found_selected 1
             # Set for the gif

www/users/index.tcl

@@ -81,18 +81,21 @@ set letter [string toupper $letter]
 # Get the ID of the group of users to show
 # Default 0 corresponds to the list of all users.
 set user_group_id 0
+set menu_select_label ""
 switch $user_group_name {
-    "All" { set user_group_id 0 }
+    "All" { 
+	set user_group_id 0 
+	set menu_select_label "users_all"
+    }
     "Unregistered" { set user_group_id -1 }
     default {
 	set user_group_id [db_string user_group_id "select group_id from groups where group_name like :user_group_name" -default 0]
+	set menu_select_label "users_[string tolower $user_group_name]"
     }
 }
 
-
-
-
 if {$user_group_id > 0} {
+
     # We have a group specified to show:
     # Check whether the user can "read" this group:
     set sql "select acs_permission.permission_p(:user_group_id, :user_id, 'read') from dual"
@@ -101,11 +104,12 @@ if {$user_group_id > 0} {
 	ad_return_complaint 1 "You don't have permissions to view this page"
 	return
     }
+
 } else {
+
     # The user requests to see all groups.
     # The most critical groups are customer contacts...
-    set customer "Customers"
-    set customer_group_id [db_string user_group_id "select group_id from groups where group_name like :customer" -default 0]
+    set customer_group_id [db_string user_group_id "select group_id from groups where group_name like :user_group_name" -default 0]
 
     set sql "select acs_permission.permission_p(:customer_group_id, :user_id, 'read') from dual"
     set read [db_string user_can_read_user_group_p $sql]
@@ -115,6 +119,12 @@ if {$user_group_id > 0} {
     }
 }
 
+set show_freelancers 0
+if {$user_group_id == [im_freelance_group_id]} {
+    set show_freelancers 1
+    set view_name "freelancer_list"
+}
+
 if { [empty_string_p $how_many] || $how_many < 1 } {
     set how_many [ad_parameter -package_id [im_package_core_id] NumberResultsPerPage intranet 50]
 }
@@ -387,7 +397,8 @@ set table_continuation_html ""
 # ---------------------------------------------------------------
 
 set page_body "
-[im_user_navbar $letter "/intranet/users/index" $next_page_url $previous_page_url [list start_idx order_by how_many view_name user_group_name letter]]
+<br>
+[im_user_navbar $letter "/intranet/users/index" $next_page_url $previous_page_url [list start_idx order_by how_many view_name user_group_name letter] $menu_select_label]
 
 <table width=100% cellpadding=2 cellspacing=2 border=0>
   $table_header_html