Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	6 Jan 2004 14:56:42 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	7 Jan 2004 16:27:35 -0000	1.7
@@ -1,5 +1,6 @@
 <formtemplate id="characters"></formtemplate>
+<p>Select from existing characters or <a
+href="../citybuild/object-edit">add a new character</a> and refresh
+this page.  (TODO: make the link pre-set the form to character)
+<p><b>Template Description</b>: @description@
 
-<p>TODO: "perhaps it would help if there was a description describing
-the roles of giver and receiver ... either better rolenames ... or what the roles do in the simulation template"</p>
-
Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	6 Jan 2004 14:56:42 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	7 Jan 2004 16:27:35 -0000	1.9
@@ -8,11 +8,16 @@
     workflow_id:integer
 }
 
-# TODO: Permission check?
-# TODO: add new character
-set page_title "Assign Roles to Characters"
+# TODO: Permission check
+# TODO: ability to add new character inline while mapping
+
+set page_title "Assign Characters to Roles"
 set context [list [list "." "SimInst"] $page_title]
 
+
+simulation::template::get -workflow_id $workflow_id -array sim_array
+set description $sim_array(description)
+
 ad_form \
     -name characters \
     -edit_buttons { { Map ok } } \
@@ -32,7 +37,8 @@
         [list [list role_${role_id}:text(select) \
                    [list label \$role_pretty_name_$role_id] \
                    [list options $character_options]
-              ]]
+
+         ]]
 }
 
 
Index: openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-tasks.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	7 Jan 2004 13:12:17 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	7 Jan 2004 16:27:35 -0000	1.10
@@ -1,11 +1 @@
 <formtemplate id="tasks"></formtemplate>
-
-<p>TODO: an "attach new prop" button next to each attachment dropdown
-that lets the user create a new prop and then return to this page,
-where the new prop is already set as the attachment.</p>
-
-<p>
-  TODO: C: allow props to be embedded within description
-  body so that they will be displayed as links in simplay when user
-  looks at task description
-</p>
Index: openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-tasks.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl	6 Jan 2004 15:58:32 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl	7 Jan 2004 16:27:35 -0000	1.8
@@ -62,7 +62,9 @@
             ad_form -extend -name tasks -form \
                 [list [list attachment_$row(action_id)_$i:integer(select),optional \
                            {label "Attachment $i"} \
-                           {options $prop_options}]]
+                           {options $prop_options} \
+                           {help_text "Select from existing attachments or <a
+href=\"../citybuild/object-edit\">add a new prop</a> and refresh this page.  TODO: make this tidier - instead of this text, should be a single button which saves this form, goes to object page, and returns here."}]]
         }    
 
         lappend actions $row(action_id)
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-casting-3.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.adp	7 Jan 2004 15:54:55 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.adp	7 Jan 2004 16:27:35 -0000	1.9
@@ -1,18 +1,56 @@
 <if @num_groups@ eq 0>
+
   <div class="general-message">Please pick participants first.</div>
+
 </if>
+
 <else>
-  <p>
-    Pick which groups can be cast in which roles below.
-  </p>
-  <formtemplate id="actors"></formtemplate>
-</else>
 
+<p
 
-<p>
-TODO: Display the actor list and group size in parallel columns
-instead of in pairs of rows
+    Each role may be played by one or b
+
+    many users.  Each role can only be played by users in the group
+
+    specified below.  If a group is not selected for any role, user
+
+    in that group will not be cast in the simulation
+
 </p>
 
