Index: openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	31 Oct 2006 10:13:02 -0000	1.5.2.1
+++ openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	10 Dec 2006 21:05:30 -0000	1.5.2.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="simulation" package_version="1.0.1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="simulation" package_version="1.0.4" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Abort_the_session">Abort the session</msg>
   <msg key="Add_a_template">Add a template</msg>
@@ -12,6 +12,8 @@
   <msg key="and_rest_length_more">and %rest_length% more</msg>
   <msg key="Assigned_action">Assigned action</msg>
   <msg key="Attachments">Attachments</msg>
+  <msg key="back_to_messages">Back to Messages</msg>
+  <msg key="back_to_portfolio">Back to Portfolio</msg>
   <msg key="Body">Body</msg>
   <msg key="Cancel">Cancel</msg>
   <msg key="Case">Case</msg>
@@ -36,10 +38,13 @@
   <msg key="Delete">Delete</msg>
   <msg key="Delete_this_case">Delete this case</msg>
   <msg key="Delete_this_template">Delete this template</msg>
+  <msg key="Deleted_Messages">Deleted Messages</msg>
   <msg key="Description">Description</msg>
   <msg key="Display">Display</msg>
   <msg key="Document">Document</msg>
+  <msg key="document_moved_to_trash">Document was successfully moved to recycle bin.</msg>
   <msg key="Document_Portfolio">Document Portfolio</msg>
+  <msg key="document_undeleted">Document was successfully undeleted.</msg>
   <msg key="Documents">Documents</msg>
   <msg key="Edit">Edit</msg>
   <msg key="Edit_this_template">Edit this template</msg>
@@ -64,6 +69,7 @@
   <msg key="Join_a_Simulation">Join a Simulation</msg>
   <msg key="join_case">join case</msg>
   <msg key="join_role">join role</msg>
+  <msg key="leave_blank">Leave blank to return to the original name</msg>
   <msg key="Live_Simulations">Live Simulations</msg>
   <msg key="Log_in">Log in</msg>
   <msg key="lt_a_hreflink_targetClic">&lt;a href=&quot;%link_target%&quot;&gt;Click here&lt;/a&gt; to enroll now.</msg>
@@ -233,6 +239,7 @@
   <msg key="Max__users">Max # users</msg>
   <msg key="Message">Message</msg>
   <msg key="message">message</msg>
+  <msg key="message_moved_to_trash">Message was moved to trash.</msg>
   <msg key="message_notificaiton_email_subject">[SimPlay] New message in simulation %simulation_name%: %subject%</msg>
   <msg key="message_notification_email_body">You have just received the following message in simulation %simulation_name%:
 
@@ -247,10 +254,11 @@
 Please visit %simplay_url% to continue playing the simulation.
 
 Thank you.</msg>
+  <msg key="message_undeleted">Message was undeleted</msg>
   <msg key="Messages">Messages</msg>
   <msg key="messages">messages</msg>
-  <msg key="Mime_type">Mime type
-
+  <msg key="Mime_type">Mime type
+
 </msg>
   <msg key="mime_type">mime type</msg>
   <msg key="Move_user">Move user</msg>
@@ -272,7 +280,8 @@
   <msg key="Re">Re:</msg>
   <msg key="Ready">Ready</msg>
   <msg key="Received">Received</msg>
-  <msg key="Recent_Messages">Recent Messages</msg>
+  <msg key="Recent_Messages">Recent Incoming Messages</msg>
+  <msg key="Recycle_Bin">Recycle Bin</msg>
   <msg key="Related_Tasks">Related Tasks</msg>
   <msg key="reminder_email_body">Dear %user_name%,
 this email is sent to you as a reminder that you are participating in simulation %simulation_name% that will start on %simulation_start_date%. Here is the
@@ -281,9 +290,12 @@
 %simulation_description%</msg>
   <msg key="reminder_email_subject">Simulation %simulation_name% starts on %simulation_start_date%</msg>
   <msg key="Remove_user">Remove user</msg>
+  <msg key="Rename">Rename</msg>
+  <msg key="Rename_Document">Rename Document</msg>
   <msg key="Respond">Respond</msg>
   <msg key="Return_to_SimPlay">Return to SimPlay</msg>
   <msg key="Role">Role</msg>
+  <msg key="role_updated">The role details were successfully updated</msg>
   <msg key="Roles">Roles</msg>
   <msg key="Send_a_message_to">Send a message to</msg>
   <msg key="Send_new_message">Send new message</msg>
@@ -321,6 +333,7 @@
   <msg key="tasks">tasks</msg>
   <msg key="Template">Template</msg>
   <msg key="Template_Description">Template Description</msg>
+  <msg key="template_marked_as_ready">The template was marked as ready for use.</msg>
   <msg key="Template_Name">Template Name</msg>
   <msg key="Thank_you">Thank you!</msg>
   <msg key="Time">Time</msg>
@@ -333,6 +346,7 @@
     href=&quot;%document_upload_url%&quot;&gt;upload a document&lt;/a&gt; to your
     portfolio before writing the message.</msg>
   <msg key="Type">Type</msg>
+  <msg key="Undelete">Undelete</msg>
   <msg key="Unknown_type">Unknown type</msg>
   <msg key="Unsubscribe">Unsubscribe</msg>
   <msg key="Upload_a_document">Upload a document</msg>
