Index: openacs-4/packages/tasks/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/tasks/www/delete.tcl	1 Mar 2006 13:49:15 -0000	1.4
+++ openacs-4/packages/tasks/www/delete.tcl	4 Mar 2006 23:56:09 -0000	1.5
@@ -21,7 +21,7 @@
     set task_list ""
     set num 1
     foreach task_title $task_titles {
-	if { $num == $num_entries } {
+	if { $num == [llength $task_titles] } {
 	    append task_list " and "
 	} elseif { $num != 1 } {
 	    append task_list ", "
Index: openacs-4/packages/tasks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/index.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/tasks/www/index.adp	4 Mar 2006 22:57:25 -0000	1.12
+++ openacs-4/packages/tasks/www/index.adp	4 Mar 2006 23:56:09 -0000	1.13
@@ -1,6 +1,7 @@
 <master src="/packages/contacts/lib/contacts-master" />
-<p><formtemplate id="search" style="proper-inline"></formtemplate></p>
 
+<p><formtemplate id="search" style="../../../contacts/resources/forms/inline"></formtemplate></p>
+
 <br />
 <table width="100%">
 <tr>
Index: openacs-4/packages/tasks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/index.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/tasks/www/index.tcl	4 Mar 2006 22:57:25 -0000	1.10
+++ openacs-4/packages/tasks/www/index.tcl	4 Mar 2006 23:56:09 -0000	1.11
@@ -6,6 +6,10 @@
     @cvs-id $Id$
 } {
     {search_id:integer ""}
+    {status_id ""}
+    {format ""}
+    {tasks_orderby ""}
+    {page ""}
     {query ""}
     {tasks_future:integer "7"}
     {tasks_previous:integer ""}
@@ -50,7 +54,7 @@
     }
 }
 
-ad_form -name "search" -method "GET" -export {orderby page_size format} -form $form_elements \
+ad_form -name "search" -method "GET" -export {status_id tasks_orderby page format} -form $form_elements \
     -on_request {
     } -edit_request {
     } -on_refresh {
Index: openacs-4/packages/tasks/www/process-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/process-add-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/tasks/www/process-add-edit.adp	27 Jul 2005 13:44:59 -0000	1.1
+++ openacs-4/packages/tasks/www/process-add-edit.adp	4 Mar 2006 23:56:09 -0000	1.2
@@ -1,8 +1,6 @@
-<master>
+<master src="/packages/contacts/lib/contacts-master" />
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 <property name="focus">add_edit.one_line</property>
 
-<center>
-<formtemplate id="add_edit" style="standard-lars"></formtemplate>
-</center>
+<formtemplate id="add_edit"></formtemplate>
Index: openacs-4/packages/tasks/www/process-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/process-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/tasks/www/process-delete.adp	27 Jul 2005 13:45:00 -0000	1.1
+++ openacs-4/packages/tasks/www/process-delete.adp	4 Mar 2006 23:56:09 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/contacts/lib/contacts-master" />
   <property name="title">@title@</property>
   <property name="context">@context@</property>
   
Index: openacs-4/packages/tasks/www/process-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/process-delete.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/tasks/www/process-delete.tcl	1 Mar 2006 13:49:15 -0000	1.3
+++ openacs-4/packages/tasks/www/process-delete.tcl	4 Mar 2006 23:56:09 -0000	1.4
@@ -35,6 +35,7 @@
     set title "Delete process: $title"
     set context [list "Delete: $title"]
     set process $title
+    set one_line $title
 
     set yes_url [export_vars -base process-delete {process_id assignee_id {confirm_p 1} return_url}]
     set no_url $return_url
@@ -49,4 +50,4 @@
     where process_id = :process_id
 }
 
-ad_returnredirect -message "Process deleted" $return_url
+ad_returnredirect -message [_ tasks.Process_deleted] $return_url
Index: openacs-4/packages/tasks/www/process-task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/process-task.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/tasks/www/process-task.adp	27 Jul 2005 13:44:59 -0000	1.1
+++ openacs-4/packages/tasks/www/process-task.adp	4 Mar 2006 23:56:09 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/contacts/lib/contacts-master" />
 
 <property name="context">@context@</property>
 <property name="title">@title@</property>
Index: openacs-4/packages/tasks/www/process.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/process.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/tasks/www/process.adp	26 Oct 2005 18:54:29 -0000	1.3
+++ openacs-4/packages/tasks/www/process.adp	4 Mar 2006 23:56:09 -0000	1.4
@@ -1,6 +1,4 @@
-<!-- master src="/packages/contacts/custom/mbbs-contact-master" -->
-<master>
-<property name="party_id">@assignee_id@</property>
+<master src="/packages/contacts/lib/contacts-master" />
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/tasks/www/processes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/processes.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/tasks/www/processes.adp	26 Oct 2005 18:54:29 -0000	1.3
+++ openacs-4/packages/tasks/www/processes.adp	4 Mar 2006 23:56:09 -0000	1.4
@@ -1,12 +1,4 @@
-<if @assignee_id@ not nil>
-<!-- master src="/packages/contacts/custom/mbbs-contact-master" -->
-<master>
-<property name="party_id">@assignee_id@</property>
-</if>
-<else>
-<!-- master src="/packages/contacts/custom/mbbs-contact-master" -->
-<master>
-</else>
+<master src="/packages/contacts/lib/contacts-master" />
 
 <listtemplate name="processes"></listtemplate>
 
Index: openacs-4/packages/tasks/www/processes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/processes.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/tasks/www/processes.tcl	25 Sep 2005 23:49:23 -0000	1.2
+++ openacs-4/packages/tasks/www/processes.tcl	4 Mar 2006 23:56:09 -0000	1.3
@@ -63,12 +63,6 @@
     -pass_properties { admin_p } \
     -selected_format $mode \
     -elements {
-	assign {
-	    label ""
-	    display_template {
-                <a href="@processes.assign_url@" class="button">Assign</a>
-	    }
-	}
 	title {
 	    label "Title"
 	    display_template {
@@ -116,7 +110,6 @@
 	    label "Assign Layout"
 	    layout table 
 	    row {
-                assign {}
 		title {}
 		description {}
 		creator_name {}
@@ -126,7 +119,6 @@
 	    label "Admin Layout"
 	    layout table 
 	    row {
-		assign {}
 		title {}
 		description {}
 		creator_name {}