-<p>TODO: at the bottom, show a list of all groups that are
-auto-enrolled but are not assigned anywhere (and hence won't be in any cases)
+
+
+
+<formtemplate id="actors"></formtemplate
+
+    <p>In <b>Automatic</b> casting, onl
+
+    users from these groups will be assigned to the roles.  All user
+
+    from all selected groups will be cast.  If all users for one rol
+
+    are cast before all users for another role are cast, you will b
+
+    cast as many times as needed to fill out the cases.  (You ca
+
+    change casting assignments <a href="">here</a>.
+
+    <p>In <b>Group</b> casting, users can choose which case to join
+
+    Users are still restricted by group/role limits set below (e.g.
+
+    if each case requires three users from group X and two from grou
+
+    Y, the fourth user from group X to try to join will b
+
+    rejected.). 
+
+    <p>In <b>Open</b> casting, users can choose which case and role t
+
+    join, subject to the restrictions below
+
+</else>
+
+
+<P>TODO: Finish button should say "Done (Begin Casting)"
+
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-casting-3.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.tcl	7 Jan 2004 15:54:55 -0000	1.14
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.tcl	7 Jan 2004 16:27:35 -0000	1.15
@@ -27,23 +27,23 @@
     set role_${role_id}_pretty_name [workflow::role::get_element -role_id $role_id -element pretty_name]
 
     if { $num_groups > 0 } {
-        lappend form [list parties_${role_id}:text(checkbox),multiple,optional \
-                          [list label \$role_${role_id}_pretty_name] \
-                          {options $eligible_groups} \
-                          {section "Roles"} \
-                         ]
+        lappend form [list \
+                          users_per_case_${role_id}:integer \
+                          [list label "Number of users for <b>\$role_${role_id}_pretty_name</b>"] \
+                          {value 1} \
+                          {html {size 2}} \
+                          [list section "\$role_${role_id}_pretty_name"]
+                     ]
     }
 
-    lappend form [list \
-                      users_per_case_${role_id}:integer \
-                      {label "Number of users per role"} \
-                      {value 1} \
-                      {html {size 2}} \
-                      {section "Roles"}
-                      ]
-
+    lappend form [list parties_${role_id}:text(checkbox),multiple,optional \
+                      [list label "Cast <b>\$role_${role_id}_pretty_name</b> from these groups"] \
+                      {options $eligible_groups} \
+                      [list section "\$role_${role_id}_pretty_name"]
+                     ]
 }
 
+
 ad_form \
     -name actors \
     -export { workflow_id } \
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-enrollment.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl	7 Jan 2004 15:54:55 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl	7 Jan 2004 16:27:35 -0000	1.3
@@ -17,6 +17,7 @@
         {label "Enrollment type"}
         {options {{"By invitation only" closed} {Open open}}}
             {html {onChange "javascript:acs_FormRefresh('simulation');"}}
+        {help_text "With <b>Open</b> enrollment, any user can join during the enrollment period.  You can still directly enroll users and send invitations.  <br><b>By Invitation Only</b> prevents users from joining unless invited; you can still directly enroll users. "}
     }
     {enroll_start:date,to_sql(ansi),from_sql(ansi),optional
         {label "Enrollment start date"}
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-participants.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp	6 Jan 2004 18:36:28 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp	7 Jan 2004 16:27:35 -0000	1.2
@@ -4,7 +4,9 @@
 
   <listtemplate name="participants"></listtemplate>
 
-  <p></p>
+  <p class="form-help-text"><b>Auto-Enroll</b> takes effect, and
+  <b>invitations</b> are sent, when this wizard is completed and
+  casting begins.</p>
 
   <formwidget id="wizard_submit_back"> <formwidget id="wizard_submit_next">
 
Index: openacs-4/contrib/packages/simulation/www/siminst/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/wizard.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/siminst/wizard.adp	7 Jan 2004 15:54:55 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/siminst/wizard.adp	7 Jan 2004 16:27:35 -0000	1.4
@@ -42,3 +42,11 @@
 
   <div style="clear: both;"></div>
 </div>
+<p>TODO: put a warning next to the finish button for any incomplete
+requirements, using the same tests we use to determine if tabs are
+complete.  Should include:
+<ul>
+<li>missing attachments (link to tab 2)
+<li>missing dates (link to tab 3)
+<li>groups that aren't cast to any roles (link to tab 6)
+</ul>
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/siminst/wizard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/wizard.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/siminst/wizard.tcl	7 Jan 2004 15:54:55 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/siminst/wizard.tcl	7 Jan 2004 16:27:35 -0000	1.7
@@ -21,8 +21,10 @@
 
 wizard set_finish_url [export_vars -base "simulation-casting" { workflow_id }]
 
+# TODO: B: Refactor wizard so that it uses titles from child pages if this next section are blank
+
 array set title {
-    1 "Assign Roles to Characters"
+    1 "Assign Characters to Roles"
     2 "Populate Tasks"
     3 "Simulation Settings"
     4 "Define Enrollment"
Index: openacs-4/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/siminst/map-characters.adp	6 Jan 2004 14:56:42 -0000	1.6
+++ openacs-4/packages/simulation/www/siminst/map-characters.adp	7 Jan 2004 16:27:35 -0000	1.7
@@ -1,5 +1,6 @@
 <formtemplate id="characters"></formtemplate>
+<p>Select from existing characters or <a
+href="../citybuild/object-edit">add a new character</a> and refresh
+this page.  (TODO: make the link pre-set the form to character)
+<p><b>Template Description</b>: @description@
 
-<p>TODO: "perhaps it would help if there was a description describing
-the roles of giver and receiver ... either better rolenames ... or what the roles do in the simulation template"</p>
-
Index: openacs-4/packages/simulation/www/siminst/map-characters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/www/siminst/map-characters.tcl	6 Jan 2004 14:56:42 -0000	1.8
+++ openacs-4/packages/simulation/www/siminst/map-characters.tcl	7 Jan 2004 16:27:35 -0000	1.9
@@ -8,11 +8,16 @@
     workflow_id:integer
 }
 
-# TODO: Permission check?
-# TODO: add new character
-set page_title "Assign Roles to Characters"
+# TODO: Permission check
+# TODO: ability to add new character inline while mapping
+
+set page_title "Assign Characters to Roles"
 set context [list [list "." "SimInst"] $page_title]
 
+
+simulation::template::get -workflow_id $workflow_id -array sim_array
+set description $sim_array(description)
+
 ad_form \
     -name characters \
     -edit_buttons { { Map ok } } \
@@ -32,7 +37,8 @@
         [list [list role_${role_id}:text(select) \
                    [list label \$role_pretty_name_$role_id] \
                    [list options $character_options]
-              ]]
+
+         ]]
 }
 
 
