Index: openacs-4/contrib/packages/simulation/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/messages.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/lib/messages.tcl	5 Jan 2004 10:58:30 -0000	1.4
+++ openacs-4/contrib/packages/simulation/lib/messages.tcl	5 Jan 2004 11:44:33 -0000	1.5
@@ -16,10 +16,6 @@
 set package_id [ad_conn package_id]
 
 set elements {
-    case_label {
-        label "Case"
-        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
-    }
     from {
         label "From"
     }
@@ -35,6 +31,14 @@
         label "Attachments"
         html { align center }
     }
+    sim_name {
+        label "Simulation"
+        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
+    }
+    case_label {
+        label "Case"
+        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
+    }
 }
 
 template::list::create \
@@ -48,6 +52,7 @@
     select distinct sm.message_id,
            sm.title as subject,
            sc.label as case_label,
+           w.pretty_name as sim_name,
            to_char(creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi,
            (select p.first_names || ' ' || p.last_name
               from persons p
@@ -59,13 +64,15 @@
       from sim_messagesx sm,
            workflow_case_role_party_map wcrmp,
            party_approved_member_map pamm,
+           workflows w,
            workflow_cases wc,
            sim_cases sc
      where pamm.member_id = :user_id
        and wcrmp.party_id = pamm.party_id
        and wcrmp.case_id = sm.case_id
        and wc.case_id = sm.case_id
        and sc.sim_case_id = wc.object_id
+       and w.workflow_id = wc.workflow_id
      [ad_decode [exists_and_not_null case_id] 1 "and sm.case_id = :case_id" ""]
 " {
     set message_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/message" { message_id case_id }]
Index: openacs-4/contrib/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/tasks.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/simulation/lib/tasks.tcl	5 Jan 2004 10:58:30 -0000	1.5
+++ openacs-4/contrib/packages/simulation/lib/tasks.tcl	5 Jan 2004 11:44:33 -0000	1.6
@@ -26,6 +26,7 @@
     }
     sim_name {
         label "Simulation"
+        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
     }
     case_label {
         label "Case"
Index: openacs-4/contrib/packages/simulation/www/simplay/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/simplay/case.adp	5 Jan 2004 10:58:30 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/simplay/case.adp	5 Jan 2004 11:44:33 -0000	1.7
@@ -2,16 +2,16 @@
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<h3>Tasks</h3>
+<h3>Available Tasks</h3>
 
 <include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@"></include>
 <p></p>
 
-<h3>Messages</h3>
+<h3>Incoming Messages</h3>
 
 <include src="/packages/simulation/lib/messages"  user_id="@user_id@" case_id="@case_id@"></include>
 <p></p>
 
-<h3>Portfolio</h3>
+<h3>Document Portfolio</h3>
 
 <include src="/packages/simulation/lib/portfolio" case_id="@case_id@"></include>
Index: openacs-4/packages/simulation/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/messages.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/lib/messages.tcl	5 Jan 2004 10:58:30 -0000	1.4
+++ openacs-4/packages/simulation/lib/messages.tcl	5 Jan 2004 11:44:33 -0000	1.5
@@ -16,10 +16,6 @@
 set package_id [ad_conn package_id]
 
 set elements {
-    case_label {
-        label "Case"
-        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
-    }
     from {
         label "From"
     }
@@ -35,6 +31,14 @@
         label "Attachments"
         html { align center }
     }
+    sim_name {
+        label "Simulation"
+        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
+    }
+    case_label {
+        label "Case"
+        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
+    }
 }
 
 template::list::create \
@@ -48,6 +52,7 @@
     select distinct sm.message_id,
            sm.title as subject,
            sc.label as case_label,
+           w.pretty_name as sim_name,
            to_char(creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi,
            (select p.first_names || ' ' || p.last_name
               from persons p
@@ -59,13 +64,15 @@
       from sim_messagesx sm,
            workflow_case_role_party_map wcrmp,
            party_approved_member_map pamm,
+           workflows w,
            workflow_cases wc,
            sim_cases sc
      where pamm.member_id = :user_id
        and wcrmp.party_id = pamm.party_id
        and wcrmp.case_id = sm.case_id
        and wc.case_id = sm.case_id
        and sc.sim_case_id = wc.object_id
+       and w.workflow_id = wc.workflow_id
      [ad_decode [exists_and_not_null case_id] 1 "and sm.case_id = :case_id" ""]
 " {
     set message_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/message" { message_id case_id }]
Index: openacs-4/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/tasks.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/simulation/lib/tasks.tcl	5 Jan 2004 10:58:30 -0000	1.5
+++ openacs-4/packages/simulation/lib/tasks.tcl	5 Jan 2004 11:44:33 -0000	1.6
@@ -26,6 +26,7 @@
     }
     sim_name {
         label "Simulation"
+        hide_p {[ad_decode [exists_and_not_null case_id] 1 1 0]}
     }
     case_label {
         label "Case"
Index: openacs-4/packages/simulation/www/simplay/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simplay/case.adp	5 Jan 2004 10:58:30 -0000	1.6
+++ openacs-4/packages/simulation/www/simplay/case.adp	5 Jan 2004 11:44:33 -0000	1.7
@@ -2,16 +2,16 @@
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<h3>Tasks</h3>
+<h3>Available Tasks</h3>
 
 <include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@"></include>
 <p></p>
 
-<h3>Messages</h3>
+<h3>Incoming Messages</h3>
 
 <include src="/packages/simulation/lib/messages"  user_id="@user_id@" case_id="@case_id@"></include>
 <p></p>
 
-<h3>Portfolio</h3>
+<h3>Document Portfolio</h3>
 
 <include src="/packages/simulation/lib/portfolio" case_id="@case_id@"></include>