Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp	8 Jan 2004 11:03:02 -0000	1.8
+++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp	9 Jan 2004 11:52:41 -0000	1.9
@@ -5,4 +5,6 @@
 </formtemplate>
 
 <p>TODO: B: Allow reordering of roles, tasks, states.</p>
-
+<p>TODO: Allow multiple recipients (replace recipient dropdown with checkbox</p>
+<p>TODO: save changes each time a checkbox is selected (and eliminate
+the save changes button)
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.26 -r1.27
--- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl	9 Jan 2004 10:53:06 -0000	1.26
+++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl	9 Jan 2004 11:52:41 -0000	1.27
@@ -91,7 +91,7 @@
 }
 
 lappend elements state_spacer { 
-    label "<br />States:"
+    label "<br />Enabled in States:"
     sub_class narrow
     display_template " "
     html { style "border-left: 2px dotted #A0BDEB;" }
@@ -107,7 +107,7 @@
     where  workflow_id = :workflow_id
     order  by s.sort_order
 } {
-    set "label_state_$state_id" $pretty_name
+    set "label_state_$state_id" "<span style=\"background-color: lightblue\">$pretty_name</span>"
     lappend elements state_$state_id \
         [list label "<a href=\"[export_vars -base state-edit { state_id }]\"><img src=\"/resources/acs-subsite/Edit16.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Edit\"></a><a href=\"[export_vars -base state-delete { state_id }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Delete\"></a><br/>\${label_state_$state_id}" \
              html { align center } \
Index: openacs-4/contrib/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-templates.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl	8 Jan 2004 09:30:51 -0000	1.13
+++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl	9 Jan 2004 11:52:41 -0000	1.14
@@ -20,7 +20,7 @@
 set create_p [permission::permission_p -object_id $package_id -privilege sim_template_create]
 
 set actions [list "Add a template" $add_url {} \
-                 "Load a template" "[apm_package_url_from_id $package_id]simbuild/template-load" {}]
+                 "Import a template" "[apm_package_url_from_id $package_id]simbuild/template-load" {}]
 
 # TODO: make this include honor the display_mode parameter
 
@@ -115,6 +115,8 @@
 # a list of templates
 #
 ######################################################################
+# TODO: limit this to see only your own templates
+# If you are the admin, show all templates in long mode
 
 db_multirow -extend { edit_url view_url delete_url clone_url edit_p } sim_templates select_sim_templates "
     select w.workflow_id,
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	7 Jan 2004 16:01:03 -0000	1.5
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	9 Jan 2004 11:52:41 -0000	1.6
@@ -7,3 +7,8 @@
 TODO: Show on map should be read-only unless user has "sim_set_map_p"
 priv on package_id
 <p>TODO: suppress HTML cut-paste text for stylesheets
+<p>TODO: default Show in Directory to No
+<p>TODO: "Associated with 1" should say "Associated With"
+<p>TODO: OK button should say "Done" or "Finished" ?
+<p>TODO: help text for any image: "To make this image appear when the
+object is viewed, put the html snippet in the Content field."
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl	7 Jan 2004 16:01:03 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl	9 Jan 2004 11:52:41 -0000	1.10
@@ -717,3 +717,5 @@
     
     element set_properties object $elm -before_html $elm_before_html -after_html $elm_after_html
 }
