Index: openacs-4/packages/simulation/simulation.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/simulation.info,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/simulation/simulation.info	31 Oct 2006 09:00:04 -0000	1.18
+++ openacs-4/packages/simulation/simulation.info	31 Oct 2006 09:24:30 -0000	1.19
@@ -11,11 +11,11 @@
     <version name="1.0.4" url="http://openacs.org/repository/download/apm/simulation-1.0.4.apm">
         <owner url="mailto:team@collaboraid.biz">Collaboraid ApS</owner>
         <owner url="mailto:jarkko@jlaine.net">O'Design</owner>
-        <summary>Workflow-based task simulator.  Build scenario
-        templates in which various roles must complete tasks such as
-        sending messages and uploading documents.  Then enroll groups
-        of students into cases, cast the students into roles, and
-        monitor progress.  Developed as a legal education tool for
+        <summary>Workflow-based task simulator.  Build scenario
+        templates in which various roles must complete tasks such as
+        sending messages and uploading documents.  Then enroll groups
+        of students into cases, cast the students into roles, and
+        monitor progress.  Developed as a legal education tool for
         www.rechtenonline.nl.</summary>
         <release-date>2005-12-01</release-date>
 
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 -r1.6
--- openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	30 Nov 2004 21:30:38 -0000	1.5
+++ openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	31 Oct 2006 09:24:31 -0000	1.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="simulation" package_version="1.0.0b4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="simulation" package_version="1.0.1" 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>
@@ -18,6 +18,7 @@
   <msg key="case_admin_page_title">Messages for %role_array.pretty_name% in %case_array.label%</msg>
   <msg key="Case_History">Case History</msg>
   <msg key="Case_home">Case home</msg>
+  <msg key="Cases">Cases</msg>
   <msg key="CityBuild">CityBuild</msg>
   <msg key="CityBuild_Help">CityBuild Help</msg>
   <msg key="Clear_filter">Clear filter</msg>
@@ -100,6 +101,7 @@
   <msg key="lt_Cannot_enroll_in_simu">Cannot enroll in simulation</msg>
   <msg key="lt_Cannot_enroll_in_simu_1">Cannot enroll in simulation &quot;%simulation.pretty_name%&quot;</msg>
   <msg key="lt_Case_caselabel_has_be">Case &quot;%case.label%&quot; has been deleted.</msg>
+  <msg key="lt_Cases_in_which_you_ar">Cases in which you are participating</msg>
   <msg key="lt_Choose_new_roles_for">Choose new roles for user %user.name%</msg>
   <msg key="lt_Choose_new_users_for">Choose new users for role %role.pretty_name%</msg>
   <msg key="lt_Create_new_simulation">Create new simulation templates or edit existing ones.</msg>
@@ -151,6 +153,7 @@
   <msg key="lt_Return_to_SimBuild_Ho">Return to SimBuild Home</msg>
   <msg key="lt_Return_to_Simulation_">Return to Simulation root</msg>
   <msg key="lt_Return_to_Simulation__1">Return to Simulation Home</msg>
+  <msg key="lt_Return_to_Simulation__2">Return to Simulation home</msg>
   <msg key="lt_Return_to_template_li">Return to template list page</msg>
   <msg key="lt_Right-click_document_">Right-click document name and select &quot;Save as&quot; (or equiv.) to download a document to your computer.</msg>
   <msg key="lt_Roles_with_actions_on">Roles with actions only</msg>
@@ -173,6 +176,7 @@
   <msg key="lt_Simulations_in_Castin">Simulations in Casting</msg>
   <msg key="lt_Simulations_in_Develo">Simulations in Development</msg>
   <msg key="lt_Some_of_the_tasks_of">Some of the tasks of this simulation require attachments. However, there are no CityBuild props to select from.</msg>
+  <msg key="lt_Someone_was_probably_">Someone was probably faster than you and brought this session to a new state while you were reading the previous page.</msg>
   <msg key="lt_Start_a_simulation_wi">Start a simulation with this template</msg>
   <msg key="lt_Stop_notifying_me_of">Stop notifying me of changes to map XML</msg>
   <msg key="lt_Subscribe_to_pretty_n">Subscribe to %pretty_name%</msg>
@@ -183,7 +187,9 @@
 and %simulation.enroll_end% and you cannot enroll at this time.
 Contact your administrator if you believe this is an error. Thank you!</msg>
   <msg key="lt_The_following_errors">The following errors were encountered:</msg>
+  <msg key="lt_The_item_you_requeste">The item you requested could not be found.</msg>
   <msg key="lt_The_mime_type_of_your">The mime type of your file was not recognised.</msg>
+  <msg key="lt_The_task_you_were_try">The task you were trying to perform is not valid in this state.</msg>
   <msg key="lt_The_template_simulati">The template &quot;%simulation.pretty_name%&quot; is not ready for casting.</msg>
   <msg key="lt_There_are_no_cases_in">There are no cases in this simulation yet</msg>
   <msg key="lt_There_are_no_document">There are no documents.</msg>