Index: openacs-4/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-tasks.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/simulation/www/siminst/map-tasks.adp	7 Jan 2004 13:12:17 -0000	1.9
+++ openacs-4/packages/simulation/www/siminst/map-tasks.adp	7 Jan 2004 16:27:35 -0000	1.10
@@ -1,11 +1 @@
 <formtemplate id="tasks"></formtemplate>
-
-<p>TODO: an "attach new prop" button next to each attachment dropdown
-that lets the user create a new prop and then return to this page,
-where the new prop is already set as the attachment.</p>
-
-<p>
-  TODO: C: allow props to be embedded within description
-  body so that they will be displayed as links in simplay when user
-  looks at task description
-</p>
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.7 -r1.8
--- openacs-4/packages/simulation/www/siminst/map-tasks.tcl	6 Jan 2004 15:58:32 -0000	1.7
+++ openacs-4/packages/simulation/www/siminst/map-tasks.tcl	7 Jan 2004 16:27:35 -0000	1.8
@@ -62,7 +62,9 @@
             ad_form -extend -name tasks -form \
                 [list [list attachment_$row(action_id)_$i:integer(select),optional \
                            {label "Attachment $i"} \
-                           {options $prop_options}]]
+                           {options $prop_options} \
+                           {help_text "Select from existing attachments or <a
+href=\"../citybuild/object-edit\">add a new prop</a> and refresh this page.  TODO: make this tidier - instead of this text, should be a single button which saves this form, goes to object page, and returns here."}]]
         }    
 
         lappend actions $row(action_id)
Index: openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp	7 Jan 2004 15:54:55 -0000	1.8
+++ openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp	7 Jan 2004 16:27:35 -0000	1.9
@@ -1,18 +1,56 @@
 <if @num_groups@ eq 0>
+
   <div class="general-message">Please pick participants first.</div>
+
 </if>
+
 <else>
-  <p>
-    Pick which groups can be cast in which roles below.
-  </p>
-  <formtemplate id="actors"></formtemplate>
-</else>
 
+<p
 
-<p>
-TODO: Display the actor list and group size in parallel columns
-instead of in pairs of rows
+    Each role may be played by one or b
+
+    many users.  Each role can only be played by users in the group
+
+    specified below.  If a group is not selected for any role, user
+
+    in that group will not be cast in the simulation
+
 </p>
 
