Index: openacs-4/packages/logger/lib/entries.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/lib/entries.xql	14 Jan 2004 08:58:12 -0000	1.3
+++ openacs-4/packages/logger/lib/entries.xql	27 Feb 2004 17:43:50 -0000	1.4
@@ -26,14 +26,15 @@
     	    from   logger_projects lp,
     	           logger_project_pkg_map lppm
     	    where  lp.project_id = lppm.project_id	
-    		   and lppm.package_id = :package_id
+            and    lppm.package_id = :package_id
+            and    lp.active_p = 't'
     	    order  by lp.name
     </querytext>
   </fullquery>
 
   <fullquery name="select_variables">
     <querytext>
-    	    select lv.name || ' (' || lv.unit || ')' as name,
+    	    select distinct lv.name || ' (' || lv.unit || ')' as name,
                    lv.variable_id
     	    from   logger_variables lv,
     	           logger_project_var_map lpvm,
Index: openacs-4/packages/logger/tcl/project-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/logger/tcl/project-procs-oracle.xql	26 Feb 2004 15:29:18 -0000	1.5
+++ openacs-4/packages/logger/tcl/project-procs-oracle.xql	27 Feb 2004 17:43:51 -0000	1.6
@@ -27,16 +27,6 @@
     </querytext>
   </fullquery>
  
-  <fullquery name="logger::project::users_get_options.select_project_leads">
-    <querytext>
-        select distinct acs_object.name(p.project_lead), project_lead
-        from   logger_projects p,
-               logger_project_pkg_map ppm
-        where  ppm.project_id = p.project_id
-        and    ppm.package_id = :package_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="logger::project::get_current_projection.select_current_projection">
     <querytext>
         select min(p.projection_id)
Index: openacs-4/packages/logger/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-postgresql.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/logger/tcl/project-procs-postgresql.xql	26 Feb 2004 15:29:18 -0000	1.6
+++ openacs-4/packages/logger/tcl/project-procs-postgresql.xql	27 Feb 2004 17:43:51 -0000	1.7
@@ -23,16 +23,6 @@
     </querytext>
   </fullquery>
  
-  <fullquery name="logger::project::users_get_options.select_project_leads">
-    <querytext>
-        select distinct acs_object__name(p.project_lead), project_lead
-        from   logger_projects p,
-               logger_project_pkg_map ppm
-        where  ppm.project_id = p.project_id
-        and    ppm.package_id = :package_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="logger::project::get_current_projection.select_current_projection">
     <querytext>
         select min(p.projection_id)
Index: openacs-4/packages/logger/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/logger/tcl/project-procs.tcl	5 Jan 2004 21:05:27 -0000	1.8
+++ openacs-4/packages/logger/tcl/project-procs.tcl	27 Feb 2004 17:43:51 -0000	1.9
@@ -282,6 +282,7 @@
     Get the list of users to display in a drop-down to pick project lead.
 } {
     set package_id [ad_conn package_id]
+    set user_id [ad_conn user_id]
 
     set users_list [db_list_of_lists select_project_leads {}]
 
Index: openacs-4/packages/logger/tcl/project-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/logger/tcl/project-procs.xql	11 Dec 2003 21:40:07 -0000	1.7
+++ openacs-4/packages/logger/tcl/project-procs.xql	27 Feb 2004 17:43:51 -0000	1.8
@@ -91,5 +91,20 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="logger::project::users_get_options.select_project_leads">
+    <querytext>
+        select uouter.first_names || ' ' || uouter.last_name, uouter.user_id
+        from   cc_users uouter
+        where  uouter.user_id in (select distinct u.user_id
+                                  from   cc_users u
+                                  where  u.user_id in (select p.project_lead
+                                                       from   logger_projects p,
+                                                              logger_project_pkg_map ppm
+                                                       where  ppm.project_id = p.project_id
+                                                       and    ppm.package_id = :package_id)
+                                  or     u.user_id = :user_id)
+        order  by lower(uouter.first_names), lower(uouter.last_name)
+    </querytext>
+  </fullquery>
 
 </queryset>
Index: openacs-4/packages/logger/tcl/ui-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/ui-procs.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/tcl/ui-procs.xql	28 Aug 2003 09:45:30 -0000	1.3
+++ openacs-4/packages/logger/tcl/ui-procs.xql	27 Feb 2004 17:43:51 -0000	1.4
@@ -21,6 +21,7 @@
                logger_project_pkg_map lppm
         where  lp.project_id = lppm.project_id
         and    lppm.package_id = :package_id
+        and    lp.active_p = 't'
         order  by name
     </querytext>
   </fullquery>
Index: openacs-4/packages/logger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/logger/www/index.tcl	27 Feb 2004 16:58:13 -0000	1.21
+++ openacs-4/packages/logger/www/index.tcl	27 Feb 2004 17:43:52 -0000	1.22
@@ -49,6 +49,9 @@
     if { $num_package_projects == 1 } {
         set project_id $package_projects
     }
+} else {
+    # Assume at least one project, if one is selected
+    set num_package_projects 1
 }
 
 # Default to the current projection
Index: openacs-4/packages/logger/www/log.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/logger/www/log.adp	11 Jan 2004 17:52:40 -0000	1.12
+++ openacs-4/packages/logger/www/log.adp	27 Feb 2004 17:43:52 -0000	1.13
@@ -1,7 +1,7 @@
 <master src="/packages/logger/lib/master">
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<property name="focus">log_entry_form.category_id</property>
+<property name="focus">@focus;noquote@</property>
 
 <script language="javascript">
    function project_change() {
Index: openacs-4/packages/logger/www/log.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/logger/www/log.tcl	16 Feb 2004 15:02:35 -0000	1.19
+++ openacs-4/packages/logger/www/log.tcl	27 Feb 2004 17:43:52 -0000	1.20
@@ -136,6 +136,12 @@
     set the_project_id $project_id
 }
 