@@ -256,6 +262,7 @@
   <msg key="No_cancel">No, cancel</msg>
   <msg key="No_documents">No documents</msg>
   <msg key="No_messages">No messages.</msg>
+  <msg key="Not_found">Not found</msg>
   <msg key="Notifications">Notifications</msg>
   <msg key="Notifications_page_notification_type_header">Notifications for</msg>
   <msg key="Number">Number</msg>
@@ -300,6 +307,7 @@
 Simulation %simulation.pretty_name% has now started. Please visit %simplay_url% to participate. Thank you!</msg>
   <msg key="simulation_started_email_subject">Simulation %simulation.pretty_name% has started</msg>
   <msg key="Simulation_Templates">Simulation Templates</msg>
+  <msg key="Sorry">Sorry!</msg>
   <msg key="States">States</msg>
   <msg key="Status">Status</msg>
   <msg key="Sub-States">Sub-States</msg>
Index: openacs-4/packages/simulation/lib/object-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/object-display.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/lib/object-display.adp	31 Oct 2006 09:00:04 -0000	1.10
+++ openacs-4/packages/simulation/lib/object-display.adp	31 Oct 2006 09:24:31 -0000	1.11
@@ -6,7 +6,7 @@
 </else>
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
-
+  
   <if @stylesheet_url@ not nil>
     <property name="extra_css">
       <link rel="stylesheet" type="text/css" href="@stylesheet_url@" media="all">
@@ -30,4 +30,5 @@
     <a href="@message_url@">#simulation.Send_a_message_to# @page_title@</a>
     </p>
   </if>
- </if>
\ No newline at end of file
+ </if>
+</if>
\ No newline at end of file
Index: openacs-4/packages/simulation/tcl/sim-action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/sim-action-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/simulation/tcl/sim-action-procs.tcl	31 Oct 2006 09:00:05 -0000	1.11
+++ openacs-4/packages/simulation/tcl/sim-action-procs.tcl	31 Oct 2006 09:24:31 -0000	1.12
@@ -293,17 +293,6 @@
     }
     array set row [workflow::action::fsm::generate_spec -action_id $action_id -handlers $handlers]
 
-    ############
-    # DEBUGGING
-    if { [exists_and_not_null row(parent_action_id)] } {
-	ns_log notice "simulation::action::generate_spec: row(parent_action_id) is $row(parent_action_id)"
-    } else {
-	ns_log notice "simulation::action::generate_spec: no paren_action_id in sight :("
-    }
-    # STOP DEBUGGING
-    ###############
-
-
     # Get local spec, remove unwanted entries
     get -action_id $action_id -array local_row -local_only
     array unset local_row recipients
Index: openacs-4/packages/simulation/tcl/ui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/ui-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/tcl/ui-procs.tcl	31 Oct 2006 09:00:05 -0000	1.8
+++ openacs-4/packages/simulation/tcl/ui-procs.tcl	31 Oct 2006 09:24:31 -0000	1.9
@@ -145,7 +145,6 @@
     }
 }
 
-
 ad_proc -public simulation::ui::forms::document_upload::check_mime {
     -document_file
 } {
@@ -193,4 +192,4 @@
     # Use empty description because otherwise cr_create_mime_type bombs
     cr_create_mime_type -extension $extension -mime_type $orig_mime_type \
 	-description ""
-}>>>>>>> 1.5.2.4
+}
\ No newline at end of file
Index: openacs-4/packages/simulation/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/simulation/www/index.tcl	31 Oct 2006 09:00:05 -0000	1.18
+++ openacs-4/packages/simulation/www/index.tcl	31 Oct 2006 09:24:31 -0000	1.19
@@ -7,4 +7,6 @@
 }
 
 set page_title "[_ simulation.Simulation_Home]"
-set context ""
\ No newline at end of file
+set context ""
+
+set package_id [ad_conn package_id]
\ No newline at end of file
Index: openacs-4/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/simulation/www/simplay/control-bar.adp	31 Oct 2006 09:04:33 -0000	1.23
+++ openacs-4/packages/simulation/www/simplay/control-bar.adp	31 Oct 2006 09:24:31 -0000	1.24
@@ -3,17 +3,14 @@
 <p>
 #simulation.You_are# <a href="@role.character_url@">@role.character_title@</a>
 (@role.role_pretty@)
-       
 </p>
 
 
-<div class="simplay_control-bar_thumbnail">
 <if @role.thumbnail_url@ not nil>
 <p>
   <img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
 </p>
 </if>
-</div>
 
 <if @show_states_p@>
 <p><strong>@curr_state@:</strong> @state_name@</p>
@@ -58,3 +55,4 @@
   </multiple>
 </ul>
 </div>
+</if>
\ No newline at end of file