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.58 -r1.59
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	9 Oct 2006 17:32:46 -0000	1.58
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	14 Nov 2006 16:13:16 -0000	1.59
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="project-manager" package_version="3.2a1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="project-manager" package_version="3.2a4" locale="en_US" charset="ISO-8859-1">
 
   <msg key="---_TBD_---">--- TBD ---</msg>
   <msg key="--_Closed">-- Closed</msg>
@@ -74,7 +74,9 @@
   <msg key="Contact">Contact</msg>
   <msg key="Create_Offer">Create Offer</msg>
   <msg key="Create_Offer_help">Automatically create a new offer made up of offer items for each of the combinations given above?</msg>
+  <msg key="Create_project">Creating Project</msg>
   <msg key="create_project">Create project</msg>
+  <msg key="Create_project_message1">We are creating the project and all associated subprojects. Please be patient while we finish.</msg>
   <msg key="Created">Created</msg>
   <msg key="Creation_date">Creation date</msg>
   <msg key="CSV">CSV</msg>
@@ -154,6 +156,7 @@
   <msg key="Goal">Goal</msg>
   <msg key="Goal_1">Goal:</msg>
   <msg key="Hide">Hide</msg>
+  <msg key="HideSubprojects">Hide Subprojects</msg>
   <msg key="Hour_to_date">Hour to date</msg>
   <msg key="hours">hours</msg>
   <msg key="Hours_completed">Hours completed</msg>
@@ -287,6 +290,7 @@
   <msg key="lt_nbspnumrownumnbspnbsp">&amp;nbsp;%num.rownum%&amp;nbsp;&amp;nbsp;</msg>
   <msg key="lt_New_task_term_task_it">New %task_term% #%task_item_id%: %subject%</msg>
   <msg key="lt_not_current_select_li">(not current, select live version from the</msg>
+  <msg key="lt_not_current_select_live">(not current select live)</msg>
   <msg key="lt_not_current_set_live">(not current, select live version from the  page)</msg>
   <msg key="lt_Now_set_up_dependenci">Now set up dependencies</msg>
   <msg key="lt_Once_you_have_chosen_">Once you have chosen logger instances to be integrated
@@ -594,6 +598,7 @@
   <msg key="Task_categories">Task categories</msg>
   <msg key="task_change">task change</msg>
   <msg key="task_Description_1">Task Description</msg>
+  <msg key="Task_end_date">Task deadline</msg>
   <msg key="Task_hours_completed">Task hours completed</msg>
   <msg key="Task_name">Task Name:</msg>
   <msg key="Task_overview">Task overview</msg>
Index: openacs-4/packages/project-manager/lib/dependency-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/dependency-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/dependency-portlet.adp	3 Jun 2005 22:13:44 -0000	1.1
+++ openacs-4/packages/project-manager/lib/dependency-portlet.adp	14 Nov 2006 16:13:16 -0000	1.2
@@ -1,11 +1,11 @@
 <table border="0" class="list" width="100%" cellspacing="0" cellpadding="0">
   <tr>
     <th align="left" valign="top" width="10">
-      <img src="resources/tl-e6e6fa" align="top" />
+      <img src="/resources/project-manager/tl-e6e6fa" align="top" />
     </th>
     <th>@headline@</th>
     <th align="right" valign="top" width="10">
-      <img src="resources/tr-e6e6fa" align="top" />
+      <img src="/resources/project-manager/tr-e6e6fa" align="top" />
     </th>
   </tr>
   <tr>
Index: openacs-4/packages/project-manager/lib/dependency-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/dependency-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/dependency-portlet.tcl	30 Jul 2005 00:26:33 -0000	1.2
+++ openacs-4/packages/project-manager/lib/dependency-portlet.tcl	14 Nov 2006 16:13:16 -0000	1.3
@@ -30,16 +30,16 @@
             label "[_ project-manager.Type]"
             display_template {
                 <if @dependency.dependency_type@ eq start_before_start>
-                <img border="0" src="resources/start_before_start.png">
+                <img border="0" src="/resources/project-manager/start_before_start.png">
                 </if>
                 <if @dependency.dependency_type@ eq start_before_finish>
-                <img border="0" src="resources/start_before_finish.png">
+                <img border="0" src="/resources/project-manager/start_before_finish.png">
                 </if>
                 <if @dependency.dependency_type@ eq finish_before_start>
-                <img border="0" src="resources/finish_before_start.png">
+                <img border="0" src="/resources/project-manager/finish_before_start.png">
                 </if>
                 <if @dependency.dependency_type@ eq finish_before_finish>
-                <img border="0" src="resources/finish_before_finish.png">
+                <img border="0" src="/resources/project-manager/finish_before_finish.png">
                 </if>
             }
         }