+if { [llength [category_tree::get_mapped_trees $project_id]] > 0 } {
+    set focus "log_entry_form.category_id"
+} else {
+    set focus "log_entry_form.value"
+}
+
 category::ad_form::add_widgets \
     -container_object_id $the_project_id \
     -categorized_object_id [value_if_exists entry_id] \
@@ -217,7 +223,7 @@
     ad_set_client_property logger time_stamp $time_stamp
 
     # Present the user with an add form again for quick logging
-    ad_returnredirect [export_vars -base [ad_conn url] { project_id variable_id }]
+    ad_returnredirect -message "Log entry for $value $variable_array(unit) with description \"$description\"added." [export_vars -base [ad_conn url] { project_id variable_id }]
     ad_script_abort
 
 } -edit_data {
@@ -237,7 +243,7 @@
 
 } -after_submit {
 
-    ad_returnredirect $return_url
+    ad_returnredirect -message "Log entry modified." $return_url
     ad_script_abort
 }
 
Index: openacs-4/packages/logger/www/project-select.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/project-select.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/www/project-select.tcl	22 Dec 2003 19:45:16 -0000	1.2
+++ openacs-4/packages/logger/www/project-select.tcl	27 Feb 2004 17:43:52 -0000	1.3
@@ -22,7 +22,7 @@
     ad_script_abort
 }
 
-ad_form -name project_form -form {
+ad_form -name project_form -edit_buttons { { "Next" ok } } -form {
     {project_id:integer(select)
         {label Project}
         {options {$project_options}}
Index: openacs-4/packages/logger/www/admin/map-variable-to-project-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/map-variable-to-project-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/www/admin/map-variable-to-project-2.tcl	1 May 2003 14:16:18 -0000	1.2
+++ openacs-4/packages/logger/www/admin/map-variable-to-project-2.tcl	27 Feb 2004 17:43:53 -0000	1.3
@@ -11,4 +11,7 @@
 
 logger::project::map_variable -project_id $project_id -variable_id $variable_id
 
-ad_returnredirect "project?project_id=$project_id"
+logger::variable::get -variable_id $variable_id -array variable
+logger::project::get -project_id $project_id -array project
+
+ad_returnredirect -message "Variable \"$variable(name)\" has been added to \"$project(name)\"." [export_vars -base "project" { project_id }]
Index: openacs-4/packages/logger/www/admin/map-variable-to-project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/map-variable-to-project.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/www/admin/map-variable-to-project.tcl	4 Jan 2004 17:24:38 -0000	1.3
+++ openacs-4/packages/logger/www/admin/map-variable-to-project.tcl	27 Feb 2004 17:43:53 -0000	1.4
@@ -11,7 +11,7 @@
 logger::project::get -project_id $project_id -array project
 
 set page_title "Add a variable to project \"$project(name)\""
-set context [list $page_title]
+set context [list [list [export_vars -base project { project_id }] $project(name)] $page_title]
 
 # List all variables not already mapped to the project
 logger::package::variables_multirow -not_in_project_id $project_id
@@ -37,7 +37,7 @@
         add {
             sub_class narrow
             label "Add"
-            display_template "Add"
+            display_template "Add @variables.name@ to $project(name)"
             link_url_eval {[export_vars -base map-variable-to-project-2 { project_id variable_id }]}
         }
     }
Index: openacs-4/packages/logger/www/admin/project.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/logger/www/admin/project.adp	3 Feb 2004 21:11:53 -0000	1.10
+++ openacs-4/packages/logger/www/admin/project.adp	27 Feb 2004 17:43:53 -0000	1.11
@@ -12,6 +12,16 @@
     <li><a href="@category_map_url@">Define categories</a></li>
   </ul>
 
+  <if @variables:rowcount@ eq 0>
+    <div class="boxed-user-message">
+      <h3>Important Message</h3>
+      <div class="body">
+        You must <a href="@add_variable_url@">add a variable</a> to your project before
+        you will be able to log entries to it.
+      </div>
+    </div>
+  </if>
+
   <h2>Variables</h2>
 
   <listtemplate name="variables"></listtemplate>
Index: openacs-4/packages/logger/www/admin/project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/logger/www/admin/project.tcl	11 Jan 2004 22:11:24 -0000	1.15
+++ openacs-4/packages/logger/www/admin/project.tcl	27 Feb 2004 17:43:53 -0000	1.16
@@ -58,10 +58,10 @@
         {label "Description"}
     }
 
-    {project_lead:search
+    {project_lead:search,optional
         {result_datatype integer}
         {label {Project Lead}}
-        {options [logger::project::users_get_options]}
+        {options {[concat [logger::project::users_get_options]]}}
         {search_query {[db_map dbqd.acs-tcl.tcl.community-core-procs.user_search]}}
     }
 }
@@ -112,8 +112,13 @@
         -active_p $active_p
 
 } -after_submit {
-      
-    ad_returnredirect "[ad_conn url]?project_id=$project_id"
+    if { [ad_form_new_p -key project_id] } {
+        set message "Project \"$name\" has been created."
+    } else {
+        set message "Project \"$name\" has been modified."
+    }
+
+    ad_returnredirect -message $message [export_vars -base [ad_conn url] { project_id }]
     ad_script_abort
 }
 
@@ -148,6 +153,8 @@
     }
 }
 
+set add_variable_url [export_vars -base map-variable-to-project { project_id }]
+
 template::list::create \
     -name variables \
     -actions [list "Add variable" [export_vars -base map-variable-to-project { project_id }] {}] \