Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -r1.16.2.16 -r1.16.2.17
--- openacs-4/contrib/packages/project-manager/project-manager.info	24 Sep 2004 21:31:07 -0000	1.16.2.16
+++ openacs-4/contrib/packages/project-manager/project-manager.info	8 Oct 2004 21:24:57 -0000	1.16.2.17
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.20b3" url="http://openacs.org/repository/download/apm/project-manager-2.20b3.apm">
+    <version name="2.21b1" url="http://openacs.org/repository/download/apm/project-manager-2.21b1.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
         <summary>Project management tool for OpenACS</summary>
-        <release-date>2004-09-24</release-date>
+        <release-date>2004-10-08</release-date>
         <vendor url="mailto:jader@bread.com">Integrated Bakery Resources</vendor>
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
 
-        <provides url="project-manager" version="2.20b3"/>
+        <provides url="project-manager" version="2.21b1"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-templating" version="4.6.4"/>
         <requires url="calendar" version="2.0.1"/>
@@ -25,8 +25,8 @@
         <requires url="organizations" version="0.3d"/>
 
         <callbacks>
-            <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
             <callback type="after-instantiate"  proc="pm::install::package_instantiate"/>
+            <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LoggerPrimaryURL"  description="This is the primary logger instance that is linked in to this project-manager instance. Links to this instance are added to 
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-table-create.sql,v
diff -u -r1.19.2.4 -r1.19.2.5
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql	15 Sep 2004 23:05:51 -0000	1.19.2.4
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql	8 Oct 2004 21:25:00 -0000	1.19.2.5
@@ -96,7 +96,10 @@
         sort_order              integer,
         is_observer_p           char(1) default 'f'
                                 constraint pm_role_is_observer_ck
-                                check (is_observer_p in ('t','f'))
+                                check (is_observer_p in ('t','f')),
+        is_lead_p               char(1) default 'f'
+                                constraint pm_role_is_lead_ck
+                                check (is_lead_p in ('t','f'))
 );
 
 
@@ -108,7 +111,7 @@
   responsible for the task, or are just observers on it. 
 ';
 
-insert into pm_roles (role_id, one_line, description, sort_order) values ('1','Lead','Team members who are responsible for the completion of the project','10');
+insert into pm_roles (role_id, one_line, description, sort_order, is_lead_p) values ('1','Lead','Team members who are responsible for the completion of the project','10','t');
 insert into pm_roles (role_id, one_line, description, sort_order) values ('2','Player','A person on the team responsible for completion of the project','20');
 insert into pm_roles (role_id, one_line, description, sort_order, is_observer_p) values ('3','Watcher','A person interested in developments, possibly helping out on it.','30','t');
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/sql/postgresql/upgrade/upgrade-2.20b3-2.21b1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v
diff -u -r1.6.2.7 -r1.6.2.8
--- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	16 Sep 2004 19:35:51 -0000	1.6.2.7
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	8 Oct 2004 21:25:04 -0000	1.6.2.8
@@ -1734,16 +1734,15 @@
 
         set subject "Assigned to project: $project_name"
         
-        set content "You have been assigned to a project: $project_name (as $role)
+        set content "<table bgcolor=\"\#ddffdd\"><tr><td>You have been assigned to a project: <a href=\"$project_url\">$project_name</a> (as $role)</td></tr></table>"
 
-Link: $project_url"
 
         pm::util::email \
             -to_addr $to_addr \
             -from_addr $from_addr \
             -subject $subject \
             -body $content \
-            -mime_type "text/plain"
+            -mime_type "text/html"
     }
 
     return
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.4.2.23 -r1.4.2.24
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	27 Sep 2004 22:39:16 -0000	1.4.2.23
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	8 Oct 2004 21:25:04 -0000	1.4.2.24
@@ -960,8 +960,8 @@
         set task_description [ad_html_text_convert -from $mime_type -to "text/html" -- $task_description]
 
         append notification_text "