+
+#TODO: if a URI is submitted, filter it the same way as implicit URI from title.  ie, replace spaces with dashes.
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/simbuild/state-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/state-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/simbuild/state-edit.tcl	16 Dec 2003 18:34:00 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/simbuild/state-edit.tcl	9 Jan 2004 11:52:41 -0000	1.3
@@ -66,6 +66,7 @@
     {pretty_name:text
         {label "State Name"}
         {html {size 20}}
+        {help_text "Each simulation can be in only one state at a time.  The list of available tasks can be different in each state."}
     }
 } -edit_request {
     set workflow_id $state_array(workflow_id)
Index: openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-edit.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp	8 Jan 2004 13:03:33 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp	9 Jan 2004 11:52:41 -0000	1.10
@@ -6,3 +6,5 @@
 <formtemplate id="task"></formtemplate>
 TODO: If there are no states, show a message "This task cannot be
 fully developed because its workflow has no states" and link to add states
+<p>TODO: B: "add a state" option next to "next state" which adds a new
+state and selects it in the dropdown without losing form info
\ No newline at end of file
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.23 -r1.24
--- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 10:53:07 -0000	1.23
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 11:52:41 -0000	1.24
@@ -82,7 +82,7 @@
     -export { workflow_id } \
     -edit_buttons [list \
                        [list \
-                            [ad_decode [ad_form_new_p -key action_id] 1 [_ acs-kernel.common_add] [_ acs-kernel.common_edit]] \
+                            [ad_decode [ad_form_new_p -key action_id] 1 [_ acs-kernel.common_add] [_ acs-kernel.common_finish]] \
                             ok]] \
     -form {
         {action_id:key}
@@ -99,13 +99,13 @@
             {label "Task is complete when"}
             {options { 
                 { "Assignee sends message to recipient" message }
-                { "Assignee uploads document" normal } 
+                { "Assignee adds document to portfolio (TODO: implement portfolio tasks)" normal } 
                 { "Child workflow is complete" workflow }
             }}
             {html {onChange "javascript:acs_FormRefresh('task');"}}
         }
         {assigned_role:text(select),optional
-            {label "Assigned To"}
+            {label "Assignee"}
             {options $role_options_with_null}
         }
         {recipient_role:text(select),optional
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	9 Jan 2004 10:53:07 -0000	1.19
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	9 Jan 2004 11:52:41 -0000	1.20
@@ -16,20 +16,18 @@
           <h2>Template</h2>
           <div class="portlet-body">
             <formtemplate id="sim_template"></formtemplate>
-              <a href="@spec_url@" class="action">Download a specification for this template</a>
-
               <if @mark_ready_url@ not nil>
                 <a href="@mark_ready_url@" class="action">Mark this template ready for use</a>
               </if>
+              <else>
+                <if @inst_url@ not nil>
+                <a href="@inst_url@" class="action">Start a simulation with this template</a>   
+                </if>
+              </else>
+              <p></p><a href="@spec_url@">Export this template
+  as a text file</a>
+              <p></p><a href="@delete_url@" onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
 
-              <if @inst_url@ not nil>
-                <a href="@inst_url@" class="action">Start a simulation with this template</a>
-              </if>
-
-              <a href="@delete_url@" class="action" 
-                onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
-
-
           </div>
         </div>
 
@@ -63,3 +61,5 @@
   </table>
 
 </else>
+TODO: put state names in blue background or something else to make
+them look similar to other lists of child objects of the template
Index: openacs-4/packages/simulation/lib/sim-template-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/lib/sim-template-tasks.adp	8 Jan 2004 11:03:02 -0000	1.8
+++ openacs-4/packages/simulation/lib/sim-template-tasks.adp	9 Jan 2004 11:52:41 -0000	1.9
@@ -5,4 +5,6 @@
 </formtemplate>
 
 <p>TODO: B: Allow reordering of roles, tasks, states.</p>
-
+<p>TODO: Allow multiple recipients (replace recipient dropdown with checkbox</p>
+<p>TODO: save changes each time a checkbox is selected (and eliminate
+the save changes button)
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.26 -r1.27
--- openacs-4/packages/simulation/lib/sim-template-tasks.tcl	9 Jan 2004 10:53:06 -0000	1.26
+++ openacs-4/packages/simulation/lib/sim-template-tasks.tcl	9 Jan 2004 11:52:41 -0000	1.27
@@ -91,7 +91,7 @@
 }
 
 lappend elements state_spacer { 
-    label "<br />States:"
+    label "<br />Enabled in States:"
     sub_class narrow
     display_template " "
     html { style "border-left: 2px dotted #A0BDEB;" }
@@ -107,7 +107,7 @@
     where  workflow_id = :workflow_id
     order  by s.sort_order
 } {
-    set "label_state_$state_id" $pretty_name
+    set "label_state_$state_id" "<span style=\"background-color: lightblue\">$pretty_name</span>"
     lappend elements state_$state_id \
         [list label "<a href=\"[export_vars -base state-edit { state_id }]\"><img src=\"/resources/acs-subsite/Edit16.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Edit\"></a><a href=\"[export_vars -base state-delete { state_id }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Delete\"></a><br/>\${label_state_$state_id}" \
              html { align center } \
Index: openacs-4/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-templates.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/simulation/lib/sim-templates.tcl	8 Jan 2004 09:30:51 -0000	1.13
+++ openacs-4/packages/simulation/lib/sim-templates.tcl	9 Jan 2004 11:52:41 -0000	1.14
@@ -20,7 +20,7 @@
 set create_p [permission::permission_p -object_id $package_id -privilege sim_template_create]
 
 set actions [list "Add a template" $add_url {} \
-                 "Load a template" "[apm_package_url_from_id $package_id]simbuild/template-load" {}]
+                 "Import a template" "[apm_package_url_from_id $package_id]simbuild/template-load" {}]
 
 # TODO: make this include honor the display_mode parameter
 
@@ -115,6 +115,8 @@
 # a list of templates
 #
 ######################################################################
+# TODO: limit this to see only your own templates
+# If you are the admin, show all templates in long mode
 
 db_multirow -extend { edit_url view_url delete_url clone_url edit_p } sim_templates select_sim_templates "
     select w.workflow_id,
Index: openacs-4/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/simulation/www/citybuild/object-edit.adp	7 Jan 2004 16:01:03 -0000	1.5
+++ openacs-4/packages/simulation/www/citybuild/object-edit.adp	9 Jan 2004 11:52:41 -0000	1.6
@@ -7,3 +7,8 @@
 TODO: Show on map should be read-only unless user has "sim_set_map_p"
 priv on package_id
 <p>TODO: suppress HTML cut-paste text for stylesheets
+<p>TODO: default Show in Directory to No
+<p>TODO: "Associated with 1" should say "Associated With"
+<p>TODO: OK button should say "Done" or "Finished" ?
+<p>TODO: help text for any image: "To make this image appear when the
+object is viewed, put the html snippet in the Content field."
\ No newline at end of file
Index: openacs-4/packages/simulation/www/citybuild/object-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/simulation/www/citybuild/object-edit.tcl	7 Jan 2004 16:01:03 -0000	1.9
+++ openacs-4/packages/simulation/www/citybuild/object-edit.tcl	9 Jan 2004 11:52:41 -0000	1.10
@@ -717,3 +717,5 @@
     
     element set_properties object $elm -before_html $elm_before_html -after_html $elm_after_html
 }
+
+#TODO: if a URI is submitted, filter it the same way as implicit URI from title.  ie, replace spaces with dashes.
\ No newline at end of file
Index: openacs-4/packages/simulation/www/simbuild/state-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/state-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/simbuild/state-edit.tcl	16 Dec 2003 18:34:00 -0000	1.2
+++ openacs-4/packages/simulation/www/simbuild/state-edit.tcl	9 Jan 2004 11:52:41 -0000	1.3
@@ -66,6 +66,7 @@
     {pretty_name:text
         {label "State Name"}
         {html {size 20}}
+        {help_text "Each simulation can be in only one state at a time.  The list of available tasks can be different in each state."}
     }
 } -edit_request {
     set workflow_id $state_array(workflow_id)
Index: openacs-4/packages/simulation/www/simbuild/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/simulation/www/simbuild/task-edit.adp	8 Jan 2004 13:03:33 -0000	1.9
+++ openacs-4/packages/simulation/www/simbuild/task-edit.adp	9 Jan 2004 11:52:41 -0000	1.10
@@ -6,3 +6,5 @@
 <formtemplate id="task"></formtemplate>
 TODO: If there are no states, show a message "This task cannot be
 fully developed because its workflow has no states" and link to add states
+<p>TODO: B: "add a state" option next to "next state" which adds a new
+state and selects it in the dropdown without losing form info
\ No newline at end of file
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.23 -r1.24
--- openacs-4/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 10:53:07 -0000	1.23
+++ openacs-4/packages/simulation/www/simbuild/task-edit.tcl	9 Jan 2004 11:52:41 -0000	1.24
@@ -82,7 +82,7 @@
     -export { workflow_id } \
     -edit_buttons [list \
                        [list \
-                            [ad_decode [ad_form_new_p -key action_id] 1 [_ acs-kernel.common_add] [_ acs-kernel.common_edit]] \
+                            [ad_decode [ad_form_new_p -key action_id] 1 [_ acs-kernel.common_add] [_ acs-kernel.common_finish]] \
                             ok]] \
     -form {
         {action_id:key}
@@ -99,13 +99,13 @@
             {label "Task is complete when"}
             {options { 
                 { "Assignee sends message to recipient" message }
-                { "Assignee uploads document" normal } 
+                { "Assignee adds document to portfolio (TODO: implement portfolio tasks)" normal } 
                 { "Child workflow is complete" workflow }
             }}
             {html {onChange "javascript:acs_FormRefresh('task');"}}
         }
         {assigned_role:text(select),optional
-            {label "Assigned To"}
+            {label "Assignee"}
             {options $role_options_with_null}
         }
         {recipient_role:text(select),optional
Index: openacs-4/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/simulation/www/simbuild/template-edit.adp	9 Jan 2004 10:53:07 -0000	1.19
+++ openacs-4/packages/simulation/www/simbuild/template-edit.adp	9 Jan 2004 11:52:41 -0000	1.20
@@ -16,20 +16,18 @@
           <h2>Template</h2>
           <div class="portlet-body">
             <formtemplate id="sim_template"></formtemplate>
-              <a href="@spec_url@" class="action">Download a specification for this template</a>
-
               <if @mark_ready_url@ not nil>
                 <a href="@mark_ready_url@" class="action">Mark this template ready for use</a>
               </if>
+              <else>
+                <if @inst_url@ not nil>
+                <a href="@inst_url@" class="action">Start a simulation with this template</a>   
+                </if>
+              </else>
+              <p></p><a href="@spec_url@">Export this template
+  as a text file</a>
+              <p></p><a href="@delete_url@" onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
 
-              <if @inst_url@ not nil>
-                <a href="@inst_url@" class="action">Start a simulation with this template</a>
-              </if>
-
-              <a href="@delete_url@" class="action" 
-                onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
-
-
           </div>
         </div>
 
@@ -63,3 +61,5 @@
   </table>
 
 </else>
+TODO: put state names in blue background or something else to make
+them look similar to other lists of child objects of the template