Index: openacs-4/packages/simulation/lib/portfolio.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/portfolio.tcl,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/simulation/lib/portfolio.tcl	2 Nov 2006 10:44:12 -0000	1.10.2.3
+++ openacs-4/packages/simulation/lib/portfolio.tcl	10 Dec 2006 21:05:31 -0000	1.10.2.4
@@ -9,7 +9,7 @@
     role_id {}
     deleted_p { default_value 0 }
     show_actions_p { default_value 1 }
-    portfolio_orderby { required_p 0 }
+    portfolio_orderby { default_value document_title }
 }
 
 
@@ -45,7 +45,7 @@
   document_title {
     label {[_ simulation.Document]}
     link_url_col document_url
-	  orderby upper(cr.title)
+	  orderby "upper(COALESCE(scrom.title, cr.title))"
   }        
 	publish_date {
 	    label {[_ simulation.Upload_date]}
@@ -102,8 +102,7 @@
 db_multirow -extend $extend documents select_documents "
     select scrom.object_id as document_id,
            ci.name  as document_name,
-           scrom.title as scrom_title,
-           cr.title as document_title,
+           COALESCE(scrom.title, cr.title) as document_title,
            wr.pretty_name as role_name,
            cr.publish_date as publish_date,
            cr.mime_type,
@@ -132,10 +131,6 @@
       set delete [_ simulation.Delete]
     }
     
-    if { ![empty_string_p $scrom_title] } {
-      set document_title $scrom_title
-    }
-    
     set undelete_p $deleted_p
     
     set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/portfolio-delete" { case_id role_id document_id undelete_p}]
Index: openacs-4/packages/simulation/tcl/sim-case-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/sim-case-procs.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/simulation/tcl/sim-case-procs.tcl	31 Oct 2006 10:13:02 -0000	1.8.2.1
+++ openacs-4/packages/simulation/tcl/sim-case-procs.tcl	10 Dec 2006 21:05:31 -0000	1.8.2.2
@@ -98,7 +98,7 @@
     @author Peter Marklund
 } {
     return [db_list_of_lists attachment_for_role {
-        select cr.title as document_title,
+        select COALESCE(scrom.title, cr.title) as document_title,
                scrom.object_id as document_id
         from sim_case_role_object_map scrom,
              cr_items ci,
Index: openacs-4/packages/simulation/www/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/control-bar.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/simulation/www/control-bar.adp	30 Nov 2004 21:09:03 -0000	1.1
+++ openacs-4/packages/simulation/www/control-bar.adp	10 Dec 2006 21:05:31 -0000	1.1.4.1
@@ -62,4 +62,8 @@
 	<else>
         <li>#simulation.Colophon#</li>
 	</else>
+	
+	<if @user@ ne 0>
+	  <li><a href="@notification_url@">#notifications.Notifications#</a></li>
+	</if>
 </ul>
\ No newline at end of file
Index: openacs-4/packages/simulation/www/control-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/control-bar.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/simulation/www/control-bar.tcl	31 Oct 2006 10:13:03 -0000	1.2.2.1
+++ openacs-4/packages/simulation/www/control-bar.tcl	10 Dec 2006 21:05:31 -0000	1.2.2.2
@@ -20,4 +20,7 @@
 set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_template_read]
 set siminst_p [permission::permission_p -object_id $package_id -privilege sim_inst]
 
+set user [ad_conn user_id]
+set notification_url "/notifications"
+
 set curr_url [ad_conn url]
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/map-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-tasks.tcl,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/simulation/www/siminst/map-tasks.tcl	30 Nov 2004 21:09:17 -0000	1.16
+++ openacs-4/packages/simulation/www/siminst/map-tasks.tcl	10 Dec 2006 21:05:32 -0000	1.16.2.1
@@ -97,7 +97,7 @@
                        {options $prop_options} \
                        {help_text "Select from existing attachments or <a
 href./citybuild/object-edit\">add a new prop</a> and refresh this page."}]]
-    }    
+    }
 
     lappend actions $row(action_id)
 }
Index: openacs-4/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.tcl,v
diff -u -r1.30 -r1.30.2.1
--- openacs-4/packages/simulation/www/simplay/message.tcl	30 Nov 2004 21:09:17 -0000	1.30
+++ openacs-4/packages/simulation/www/simplay/message.tcl	10 Dec 2006 21:05:32 -0000	1.30.2.1
@@ -31,7 +31,7 @@
 foreach one_role_id [workflow::role::get_ids -workflow_id $workflow_id] {
     set character_title [simulation::role::get_element -role_id $one_role_id -element character_title]
     set pretty_name [simulation::role::get_element -role_id $one_role_id -element pretty_name]
-        lappend to_role_options [list "$pretty_name ($character_title)" $one_role_id]
+    lappend to_role_options [list "$pretty_name ($character_title)" $one_role_id]
 }
 
 set attachment_options [simulation::case::attachment_options -case_id $case_id -role_id $role_id]
@@ -48,6 +48,8 @@
         -array content
 
     set sender_role_id $content(from_role_id)
+    set recipient_role_id $sender_role_id
+    
     set subject "[_ simulation.Re] $content(title)"
     set sender_pretty_name [simulation::role::get_element -role_id $sender_role_id -element pretty_name]
     set sender_character_title [simulation::role::get_element -role_id $sender_role_id -element character_title]