Index: openacs-4/packages/project-manager/lib/related-tasks-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/related-tasks-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/related-tasks-portlet.adp	3 Jun 2005 22:13:44 -0000	1.1
+++ openacs-4/packages/project-manager/lib/related-tasks-portlet.adp	14 Nov 2006 16:13:16 -0000	1.2
@@ -1,11 +1,11 @@
 <table border="0" class="list" width="100%" cellspacing="0" cellpadding="0">
   <tr>
     <th align="left" valign="top" width="10">
-      <img src="resources/tl-e6e6fa" align="top" />
+      <img src="/resources/project-manager/tl-e6e6fa" align="top" />
     </th>
     <th>#project-manager.Related_task_terms#</th>
     <th align="right" valign="top" width="10">
-      <img src="resources/tr-e6e6fa" align="top" />
+      <img src="/resources/project-manager/tr-e6e6fa" align="top" />
     </th>
   </tr>
   <tr>
Index: openacs-4/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/project-manager/www/index.adp	29 May 2006 16:36:17 -0000	1.17
+++ openacs-4/packages/project-manager/www/index.adp	14 Nov 2006 16:13:16 -0000	1.18
@@ -1,6 +1,6 @@
 <master src="lib/master">
 
-  <link rel="stylesheet" href="style.css" type="text/css" />
+  <link rel="stylesheet" href="/resources/project-manager/style.css" type="text/css" />
     
 <property name="title">#project-manager.Projects#</property>
 <property name="context">@context;noquote@</property>
Index: openacs-4/packages/project-manager/www/process-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/process-one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/www/process-one.adp	14 Sep 2005 15:29:12 -0000	1.3
+++ openacs-4/packages/project-manager/www/process-one.adp	14 Nov 2006 16:13:16 -0000	1.4
@@ -1,6 +1,6 @@
 <master />
 
-<link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" href="/resources/project-manager/style.css" type="text/css" />
 
 <property name="title">#project-manager.One_process#</property>
 <property name="context_bar">@context_bar;noquote@</property>
Index: openacs-4/packages/project-manager/www/processes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/processes.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/processes.adp	26 May 2005 09:34:29 -0000	1.2
+++ openacs-4/packages/project-manager/www/processes.adp	14 Nov 2006 16:13:16 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="lib/master">
 
-<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="stylesheet" href="/resources/project-manager/style.css" type="text/css">
 
 <property name="title">#project-manager.Processes#</property>
 <property name="context">@context_bar@</property>
Index: openacs-4/packages/project-manager/www/task-print.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-print.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/www/task-print.tcl	10 Aug 2006 09:39:13 -0000	1.7
+++ openacs-4/packages/project-manager/www/task-print.tcl	14 Nov 2006 16:13:16 -0000	1.8
@@ -117,16 +117,16 @@
             label "[_ project-manager.Type]"
             display_template {
                 <if @dependency.dependency_type@ eq start_before_start>
-                <img border="0" src="resources/start_before_start.png">
+                <img border="0" src="/resources/project-manager/start_before_start.png">
                 </if>
                 <if @dependency.dependency_type@ eq start_before_finish>
-                <img border="0" src="resources/start_before_finish.png">
+                <img border="0" src="/resources/project-manager/start_before_finish.png">
                 </if>
                 <if @dependency.dependency_type@ eq finish_before_start>
-                <img border="0" src="resources/finish_before_start.png">
+                <img border="0" src="/resources/project-manager/finish_before_start.png">
                 </if>
                 <if @dependency.dependency_type@ eq finish_before_finish>
-                <img border="0" src="resources/finish_before_finish.png">
+                <img border="0" src="/resources/project-manager/finish_before_finish.png">
                 </if>
             }
         }
@@ -177,16 +177,16 @@
             label "[_ project-manager.Type]"
             display_template {
                 <if @dependency2.dependency_type@ eq start_before_start>
-                <img border="0" src="resources/start_before_start.png">
+                <img border="0" src="/resources/project-manager/start_before_start.png">
                 </if>
                 <if @dependency2.dependency_type@ eq start_before_finish>
-                <img border="0" src="resources/start_before_finish.png">
+                <img border="0" src="/resources/project-manager/start_before_finish.png">
                 </if>
                 <if @dependency2.dependency_type@ eq finish_before_start>
-                <img border="0" src="resources/finish_before_start.png">
+                <img border="0" src="/resources/project-manager/finish_before_start.png">
                 </if>
                 <if @dependency2.dependency_type@ eq finish_before_finish>
-                <img border="0" src="resources/finish_before_finish.png">
+                <img border="0" src="/resources/project-manager/finish_before_finish.png">
                 </if>
             }
         }