-<p>TODO: at the bottom, show a list of all groups that are
-auto-enrolled but are not assigned anywhere (and hence won't be in any cases)
+
+
+
+<formtemplate id="actors"></formtemplate
+
+    <p>In <b>Automatic</b> casting, onl
+
+    users from these groups will be assigned to the roles.  All user
+
+    from all selected groups will be cast.  If all users for one rol
+
+    are cast before all users for another role are cast, you will b
+
+    cast as many times as needed to fill out the cases.  (You ca
+
+    change casting assignments <a href="">here</a>.
+
+    <p>In <b>Group</b> casting, users can choose which case to join
+
+    Users are still restricted by group/role limits set below (e.g.
+
+    if each case requires three users from group X and two from grou
+
+    Y, the fourth user from group X to try to join will b
+
+    rejected.). 
+
+    <p>In <b>Open</b> casting, users can choose which case and role t
+
+    join, subject to the restrictions below
+
+</else>
+
+
+<P>TODO: Finish button should say "Done (Begin Casting)"
+
Index: openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl	7 Jan 2004 15:54:55 -0000	1.14
+++ openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl	7 Jan 2004 16:27:35 -0000	1.15
@@ -27,23 +27,23 @@
     set role_${role_id}_pretty_name [workflow::role::get_element -role_id $role_id -element pretty_name]
 
     if { $num_groups > 0 } {
-        lappend form [list parties_${role_id}:text(checkbox),multiple,optional \
-                          [list label \$role_${role_id}_pretty_name] \
-                          {options $eligible_groups} \
-                          {section "Roles"} \
-                         ]
+        lappend form [list \
+                          users_per_case_${role_id}:integer \
+                          [list label "Number of users for <b>\$role_${role_id}_pretty_name</b>"] \
+                          {value 1} \
+                          {html {size 2}} \
+                          [list section "\$role_${role_id}_pretty_name"]
+                     ]
     }
 
-    lappend form [list \
-                      users_per_case_${role_id}:integer \
-                      {label "Number of users per role"} \
-                      {value 1} \
-                      {html {size 2}} \
-                      {section "Roles"}
-                      ]
-
+    lappend form [list parties_${role_id}:text(checkbox),multiple,optional \
+                      [list label "Cast <b>\$role_${role_id}_pretty_name</b> from these groups"] \
+                      {options $eligible_groups} \
+                      [list section "\$role_${role_id}_pretty_name"]
+                     ]
 }
 
+
 ad_form \
     -name actors \
     -export { workflow_id } \
Index: openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/simulation-enrollment.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl	7 Jan 2004 15:54:55 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl	7 Jan 2004 16:27:35 -0000	1.3
@@ -17,6 +17,7 @@
         {label "Enrollment type"}
         {options {{"By invitation only" closed} {Open open}}}
             {html {onChange "javascript:acs_FormRefresh('simulation');"}}
+        {help_text "With <b>Open</b> enrollment, any user can join during the enrollment period.  You can still directly enroll users and send invitations.  <br><b>By Invitation Only</b> prevents users from joining unless invited; you can still directly enroll users. "}
     }
     {enroll_start:date,to_sql(ansi),from_sql(ansi),optional
         {label "Enrollment start date"}
Index: openacs-4/packages/simulation/www/siminst/simulation-participants.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-participants.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/simulation-participants.adp	6 Jan 2004 18:36:28 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.adp	7 Jan 2004 16:27:35 -0000	1.2
@@ -4,7 +4,9 @@
 
   <listtemplate name="participants"></listtemplate>
 
-  <p></p>
+  <p class="form-help-text"><b>Auto-Enroll</b> takes effect, and
+  <b>invitations</b> are sent, when this wizard is completed and
+  casting begins.</p>
 
   <formwidget id="wizard_submit_back"> <formwidget id="wizard_submit_next">
 
Index: openacs-4/packages/simulation/www/siminst/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/wizard.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/wizard.adp	7 Jan 2004 15:54:55 -0000	1.3
+++ openacs-4/packages/simulation/www/siminst/wizard.adp	7 Jan 2004 16:27:35 -0000	1.4
@@ -42,3 +42,11 @@
 
   <div style="clear: both;"></div>
 </div>
+<p>TODO: put a warning next to the finish button for any incomplete
+requirements, using the same tests we use to determine if tabs are
+complete.  Should include:
+<ul>
+<li>missing attachments (link to tab 2)
+<li>missing dates (link to tab 3)
+<li>groups that aren't cast to any roles (link to tab 6)
+</ul>
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/wizard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/wizard.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/siminst/wizard.tcl	7 Jan 2004 15:54:55 -0000	1.6
+++ openacs-4/packages/simulation/www/siminst/wizard.tcl	7 Jan 2004 16:27:35 -0000	1.7
@@ -21,8 +21,10 @@
 
 wizard set_finish_url [export_vars -base "simulation-casting" { workflow_id }]
 
+# TODO: B: Refactor wizard so that it uses titles from child pages if this next section are blank
+
 array set title {
-    1 "Assign Roles to Characters"
+    1 "Assign Characters to Roles"
     2 "Populate Tasks"
     3 "Simulation Settings"
     4 "Define Enrollment"