Index: openacs-4/packages/tasks/lib/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/lib/tasks.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/tasks/lib/tasks.adp	18 Oct 2005 15:32:25 -0000	1.4
+++ openacs-4/packages/tasks/lib/tasks.adp	1 Mar 2006 13:49:15 -0000	1.5
@@ -1,11 +1,40 @@
-<p>
-<if @contact_id@ ne @user_id2@>
-<a href="@add_url@" class="button">#tasks.Add_Task#</a>
-<a href="/tasks/processes?assignee_id=@contact_id@" class="button">#tasks.Assign_Process#</a>
-</p>
+<if @show_form_p@ true>
+  <if @task_action@ eq edit>
+    <include src="/packages/tasks/lib/task-form"
+             object_id=@object_id;noquote@
+             task_id=@task_action_id;noquote@
+             return_url=@return_url;noquote@ 
+             export_vars_list=@export_vars_list;noquote@ />
+  </if>
+  <else>
+    <include src="/packages/tasks/lib/task-form"
+             object_id=@object_id;noquote@
+             return_url=@return_url;noquote@ 
+             export_vars_list=@export_vars_list;noquote@ />
+  </else>
+  </div>
 </if>
-<if @show_filters_p@>
-<listfilters name="tasks" style="select-menu"></listfilters>
-</if>
-<br>
+<elseif @task_action@ eq add_process>
+
+<h3>#tasks.Assign_Process#</h3>
+<listtemplate name="processes"></listtemplate>
+<br />
+<p><a href="@return_url@" class="button">#tasks.Cancel#</a><br />
+</p>
+</elseif>
+<else>
+
+ <if @single_object_p@ not nil>
+    <p>
+     <a href="@add_url@" class="button">#tasks.Add_Task#</a>
+     <a href="@add_process_url@" class="button">#tasks.Assign_Process#</a>
+    </p>
+  </if>
+  <if @show_filters_p@>
+    <listfilters name="tasks" style="select-menu"></listfilters>
+    <br />
+  </if>
+
+</else>
 <listtemplate name="tasks"></listtemplate>
+