Index: openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	3 Jun 2005 22:13:43 -0000	1.5
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	5 Jun 2005 23:20:54 -0000	1.6
@@ -271,6 +271,13 @@
   <msg key="lt_task_terms_depending__1">%task_term%(s) depending on this %task_term%</msg>
   <msg key="lt_task_terms_this_depen">%task_term%s this depends on.</msg>
   <msg key="lt_task_terms_this_depen_1">%task_term%(s) this depends on.</msg>
+  <msg key="lt_Tasks_can_be_categ">Tasks can be categorized according to multiple 'trees'
+        of categories. What this means is you can have multiple ways
+        of categorizing your tasks. This section sets up your
+        categories and allows you to link them to tasks. Currently,
+        there is a bug in the categories package that prevents the
+        context bar at the top of the screen from returning you to the
+        project-manager pages.</msg>
   <msg key="lt_The_administrator_nee">The administrator needs to</msg>
   <msg key="lt_The_data_model_has_a_">The data model has a facility for default roles, although
         it is not currently used at all. This shows what is in the
@@ -444,6 +451,7 @@
   <msg key="task">task</msg>
   <msg key="Task_Calendar">Task Calendar</msg>
   <msg key="Task_calendar">Task calendar</msg>
+  <msg key="Task_categories">Task categories</msg>
   <msg key="task_change">task change</msg>
   <msg key="Task_hours_completed">Task hours completed</msg>
   <msg key="Task_overview">Task overview</msg>
Index: openacs-4/packages/project-manager/www/task-add-edit-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit-one.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/www/task-add-edit-one.tcl	5 Jun 2005 22:58:35 -0000	1.5
+++ openacs-4/packages/project-manager/www/task-add-edit-one.tcl	5 Jun 2005 23:20:54 -0000	1.6
@@ -41,6 +41,7 @@
 # use hour units or day units
 set use_day_p     [parameter::get -parameter "UseDayInsteadOfHour" -default "t"]
 set hours_day     [pm::util::hours_day]
+set root_folder_id [content::folder::get_folder_from_package -package_id $package_id]
 
 if {[string is true $use_day_p]} {
     set work_units "[_ project-manager.days]"
@@ -173,15 +174,15 @@
     }
         
 if {[string is true $edit_p]} {
-    if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
+    if {![empty_string_p [category_tree::get_mapped_trees $root_folder_id]]} {
         ad_form -extend -name task_add_edit -form {
             {category_ids:integer(category),multiple {label "[_ project-manager.Categories]"}
                 {html {size 7}} {value {$task_id $package_id}}
             }
         }
     }
 } else {
-    if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
+    if {![empty_string_p [category_tree::get_mapped_trees $root_folder_id]]} {
         ad_form -extend -name task_add_edit -form {
             {category_ids:integer(category),multiple,optional {label "[_ project-manager.Categories]"}
                 {html {size 7}} {value {}}
Index: openacs-4/packages/project-manager/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/admin/index.adp	26 May 2005 09:34:30 -0000	1.2
+++ openacs-4/packages/project-manager/www/admin/index.adp	5 Jun 2005 23:20:54 -0000	1.3
@@ -54,6 +54,12 @@
       </tr>
 
       <tr>
+        <th>#project-manager.Task_categories#</th>
+        <td><a href="@categories_task_link;noquote@">#project-manager.Edit_categories#</a></td>
+        <td>#project-manager.lt_Tasks_can_be_categ#</td>
+      </tr>
+
+      <tr>
         <th rowspan="3">#project-manager.Logger_integration#</th>
         <td><a href="@logger_link@">#project-manager.Set_up#</a></td>
         <td>#project-manager.lt_Logger_is_a_package_t# <i>#project-manager.variables#</i>#project-manager.lt__Project_manager_requ#<p />
@@ -93,5 +99,3 @@
       </tr>
 
     </table>
-    
-
Index: openacs-4/packages/project-manager/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/admin/index.tcl	26 May 2005 09:34:30 -0000	1.4
+++ openacs-4/packages/project-manager/www/admin/index.tcl	5 Jun 2005 23:20:54 -0000	1.5
@@ -43,9 +43,11 @@
 # the unique identifier for this package
 set package_id [ad_conn package_id]
 set user_id    [ad_maybe_redirect_for_registration]
+set root_folder_id [content::folder::get_folder_from_package -package_id $package_id]
 
 # set up links
 set categories_link "/categories/cadmin/one-object?object_id=$package_id"
+set categories_task_link "/categories/cadmin/one-object?object_id=$root_folder_id"
 set parameters_link "/shared/parameters?package_id=$package_id&return_url=[site_node::get_package_url -package_key project-manager]admin/"
 set logger_link "logger"
 set logger_primary_link "logger-primary"
@@ -71,8 +73,5 @@
 set create_p [permission::permission_p -object_id $package_id -privilege create]
 set admin_p [permission::permission_p -object_id $package_id -privilege admin]
 
-# root CR folder
-set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"]
 
-
 # ------------------------- END OF FILE ------------------------- #