Index: openacs-4/packages/project-manager/www/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/project-manager/www/tasks.adp	29 May 2006 17:36:02 -0000	1.10
+++ openacs-4/packages/project-manager/www/tasks.adp	14 Nov 2006 16:13:16 -0000	1.11
@@ -1,6 +1,6 @@
 <master src="lib/master">
 
-  <link rel="stylesheet" href="style.css" type="text/css" />
+  <link rel="stylesheet" href="/resources/project-manager/style.css" type="text/css" />
   
   <property name="title">#project-manager.Tasks#</property>
   <property name="context">@context@</property>
@@ -24,7 +24,7 @@
 	page_num="@page_num@" 
 	base_url="@base_url@" 
 	searchterm="@searchterm@" 
-	orderby_tasks="@orderby_tasks@" 
+	tasks_orderby="@tasks_orderby@" 
 	role_id="@role_id@" 
 	filter_package_id="@filter_package_id@" 
 	subproject_tasks="@subproject_tasks@"
Index: openacs-4/packages/project-manager/www/comments/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/comments/add.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/project-manager/www/comments/add.tcl	20 Oct 2006 06:30:56 -0000	1.13
+++ openacs-4/packages/project-manager/www/comments/add.tcl	14 Nov 2006 16:13:16 -0000	1.14
@@ -42,6 +42,9 @@
 
 set assignee_list [list]
 
+# List to make sure we are not sending comments twice
+set listed_party_ids {}    
+
 if { $exclude_observers_p } {
     foreach assignee_one $assignees {
 	# Compare the role_id to the one get on observer_role_id
@@ -51,7 +54,7 @@
 	    set party_id [lindex $assignee_one 0]
 	    set name [person::name -person_id $party_id]
 	    set email [party::email -party_id $party_id]
-
+	    lappend listed_party_ids $party_id
 	    if {$show_role_p} {
 		# display assigned role
 		lappend assignee_list [list "$name ($email) ([pm::role::name -role_id [lindex $assignee_one 1]])" $party_id]
@@ -67,7 +70,7 @@
 	set party_id [lindex $assignee_one 0]
 	set name [person::name -person_id $party_id]
 	set email [party::email -party_id $party_id]
-
+	lappend listed_party_ids $party_id
 	if {$show_role_p} {
 	    # display assigned role
 	    lappend assignee_list [list "$name ($email) ([pm::role::name -role_id [lindex $assignee_one 1]])" $party_id]
@@ -76,7 +79,7 @@
 	}
     }
 }
-    
+
 # Include subprojects
 foreach subproject_id [pm::project::get_all_subprojects -project_item_id $object_id] {
     set sub_assignees [pm::project::assignee_role_list -project_item_id $subproject_id]
@@ -88,13 +91,14 @@
 	    
 	    if {[lsearch -exact $listed_party_ids $party_id] == -1} {
 		lappend assignee_list [list "$name ($email)" $party_id]
+		lappend listed_party_ids $party_id
 	    }
 	}
     }
 }
 
 # Get a list of all parties, excluding myself
-set listed_party_ids {}
+
 set user_id [ad_conn user_id]
 foreach assignee_one $assignee_list {
     set assignee_id [lindex $assignee_one 1]
@@ -103,6 +107,8 @@
     }
 }
 
+# Just for wieners
+set listed_party_ids [list]
 ad_form -name comment \
     -form {
         acs_object_id_seq:key
@@ -190,7 +196,8 @@
 	    lappend to_party_ids "$assignee_id"
 	}
     }
