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.10 -r1.11
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	10 Jun 2005 19:21:14 -0000	1.10
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	17 Jun 2005 09:26:59 -0000	1.11
@@ -296,6 +296,7 @@
   <msg key="lt_set_project_term_code">%project_term% code</msg>
   <msg key="lt_set_project_term_goal">%project_term% goal</msg>
   <msg key="lt_set_project_term_name">%project_term% name</msg>
+  <msg key="lt_Set_to_100_to_close_t">Set to 100 to close the task</msg>
   <msg key="lt_set_up_integration_wi">set up integration with logger</msg>
   <msg key="lt_Set_up_logger_integra">Set up logger integration</msg>
   <msg key="lt_skip_adding_dependenc">skip adding dependencies</msg>
@@ -467,6 +468,7 @@
   <msg key="Projects_ongoing">Projects ongoing</msg>
   <msg key="Quantity">Quantity:</msg>
   <msg key="Related_task_terms">Related %task_term%s</msg>
+  <msg key="Remaining_work">Remaining Work</msg>
   <msg key="Remove">myself</msg>
   <msg key="Remove_myself">Remove myself</msg>
   <msg key="Removed">Removed</msg>
@@ -522,6 +524,7 @@
   <msg key="Title">Title</msg>
   <msg key="Title_1">Title\</msg>
   <msg key="Total">Total</msg>
+  <msg key="Total_work">Total work</msg>
   <msg key="Total_work_required">Total work required:</msg>
   <msg key="Type">Type</msg>
   <msg key="Unmounted">Unmounted</msg>
Index: openacs-4/packages/project-manager/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/tasks.tcl	17 Jun 2005 05:02:42 -0000	1.4
+++ openacs-4/packages/project-manager/lib/tasks.tcl	17 Jun 2005 09:26:59 -0000	1.5
@@ -3,7 +3,7 @@
 # role_id
 
 set required_param_list [list]
-set optional_param_list [list orderby searchterm status_id page bulk_p actions_p]
+set optional_param_list [list orderby searchterm status_id page bulk_p actions_p base_url]
 set optional_unset_list [list party_id role_id project_item_id]
 
 foreach required_param $required_param_list {
@@ -43,19 +43,6 @@
 }
 
 
-set community_id [dotlrn_community::get_community_id_from_url \
-		  -url [ad_conn url] \
-		     ]
-
-if {![empty_string_p $community_id]} {
-
-    set base_url "project-manager/"
-
-} else {
-
-    set base_url ""
-
-}
 # ---------------------------------------------------------------
 
 # Hide finished tasks. This should be added as a filter, but I did not
Index: openacs-4/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-one.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/project-manager/www/task-one.tcl	5 Jun 2005 22:58:35 -0000	1.6
+++ openacs-4/packages/project-manager/www/task-one.tcl	17 Jun 2005 09:26:59 -0000	1.7
@@ -201,7 +201,7 @@
                                 -project_id $logger_project]
 }
 
-set log_url [export_vars -base "${logger_url}log" {{return_url $return_url} {project_id $logger_project} {pm_project_id $task_info(project_item_id)} {pm_task_id $task_id}}]
+set log_url [export_vars -base "${logger_url}log" -url {{project_id $logger_project} {pm_project_id $task_info(project_item_id)} {pm_task_id $task_id} return_url}]
 
 set assignee_add_self_widget "Add myself as <form method=\"post\" action=\"task-assign-add\">[export_vars -form {{task_item_id $task_id} user_id return_url}][pm::role::task_select_list -select_name "role_id" -task_item_id $task_id -party_id $user_id]<input type=\"Submit\" value=\"OK\" /></form>"
 
Index: openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp	10 Jun 2005 18:27:35 -0000	1.1
+++ openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp	17 Jun 2005 09:26:59 -0000	1.2
@@ -1,3 +1,3 @@
     <include
       src="/packages/project-manager/lib/tasks"
-      instance_id="@package_id@" display_mode="list"/>
+      instance_id="@package_id@" display_mode="list"/ base_url="@base_url@">
Index: openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl	10 Jun 2005 18:27:35 -0000	1.1
+++ openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl	17 Jun 2005 09:26:59 -0000	1.2
@@ -1,6 +1,14 @@
 array set config $cf
 
-set base_url "[ad_conn package_url]project-manager"
+set community_id [dotlrn_community::get_community_id_from_url \
+		  -url [ad_conn url] \
+		     ]
 
+if {![empty_string_p $community_id]} {
+
+    set base_url "project-manager/"
+
+}
+
 set package_id $config(project_manager_id)