Index: openacs-4/packages/project-manager/templates/project-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/templates/project-ae.adp	10 Aug 2005 18:32:39 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+
+<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@title@</property>
+
+<center>
+<formtemplate id="add_edit"></formtemplate>
+</center>
Index: openacs-4/packages/project-manager/templates/project-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/templates/project-one.adp	8 Aug 2005 08:21:17 -0000	1.1
+++ openacs-4/packages/project-manager/templates/project-one.adp	10 Aug 2005 18:32:16 -0000	1.2
@@ -1,4 +1,5 @@
 <master src="../www/lib/master" />
+TEMPLATE
 <if @project.status_type@ eq c>
   <property name="title">@my_title;noquote@ -- #project-manager.Closed#</property>
 </if>
Index: openacs-4/packages/project-manager/templates/project-taeo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/Attic/project-taeo.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/templates/project-taeo.adp	10 Aug 2005 18:32:39 -0000	1.1
@@ -0,0 +1,7 @@
+<master src="../www/lib/master">
+  <property name="title">@title;noquote@</property>
+  <property name="context">@context@</property>
+
+<center>
+  <formtemplate id="task_add_edit"></formtemplate>
+</center>
Index: openacs-4/packages/project-manager/templates/project-to.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/Attic/project-to.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/templates/project-to.adp	10 Aug 2005 18:32:39 -0000	1.1
@@ -0,0 +1,98 @@
+<master src="../www/lib/master">
+  
+  <property name="title">@task_term@ #@task_id@:
+    @task_info.task_title;noquote@ @closed_message@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="project_item_id">@project_item_id@</property>
+  
+  <if @task_info.live_revision@ ne @task_info.revision_id@>
+    <h4>#project-manager.lt_not_current_select_live#</h4>
+  </if>
+
+  <table border="0" cellpadding="3" cellspacing="0" width="100%">
+    
+    <tr>
+      <td valign="top">
+      
+      <if @process_html@ not nil>
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" class="list">
+          <tr>
+            <th align="left" valign="top" width="10">
+              <img src="resources/tl-e6e6fa" align="top" />
+            </th>
+            <th>#project-manager.Process_status#</th>
+            <th align="right" valign="top" width="10">
+              <img src="resources/tr-e6e6fa" align="top" />
+            </th>
+          </tr>
+
+          <tr>
+            <td class="list-bottom-bg" colspan="3">@process_html;noquote@</td>
+          </tr>
+        </table>
+        <p />
+      </if>
+
+  <include
+    src="/packages/project-manager/lib/task-info-portlet"
+	  &task_info=task_info
+	  task_edit_url=@task_edit_url@
+	  task_revision_id=@task_revision_id@/>
+        
+        <P />
+        
+  <include
+    src="/packages/project-manager/lib/categories-portlet"
+    item_id="@task_revision_id@" />
+
+        <if 0 eq 1>
+          <if @notification_chunk@ not nil>
+            @notification_chunk;noquote@
+          </if>
+        </if>
+        
+      </td>
+      <td>
+        &nbsp;
+      </td>
+      <td valign="top">
+
+      <include src="/packages/project-manager/lib/task-date-portlet"
+	  &task_info=task_info
+	  />
+
+        <p />
+
+	<include
+	  src="/packages/project-manager/lib/task-assignee-portlet"
+	  task_id="@task_id@"
+	  return_url="@return_url@" />
+
+        <p />
+
+        <include src="/packages/project-manager/lib/task-logger-portlet"
+	  project_item_id="@project_item_id@"
+	  master="@portlet_master@"
+	  logger_project="@logger_project@"
+	  logger_days="@logger_days@"
+	  return_url="@return_url;noquote@"
+	  pm_url="@package_url;noquote@"
+	  &task_info=task_info
+	  use_days_p="@use_days_p@"
+	  pm_task_id="@task_id@" />
+
+        <P />
+	    <include src="/packages/project-manager/lib/task-dependency-portlet"
+
+	         task_id="@task_id@"
+		 task_term="@task_term@"
+		 return_url="@return_url@" 
+	         fmt= @fmt@ />
+        
+      </td>
+    </tr>
+  </table>
+</table>    
+  
+    
+
Index: openacs-4/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/project-manager/www/add-edit.tcl	10 Aug 2005 17:26:55 -0000	1.16
+++ openacs-4/packages/project-manager/www/add-edit.tcl	10 Aug 2005 18:33:34 -0000	1.17
@@ -347,3 +347,5 @@
 	}
 	ad_script_abort
 }
+
+ad_return_template "../templates/project-ae"
\ No newline at end of file
Index: openacs-4/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/project-manager/www/one.tcl	30 Jul 2005 00:26:33 -0000	1.8
+++ openacs-4/packages/project-manager/www/one.tcl	10 Aug 2005 18:33:34 -0000	1.9
@@ -141,5 +141,5 @@
 }
 
 
-ad_return_template
+ad_return_template "../templates/project-one"
 # ------------------------- END OF FILE ------------------------- #
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.15 -r1.16
--- openacs-4/packages/project-manager/www/task-add-edit-one.tcl	30 Jul 2005 00:26:33 -0000	1.15
+++ openacs-4/packages/project-manager/www/task-add-edit-one.tcl	10 Aug 2005 18:33:34 -0000	1.16
@@ -714,4 +714,4 @@
     ad_script_abort
 }
 
-ad_return_template
+ad_return_template "../templates/project-taeo"
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.10 -r1.11
--- openacs-4/packages/project-manager/www/task-one.tcl	30 Jul 2005 00:26:33 -0000	1.10
+++ openacs-4/packages/project-manager/www/task-one.tcl	10 Aug 2005 18:33:34 -0000	1.11
@@ -235,6 +235,6 @@
                            ]
 
 
-ad_return_template
+ad_return_template "../templates/project-to"
 
 # ------------------------- END OF FILE ------------------------- #