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.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	9 Dec 2003 15:58:13 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	9 Dec 2003 17:31:29 -0000	1.7
@@ -5,8 +5,6 @@
 
 <formtemplate id="sim_template"></formtemplate>
 
-<p>TODO: Missing from form: description, description-mime-type.  
-
 <if @workflow_id@ not nil>
 
   <p>
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.tcl	9 Dec 2003 09:52:45 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.tcl	9 Dec 2003 17:31:29 -0000	1.7
@@ -39,44 +39,70 @@
         {label "Template Name"}
         {html {size 40}}
     }
-    {ready_p:boolean(checkbox),optional
-        {label "Ready for use?"}
-        {options {{"Ready for use" t}}}
+    {template_ready_p:boolean(checkbox),optional
+        {label "Ready for use?<br> TODO: hide this in new mode"}
+        {options {{"Yes" t}}}
     }
     {suggested_duration:text,optional
         {label "Suggested Duration"}
     }
+    {description:text(textarea),optional
+        {label "TODO: Description and<br> Description-mime-type"}
+        {html {cols 60 rows 8}}
+    }
 } -edit_request {
+
     permission::require_write_permission -object_id $workflow_id
     simulation::template::get -workflow_id $workflow_id -array sim_template_array
     set name $sim_template_array(pretty_name)
-    set ready_p $sim_template_array(ready_p)
+
+    # translate sim_type to ready/not-ready
+    # TODO: we should only see ready_template and dev_template here, so maybe assert that?
+    if {$sim_template_array(sim_type) == "ready_template"} {
+        set template_ready_p "t"
+    } else {
+        set template_ready_p "f"
+    }
+
     set suggested_duration $sim_template_array(suggested_duration)
+
 } -new_request {
+
     permission::require_permission -object_id $package_id -privilege sim_template_create
+
 } -new_data {
+
     permission::require_permission -object_id $package_id -privilege sim_template_create
     set workflow_id [simulation::template::new \
                          -short_name $name \
                          -pretty_name $name \
-                         -ready_p $ready_p \
                          -suggested_duration $suggested_duration \
                          -package_key $package_key \
                          -object_id $package_id]
+    
 } -edit_data {
+
+    if {$template_ready_p == "t"} {
+        set sim_type "ready_template"
+    } else {
+        set sim_type "dev_template"
+    }
+
     permission::require_write_permission -object_id $workflow_id
     simulation::template::edit \
         -workflow_id $workflow_id \
         -short_name $name \
         -pretty_name $name \
-        -ready_p $ready_p \
+        -sim_type $sim_type \
         -suggested_duration $suggested_duration \
         -package_key $package_key \
         -object_id $package_id
 
 } -after_submit {
+
     ad_returnredirect [export_vars -base "template-edit" { workflow_id }]
     ad_script_abort
+
 }
 
 #---------------------------------------------------------------------
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.6 -r1.7
--- openacs-4/packages/simulation/www/simbuild/template-edit.adp	9 Dec 2003 15:58:13 -0000	1.6
+++ openacs-4/packages/simulation/www/simbuild/template-edit.adp	9 Dec 2003 17:31:29 -0000	1.7
@@ -5,8 +5,6 @@
 
 <formtemplate id="sim_template"></formtemplate>
 
-<p>TODO: Missing from form: description, description-mime-type.  
-
 <if @workflow_id@ not nil>
 
   <p>
Index: openacs-4/packages/simulation/www/simbuild/template-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simbuild/template-edit.tcl	9 Dec 2003 09:52:45 -0000	1.6
+++ openacs-4/packages/simulation/www/simbuild/template-edit.tcl	9 Dec 2003 17:31:29 -0000	1.7
@@ -39,44 +39,70 @@
         {label "Template Name"}
         {html {size 40}}
     }
-    {ready_p:boolean(checkbox),optional
-        {label "Ready for use?"}
-        {options {{"Ready for use" t}}}
+    {template_ready_p:boolean(checkbox),optional
+        {label "Ready for use?<br> TODO: hide this in new mode"}
+        {options {{"Yes" t}}}
     }
     {suggested_duration:text,optional
         {label "Suggested Duration"}
     }
+    {description:text(textarea),optional
+        {label "TODO: Description and<br> Description-mime-type"}
+        {html {cols 60 rows 8}}
+    }
 } -edit_request {
+
     permission::require_write_permission -object_id $workflow_id
     simulation::template::get -workflow_id $workflow_id -array sim_template_array
     set name $sim_template_array(pretty_name)
-    set ready_p $sim_template_array(ready_p)
+
+    # translate sim_type to ready/not-ready
+    # TODO: we should only see ready_template and dev_template here, so maybe assert that?
+    if {$sim_template_array(sim_type) == "ready_template"} {
+        set template_ready_p "t"
+    } else {
+        set template_ready_p "f"
+    }
+
     set suggested_duration $sim_template_array(suggested_duration)
+
 } -new_request {
+
     permission::require_permission -object_id $package_id -privilege sim_template_create
+
 } -new_data {
+
     permission::require_permission -object_id $package_id -privilege sim_template_create
     set workflow_id [simulation::template::new \
                          -short_name $name \
                          -pretty_name $name \
-                         -ready_p $ready_p \
                          -suggested_duration $suggested_duration \
                          -package_key $package_key \
                          -object_id $package_id]
+    
 } -edit_data {
+
+    if {$template_ready_p == "t"} {
+        set sim_type "ready_template"
+    } else {
+        set sim_type "dev_template"
+    }
+
     permission::require_write_permission -object_id $workflow_id
     simulation::template::edit \
         -workflow_id $workflow_id \
         -short_name $name \
         -pretty_name $name \
-        -ready_p $ready_p \
+        -sim_type $sim_type \
         -suggested_duration $suggested_duration \
         -package_key $package_key \
         -object_id $package_id
 
 } -after_submit {
+
     ad_returnredirect [export_vars -base "template-edit" { workflow_id }]
     ad_script_abort
+
 }
 
 #---------------------------------------------------------------------