-<hr />
-<table border=\"0\">
+<h3>Task overview</h3>
+<table border=\"0\" bgcolor=\"#ddddff\">
   <tr>
     <td>Subject:</td>
     <td>$task_title (<a href=\"$task_url\">\#$task_item_id</a>)</td>
@@ -973,10 +973,14 @@
 </table>
 
 <h3>Description</h3>
-$task_description
+<table border=\"0\" bgcolor=\"\#ddddff\">
+  <tr>
+    <td>$task_description</td>
+  </tr>
+</table>
 
 <h3>Dates:</h3>
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
   <tr>
     <td>Latest start:</td>
     <td>$latest_start</td>
@@ -1088,7 +1092,7 @@
         set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"]
 
         set last_time_stamp ""
-        set work_log "<h3>Work done on this task</h3><table border=\"0\">"
+        set work_log "<h3>Work done on this task</h3><table border=\"0\" bgcolor=\"#ddddff\">"
 
         db_foreach get_logged_time "
         SELECT
@@ -1146,7 +1150,7 @@
 $comment
 
 <hr />
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
   <tr>
     <td>Subject:</td>
     <td><a href=\"$task_url\">$task_title</a> (\#$task_item_id)</td>
@@ -1161,10 +1165,14 @@
 
         append notification_text "
 <h3>Description</h3>
-$task_description
+<table border=\"0\" bgcolor=\"\#ddddff\">
+  <tr>
+    <td>$task_description</td>
+  </tr>
+</table>
 
 <h3>Dates:</h3>
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
   <tr>
     <td>Latest start:</td>
     <td>$latest_start</td>
@@ -1347,7 +1355,7 @@
 
 $overdue_description
 
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
 <tr>
   <th>Task \#</th>
   <th>Subject</th>
@@ -1371,7 +1379,7 @@
 
 $pressing_description
 
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
 <tr>
   <th>Task \#</th>
   <th>Subject</th>
@@ -1393,7 +1401,7 @@
 
 $longterm_description
 
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
 <tr>
   <th>Task \#</th>
   <th>Subject</th>
@@ -1625,9 +1633,9 @@
 
     set notification_text "${intro_text}${comment_text}
 <h3>Task overview</h3>
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
   <tr>
-    <td bgcolor=\"\#ffffee\">Subject:</td>
+    <td>Subject:</td>
     <td><a href=\"${task_url}\">$subject</a> (\#$task_item_id)</td>
   </tr>
   <tr>
@@ -1639,10 +1647,16 @@
     <td>$assignee_role_name</td>
   </tr>
 </table>
+
 <h3>Description</h3>
-$description_out
+<table border=\"0\" bgcolor=\"\#ddddff\">
+  <tr>
+    <td>$description_out</td>
+  </tr>
+</table>
+
 <h3>Dates:</h3>
-<table border=\"0\">
+<table border=\"0\" bgcolor=\"#ddddff\">
   <tr>
     <td>Latest start:</td>
     <td>$latest_start</td>
Index: openacs-4/contrib/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.adp,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/contrib/packages/project-manager/www/index.adp	14 Jul 2004 20:12:09 -0000	1.20.2.1
+++ openacs-4/contrib/packages/project-manager/www/index.adp	8 Oct 2004 21:25:05 -0000	1.20.2.2
@@ -9,7 +9,7 @@
     
     <tr>
       
-      <td class="list-filter-pane" valign="top">
+      <td class="project-filter-pane" valign="top">
         
         <form method=post name=search action=index>
           Search:<br />
Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v
diff -u -r1.23.2.4 -r1.23.2.5
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	16 Jul 2004 20:59:41 -0000	1.23.2.4
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	8 Oct 2004 21:25:05 -0000	1.23.2.5
@@ -58,15 +58,19 @@
         t.estimated_hours_work_max,
         t.actual_hours_worked,
         s.status_type,
-        s.description as status_description
+        s.description as status_description,
+        r.is_lead_p
 	FROM
 	(select * from pm_tasks_revisionsx 
          LEFT JOIN
          pm_task_assignment ON item_id = task_id) t 
            LEFT JOIN 
            persons u 
            ON 
-           t.party_id = u.person_id, 
+           t.party_id = u.person_id 
+           LEFT JOIN
+           pm_roles r
+           ON t.role_id = r.role_id,  
         cr_items i 
            LEFT JOIN 
            pm_task_dependency d 
@@ -75,10 +79,10 @@
         pm_tasks_active ti,
         pm_task_status s
 	WHERE
-        t.parent_id = :project_item_id and
-        t.revision_id = i.live_revision and
-        t.item_id     = ti.task_id and
-        ti.status     = s.status_id
+        t.parent_id     = :project_item_id and
+        t.revision_id   = i.live_revision and
+        t.item_id       = ti.task_id and
+        ti.status       = s.status_id
         [template::list::orderby_clause -name tasks -orderby]
     </querytext>
   </fullquery>
Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -r1.31.2.4 -r1.31.2.5
--- openacs-4/contrib/packages/project-manager/www/one.adp	16 Sep 2004 19:35:52 -0000	1.31.2.4
+++ openacs-4/contrib/packages/project-manager/www/one.adp	8 Oct 2004 21:25:05 -0000	1.31.2.5
@@ -13,7 +13,7 @@
       
       <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
         <tr>
-          <th>
+          <th class="project">
             <a href="@edit_url@">
               <img border="0" src="/shared/images/Edit16.gif"
                 alt="Edit" />
@@ -63,7 +63,7 @@
       
       <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
         <tr>
-          <th colspan="2">Dates</th>
+          <th class="project" colspan="2">Dates</th>
         </tr>
         
         <tr>
@@ -108,7 +108,7 @@
       
       <table border="1" class="list" width="100%">
         <tr>
-          <th>Assignees</th>
+          <th class="project">Assignees</th>
         </tr>
         <tr>
           <td>
@@ -132,7 +132,7 @@
         <p />
         <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
           <tr>
-            <th colspan="2">Project information</th>
+            <th class="project" colspan="2">Project information</th>
           </tr>
           
           <tr>
@@ -152,7 +152,7 @@
       
       <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
         <tr>
-          <th colspan="2">Categories</th>
+          <th class="project" colspan="2">Categories</th>
         </tr>
         
         <tr>
@@ -200,7 +200,7 @@
 
       <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
         <tr>
-          <th colspan="2">Comments</th>
+          <th class="project" colspan="2">Comments</th>
         </tr>
         
         <tr class="list-button-bar">
@@ -216,7 +216,7 @@
       <p />
       <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
         <tr>
-          <th colspan="2">Actions</th>
+          <th class="project" colspan="2">Actions</th>
         </tr>
         
         <tr>
@@ -239,7 +239,7 @@
       <table border="1" cellpadding="0" cellspacing="1" width="100%"
         id="rightcontent" class="list">
         <tr>
-          <th>@task_term@</th>
+          <th class="project">@task_term@</th>
         </tr>
         
         <tr>
@@ -274,7 +274,7 @@
       
       <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
         <tr>
-          <th>Logger</th>
+          <th class="project">Logger</th>
         </tr>
         
         <tr class="list-button-bar">
Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.30.2.8 -r1.30.2.9
--- openacs-4/contrib/packages/project-manager/www/one.tcl	7 Oct 2004 23:59:18 -0000	1.30.2.8
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	8 Oct 2004 21:25:05 -0000	1.30.2.9
@@ -200,7 +200,7 @@
         status_type {
             label "Done"
             display_template {
-                <if @tasks.status_type@ eq c><img src="/resources/checkboxchecked.gif" /></if><else><img src="/resources/checkbox.gif" /></else>
+                <a href="task-add-edit?task_id=@tasks.task_id@"><if @tasks.status_type@ eq c><img border="0" src="/resources/checkboxchecked.gif" /></if><else><img border="0" src="/resources/checkbox.gif" /></else></a>
             }
         }
         title {
@@ -241,7 +241,7 @@
         last_name {
             label "Who"
             display_template {
-                <group column="task_id">@tasks.first_names@&nbsp;@tasks.last_name@<br></group>
+                <group column="task_id"><if @tasks.is_lead_p@><i></if>@tasks.first_names@&nbsp;@tasks.last_name@<if @tasks.is_lead_p@></i></if><br></group>
             }
 
         }
Index: openacs-4/contrib/packages/project-manager/www/style.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/style.css,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/contrib/packages/project-manager/www/style.css	15 Jul 2004 22:13:10 -0000	1.9.2.1
+++ openacs-4/contrib/packages/project-manager/www/style.css	8 Oct 2004 21:25:05 -0000	1.9.2.2
@@ -1,3 +1,12 @@
-TD.highlighted {
-        background-color:ccccff;
+td.highlighted {
+        background-color:#ddddff;
 }
+
+th.project {
+        background-color:#ccffcc;
+}
+
+td.project-filter-pane {
+        background-color: #ddffdd;
+        vertical-align: top;
+}
Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	2 Jul 2004 23:13:49 -0000	1.19.2.2
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	8 Oct 2004 21:25:05 -0000	1.19.2.3
@@ -86,7 +86,9 @@
         select
         r.one_line,
         u.first_names || ' ' || u.last_name as user_info,
-        r.role_id
+        r.role_id,
+        r.is_observer_p,
+        r.is_lead_p
         from 
         pm_task_assignment a,
         persons u,
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.24.2.6 -r1.24.2.7
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	21 Sep 2004 00:29:44 -0000	1.24.2.6
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	8 Oct 2004 21:25:05 -0000	1.24.2.7
@@ -330,7 +330,7 @@
                 Who <a href="task-assign-add-edit?revisions=$task_revision_id&[export_url_vars task_id return_url]"><img border="0" src="/shared/images/Edit16.gif" align="center"></a>
             }
             display_template {
-                @people.user_info@ 
+                <if @people.is_lead_p@><i></if>@people.user_info@<if @people.is_lead_p@></i></if>
             }
         }
         role_id {