Index: openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-roles.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl	10 Dec 2003 16:06:46 -0000	1.10
+++ openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl	9 Jan 2004 10:28:00 -0000	1.11
@@ -48,10 +48,10 @@
         }
         delete {
             sub_class narrow
+            link_url_col delete_url
+            link_html { onclick "return confirm('Are you sure you want to delete role @roles.pretty_name@?');" }
             display_template {
-                <a href="@roles.delete_url@" onclick="return confirm('Are you sure you want to delete role @roles.pretty_name@?');">
-                  <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0" alt="Edit">
-                </a>
+                <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0" alt="Edit">
             }
         }
     }
Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl	8 Jan 2004 16:02:01 -0000	1.24
+++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl	9 Jan 2004 10:28:00 -0000	1.25
@@ -68,9 +68,17 @@
     link_url_col recipient_role_edit_url
 }
 
-lappend elements child_workflow_pretty { 
-    label "<br />Child"
-    link_url_col child_workflow_url
+lappend elements task_type { 
+    label "<br />Type"
+    display_template {
+        <if @tasks.child_workflow_pretty@ not nil>
+          <a href="@tasks.child_workflow_url@">@tasks.child_workflow_pretty@</a>
+        </if>
+        <else>
+          <if @tasks.recipient_name@ not nil>Message</if>
+          <else>Document</else>
+        </else>
+    }
 }
 
 lappend elements delete {
@@ -123,7 +131,7 @@
 }
 
 lappend elements new_state_pretty { 
-    label "<br />New state"
+    label "<br />Next state"
     html { style "border-left: 2px dotted #A0BDEB;" }
 }
 
Index: openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-edit.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 09:37:50 -0000	1.21
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 10:28:00 -0000	1.22
@@ -119,7 +119,8 @@
         }
     }
 
-if { [string equal [element get_value task task_type] "workflow"] || [exists_and_equal task_type "workflow"] } {
+if { [string equal [element get_value task task_type] "workflow"] || \
+         ([empty_string_p [element get_value task task_type]] && [exists_and_equal task_type "workflow"]) } {
     set child_workflow_id [element get_value task child_workflow_id]
     if { [empty_string_p $child_workflow_id] } {
         if { [exists_and_not_null task_array(child_workflow_id)] } {
Index: openacs-4/packages/simulation/lib/sim-template-roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-roles.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/lib/sim-template-roles.tcl	10 Dec 2003 16:06:46 -0000	1.10
+++ openacs-4/packages/simulation/lib/sim-template-roles.tcl	9 Jan 2004 10:28:00 -0000	1.11
@@ -48,10 +48,10 @@
         }
         delete {
             sub_class narrow
+            link_url_col delete_url
+            link_html { onclick "return confirm('Are you sure you want to delete role @roles.pretty_name@?');" }
             display_template {
-                <a href="@roles.delete_url@" onclick="return confirm('Are you sure you want to delete role @roles.pretty_name@?');">
-                  <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0" alt="Edit">
-                </a>
+                <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0" alt="Edit">
             }
         }
     }
Index: openacs-4/packages/simulation/lib/sim-template-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/simulation/lib/sim-template-tasks.tcl	8 Jan 2004 16:02:01 -0000	1.24
+++ openacs-4/packages/simulation/lib/sim-template-tasks.tcl	9 Jan 2004 10:28:00 -0000	1.25
@@ -68,9 +68,17 @@
     link_url_col recipient_role_edit_url
 }
 
-lappend elements child_workflow_pretty { 
-    label "<br />Child"
-    link_url_col child_workflow_url
+lappend elements task_type { 
+    label "<br />Type"
+    display_template {
+        <if @tasks.child_workflow_pretty@ not nil>
+          <a href="@tasks.child_workflow_url@">@tasks.child_workflow_pretty@</a>
+        </if>
+        <else>
+          <if @tasks.recipient_name@ not nil>Message</if>
+          <else>Document</else>
+        </else>
+    }
 }
 
 lappend elements delete {
@@ -123,7 +131,7 @@
 }
 
 lappend elements new_state_pretty { 
-    label "<br />New state"
+    label "<br />Next state"
     html { style "border-left: 2px dotted #A0BDEB;" }
 }
 
Index: openacs-4/packages/simulation/www/simbuild/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 09:37:50 -0000	1.21
+++ openacs-4/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 10:28:00 -0000	1.22
@@ -119,7 +119,8 @@
         }
     }
 
-if { [string equal [element get_value task task_type] "workflow"] || [exists_and_equal task_type "workflow"] } {
+if { [string equal [element get_value task task_type] "workflow"] || \
+         ([empty_string_p [element get_value task task_type]] && [exists_and_equal task_type "workflow"]) } {
     set child_workflow_id [element get_value task child_workflow_id]
     if { [empty_string_p $child_workflow_id] } {
         if { [exists_and_not_null task_array(child_workflow_id)] } {