-    
+
+    ns_log Notice "PM comment:: $to_party_ids"
     set comment_id [pm::util::general_comment_add \
 			-object_id $object_id \
 			-title "$title" \
Index: openacs-4/packages/project-manager/www/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/lib/master.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/project-manager/www/lib/master.adp	15 Sep 2005 23:12:48 -0000	1.6
+++ openacs-4/packages/project-manager/www/lib/master.adp	14 Nov 2006 16:13:16 -0000	1.7
@@ -4,9 +4,7 @@
 <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
 <property name="header_stuff">
   @header_stuff;noquote@
-    <style type="text/css">   <link rel="stylesheet" type="text/css"
-        href="@package_url@style.css" />
-      @import url(@package_url@style.css) all; 
+    <style type="text/css">   <link rel="stylesheet" type="text/css" href="/resources/project-manager/style.css" />
    </style>
   </property>
 <property name="doc_type">
@@ -16,7 +14,143 @@
 </property>
 <property name="navbar_list">@navbar_list@</property>
 <style type="text/css">
-   @import url(@package_url@style.css) all;
+td.highlighted {
+  background-color:#ddddff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.highlight {
+  background-color:#ffffdd;
+  border-bottom: 1px dotted #A0BDEB;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.subheader {
+  background-color:#ffffdd;
+  border-top: 1px dotted #e6e6fa;
+  border-bottom: 1px dotted #e6e6fa;
+  border-left: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.list-bg {
+  border-left: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.list-bottom-bg {
+  border-bottom: 1px solid #e6e6fa;
+  border-left: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.list-right-bg {
+  border-bottom: 1px solid #e6e6fa;
+  border-right: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+th.project {
+        background-color:#9999cc;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.project-filter-pane {
+        background-color: #bbbbee;
+        vertical-align: top;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+.shaded {
+        background-color: #dddddd;
+}
+
+.selected {
+        background-color: #eeccdd;
+}
+
+th { 
+     font-size: 9pt;
+     text-align: left;
+     background-color:dfdfff;
+}
+
+
+/* From logger */
+
+table.logger_navbar {
+  background-color: #41329c;
+  clear: both;
+}
+a.logger_navbar { 
+    color: white; 
+    text-decoration: none;
+}
+a.logger_navbar:visited { 
+  color: white; 
+}
+a.logger_navbar:hover { 
+    color: white; 
+    text-decoration: underline;
+}
+td.logger_navbar {
+  font-family: tahoma,verdana,arial,helvetica; 
+  font-size: 70%; 
+  font-weight: bold; 
+  color: #ccccff; 
+  text-decoration: none; 
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-right {
+  border-bottom: 3px solid #A0BDEB;
+  border-right: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-right2 {
+  border-right: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-bottom {
+  border-bottom: 3px solid #A0BDEB;
+  border-left: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-middle {
+  border-left: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-bg {
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+#search-block { 
+  border:1px solid #000; 
+  background-color: #EAF2FF;
+  padding:5px; 
+  width:70%;
+}
+
+#search-block-big { 
+  border:1px solid #000; 
+  background-color: #EAF2FF;
+  padding:5px; 
+  width:99%;
+}
+
+h3 {
+  background-color:#ffffdd;
+  font: 100% Verdana,Georgia,Serif;
+}
 </style>
 
 <!-- include src="nav-bar" project_item_id="@project_item_id@" -->
Index: openacs-4/packages/project-manager/www/resources/style.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/resources/style.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/www/resources/style.css	14 Nov 2006 16:13:17 -0000	1.1
@@ -0,0 +1,137 @@
+td.highlighted {
+  background-color:#ddddff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.highlight {
+  background-color:#ffffdd;
+  border-bottom: 1px dotted #A0BDEB;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.subheader {
+  background-color:#ffffdd;
+  border-top: 1px dotted #e6e6fa;
+  border-bottom: 1px dotted #e6e6fa;
+  border-left: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.list-bg {
+  border-left: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.list-bottom-bg {
+  border-bottom: 1px solid #e6e6fa;
+  border-left: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.list-right-bg {
+  border-bottom: 1px solid #e6e6fa;
+  border-right: 1px solid #e6e6fa;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+th.project {
+        background-color:#9999cc;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.project-filter-pane {
+        background-color: #bbbbee;
+        vertical-align: top;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+.shaded {
+        background-color: #dddddd;
+}
+
+.selected {
+        background-color: #eeccdd;
+}
+
+th { 
+     font-size: 9pt;
+     text-align: left;
+     background-color:dfdfff;
+}
+
+
+/* From logger */
+
+table.logger_navbar {
+  background-color: #41329c;
+  clear: both;
+}
+a.logger_navbar { 
+    color: white; 
+    text-decoration: none;
+}
+a.logger_navbar:visited { 
+  color: white; 
+}
+a.logger_navbar:hover { 
+    color: white; 
+    text-decoration: underline;
+}
+td.logger_navbar {
+  font-family: tahoma,verdana,arial,helvetica; 
+  font-size: 70%; 
+  font-weight: bold; 
+  color: #ccccff; 
+  text-decoration: none; 
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-right {
+  border-bottom: 3px solid #A0BDEB;
+  border-right: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-right2 {
+  border-right: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-bottom {
+  border-bottom: 3px solid #A0BDEB;
+  border-left: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-middle {
+  border-left: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+td.fill-list-bg {
+  background-color: #eaf2ff;
+  font: 90% Verdana,Georgia,Serif;
+}
+
+#search-block { 
+  border:1px solid #000; 
+  background-color: #EAF2FF;
+  padding:5px; 
+  width:70%;
+}
+
+#search-block-big { 
+  border:1px solid #000; 
+  background-color: #EAF2FF;
+  padding:5px; 
+  width:99%;
+}
+
+h3 {
+  background-color:#ffffdd;
+  font: 100% Verdana,Georgia,Serif;
+}