Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-content-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-content-types-create.sql,v
diff -u -r1.18 -r1.19
--- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-content-types-create.sql	12 Jan 2004 16:07:37 -0000	1.18
+++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-content-types-create.sql	22 Jan 2004 12:49:45 -0000	1.19
@@ -261,7 +261,7 @@
 ----------------------------------------------------------------------
 -- sim_message
 ----------------------------------------------------------------------
--- # TODO (.25h): foreign constraints for to_role_id and from_role_id in the 'column_spec'
+-- # FIXME: We should check foreign constraints for to_role_id and from_role_id in the 'column_spec'
 
 select content_type__create_type(
     'sim_message',                 -- content_type
Index: openacs-4/contrib/packages/simulation/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/notification-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/tcl/notification-procs.tcl	10 Nov 2003 16:56:56 -0000	1.1
+++ openacs-4/contrib/packages/simulation/tcl/notification-procs.tcl	22 Jan 2004 12:49:45 -0000	1.2
@@ -66,11 +66,11 @@
 ad_proc -public simulation::notification::xml_map::get_url {
     object_id
 } {
-    # Todo: Implement this proc
+    # This proc is not needed
 }
 
 ad_proc -public simulation::notification::xml_map::process_reply {
     reply_id
 } {
-    # Todo: Implement this proc
+    # This proc is not needed
 }    
Index: openacs-4/contrib/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/template-procs.tcl,v
diff -u -r1.57 -r1.58
--- openacs-4/contrib/packages/simulation/tcl/template-procs.tcl	21 Jan 2004 15:55:36 -0000	1.57
+++ openacs-4/contrib/packages/simulation/tcl/template-procs.tcl	22 Jan 2004 12:49:45 -0000	1.58
@@ -520,13 +520,12 @@
             set user_name [lindex $user 1]
 
             set subject "You have been enrolled in simulation $sim_template(pretty_name)"
-            # TODO: check that link to casting page is correct
             set package_id [ad_conn package_id]
             set casting_page_url \
-                [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { email }]
+                [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/cast" { workflow_id }]
             set body "Dear $user_name,
 This is to notify you that you have been enrolled in simulation $sim_template(pretty_name). You may visit the
-casting page at ${casting_page_url}.
+casting page at ${casting_page_url} to choose case or role.
 "
 
             acs_mail_lite::send \
@@ -542,10 +541,9 @@
         set email [lindex $user 0]
         set user_name [lindex $user 1]        
 
-        # TODO: check that link to enrollment page is correct
         set package_id [ad_conn package_id]
         set enrollment_page_url \
-            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { email }]
+            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { workflow_id }]
         set subject "You have been invited to join simulation $sim_template(pretty_name)"
         set body "Dear $user_name,
 You have been invited to join simulation $sim_template(pretty_name). Please visit the enrollment page at $enrollment_page_url to accept the invitation. Thank you!"
@@ -672,10 +670,9 @@
         set email [lindex $user_item 1]
         set user_name [lindex $user_item 2]        
         
-        # TODO: check that link to enrollment page is correct
         set package_id [ad_conn package_id]
         set simplay_url \
-            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { email }]
+            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { workflow_id }]
         set subject "Simulation $simulation(pretty_name) has started"
         set body "Dear $user_name,
 Simulation $simulation(pretty_name) has now started. Please visit $simplay_url to participate. Thank you!"
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/test/crawl-links.test'.
Fisheye: No comparison available.  Pass `N' to diff?
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.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	16 Jan 2004 16:03:44 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	22 Jan 2004 12:49:45 -0000	1.10
@@ -7,10 +7,5 @@
 <p>TODO: (2h) Lars, modify content field to allow uploading of non-text documents
 (word, etc), after which point content field should display as a
 hyperlink and a delete button (applies to all types)
-<p>TODO: (0.1h) suppress HTML cut-paste text for stylesheet field in other types
-<p>TODO: (0.1h) default Show in Directory to No (it's defaulted in the acs_attributes table, but the value doesn't show in the form ...)
-<p>TODO: (0.1h) "Associated with 1" should say "Associated With"
-<p>TODO: (0.1h) OK button should say "Done" or "Finished" ?
-<p>TODO: (0.1h) help text for any image: "To make this image appear when the
-object is viewed, put the html snippet in the Content field."
-<p>TODO: (0.1h) if a URI is submitted, filter it the same way as implicit URI from title.  ie, replace spaces with dashes.
+<p>TODO B: (0.1h) default Show in Directory to No (it's defaulted in the acs_attributes table, but the value doesn't show in the form ...)
+<p>TODO: (0.1h) Lars "Associated with 1" should say "Associated With"
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.15 -r1.16
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl	19 Jan 2004 13:37:32 -0000	1.15
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl	22 Jan 2004 12:49:45 -0000	1.16
@@ -65,7 +65,7 @@
     {name:text,optional
         {label "URI"}
         {html {size 50}}
-        {help_text {[ad_decode [ad_form_new_p -key item_id] 1 "Leave blank to default to Title.  This will become part of the URL for the object." ""]}}
+        {help_text {[ad_decode [ad_form_new_p -key item_id] 1 "Leave blank to default to Title.  This will become part of the URL for the object. Spaces are replaced with dashes." ""]}}
         {mode {[ad_decode [ad_form_new_p -key item_id] 1 "edit" "display"]}}
     }
     {description:text(textarea),optional
@@ -443,7 +443,7 @@
     if { !$elm_required_p } {
         append elm_decl ",optional"
     }
-    
+
     ad_form -extend -name object -form \
         [list [concat [list $elm_decl [list label \$pretty_name]] $extra]]
 }
@@ -552,8 +552,9 @@
     if { [empty_string_p $name] } {
         set name [util_text_to_url -existing_urls $existing_items -text $title]
     } else {
+        set name [util_text_to_url -text $name]
         if { [lsearch $existing_items $name] != -1 } {
-            form set_error object name "This name is already in use"
+            form set_error object name "The name \"$name\" is already in use"
             break
         }
     }
@@ -638,7 +639,6 @@
         from   cr_item_rels
         where  item_id = :item_id
     } {
-        ns_log Notice "pm debug $related_object_id $relation_tag"
         set "rel__${relation_tag}__${order_n}" $related_object_id
     }
     
@@ -725,15 +725,21 @@
             append elm_before_html {"><img src="/resources/acs-subsite/Delete24.gif" width="24" height="24" border="0">}
             append elm_before_html {</a>}
 
-            append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
-            append elm_after_html {<a href="javascript:CopyText('}
-            append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
-            append elm_after_html {');" title="} 
-            append elm_after_html [ad_quotehtml "Copy a tag for this $relation_tag to the clipboard"]
-            append elm_after_html {"><img src="/resources/acs-subsite/stock_copy.png" width="24" height="24" }
-            append elm_after_html {alt="Copy" border="0"></a>}
+            if { ![string equal $relation_tag "stylesheet"] } {
+                append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
+                append elm_after_html {<a href="javascript:CopyText('}
+                append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
+                append elm_after_html {');" title="} 
+                append elm_after_html [ad_quotehtml "Copy a tag for this $relation_tag to the clipboard"]
+                append elm_after_html {"><img src="/resources/acs-subsite/stock_copy.png" width="24" height="24" }
+                append elm_after_html {alt="Copy" border="0"></a>}
+            }
         }
 
+        if { [string equal $relation_tag "image"] } {
+            element set_properties object $elm help_text "To make this image appear when the object is viewed, put the html snippet in the Content field."            
+        }
+
     } else {
         append elm_before_html {<img src="/resources/acs-subsite/spacer.gif" height="1" width="50">}
         append elm_before_html {&nbsp;}
Index: openacs-4/contrib/packages/simulation/www/doc/xml/index.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/xml/Attic/index.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/www/doc/xml/index.xml	14 Nov 2003 14:03:11 -0000	1.4
+++ openacs-4/contrib/packages/simulation/www/doc/xml/index.xml	22 Jan 2004 12:49:46 -0000	1.5
@@ -17,6 +17,6 @@
       </xi:include>
   <appendix id="licensing">
     <title>Licencing</title>
-    <para>TODO</para>
+    <para></para>
   </appendix>
 </book>
Index: openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql	12 Jan 2004 16:07:37 -0000	1.18
+++ openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql	22 Jan 2004 12:49:45 -0000	1.19
@@ -261,7 +261,7 @@
 ----------------------------------------------------------------------
 -- sim_message
 ----------------------------------------------------------------------
--- # TODO (.25h): foreign constraints for to_role_id and from_role_id in the 'column_spec'
+-- # FIXME: We should check foreign constraints for to_role_id and from_role_id in the 'column_spec'
 
 select content_type__create_type(
     'sim_message',                 -- content_type
Index: openacs-4/packages/simulation/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/notification-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/tcl/notification-procs.tcl	10 Nov 2003 16:56:56 -0000	1.1
+++ openacs-4/packages/simulation/tcl/notification-procs.tcl	22 Jan 2004 12:49:45 -0000	1.2
@@ -66,11 +66,11 @@
 ad_proc -public simulation::notification::xml_map::get_url {
     object_id
 } {
-    # Todo: Implement this proc
+    # This proc is not needed
 }
 
 ad_proc -public simulation::notification::xml_map::process_reply {
     reply_id
 } {
-    # Todo: Implement this proc
+    # This proc is not needed
 }    
Index: openacs-4/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/template-procs.tcl,v
diff -u -r1.57 -r1.58
--- openacs-4/packages/simulation/tcl/template-procs.tcl	21 Jan 2004 15:55:36 -0000	1.57
+++ openacs-4/packages/simulation/tcl/template-procs.tcl	22 Jan 2004 12:49:45 -0000	1.58
@@ -520,13 +520,12 @@
             set user_name [lindex $user 1]
 
             set subject "You have been enrolled in simulation $sim_template(pretty_name)"
-            # TODO: check that link to casting page is correct
             set package_id [ad_conn package_id]
             set casting_page_url \
-                [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { email }]
+                [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/cast" { workflow_id }]
             set body "Dear $user_name,
 This is to notify you that you have been enrolled in simulation $sim_template(pretty_name). You may visit the
-casting page at ${casting_page_url}.
+casting page at ${casting_page_url} to choose case or role.
 "
 
             acs_mail_lite::send \
@@ -542,10 +541,9 @@
         set email [lindex $user 0]
         set user_name [lindex $user 1]        
 
-        # TODO: check that link to enrollment page is correct
         set package_id [ad_conn package_id]
         set enrollment_page_url \
-            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { email }]
+            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { workflow_id }]
         set subject "You have been invited to join simulation $sim_template(pretty_name)"
         set body "Dear $user_name,
 You have been invited to join simulation $sim_template(pretty_name). Please visit the enrollment page at $enrollment_page_url to accept the invitation. Thank you!"
@@ -672,10 +670,9 @@
         set email [lindex $user_item 1]
         set user_name [lindex $user_item 2]        
         
-        # TODO: check that link to enrollment page is correct
         set package_id [ad_conn package_id]
         set simplay_url \
-            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { email }]
+            [export_vars -base "[ad_url][apm_package_url_from_id $package_id]/simplay/enroll" { workflow_id }]
         set subject "Simulation $simulation(pretty_name) has started"
         set body "Dear $user_name,
 Simulation $simulation(pretty_name) has now started. Please visit $simplay_url to participate. Thank you!"
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/simulation/test/crawl-links.test'.
Fisheye: No comparison available.  Pass `N' to diff?
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.9 -r1.10
--- openacs-4/packages/simulation/www/citybuild/object-edit.adp	16 Jan 2004 16:03:44 -0000	1.9
+++ openacs-4/packages/simulation/www/citybuild/object-edit.adp	22 Jan 2004 12:49:45 -0000	1.10
@@ -7,10 +7,5 @@
 <p>TODO: (2h) Lars, modify content field to allow uploading of non-text documents
 (word, etc), after which point content field should display as a
 hyperlink and a delete button (applies to all types)
-<p>TODO: (0.1h) suppress HTML cut-paste text for stylesheet field in other types
-<p>TODO: (0.1h) default Show in Directory to No (it's defaulted in the acs_attributes table, but the value doesn't show in the form ...)
-<p>TODO: (0.1h) "Associated with 1" should say "Associated With"
-<p>TODO: (0.1h) OK button should say "Done" or "Finished" ?
-<p>TODO: (0.1h) help text for any image: "To make this image appear when the
-object is viewed, put the html snippet in the Content field."
-<p>TODO: (0.1h) if a URI is submitted, filter it the same way as implicit URI from title.  ie, replace spaces with dashes.
+<p>TODO B: (0.1h) default Show in Directory to No (it's defaulted in the acs_attributes table, but the value doesn't show in the form ...)
+<p>TODO: (0.1h) Lars "Associated with 1" should say "Associated With"
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.15 -r1.16
--- openacs-4/packages/simulation/www/citybuild/object-edit.tcl	19 Jan 2004 13:37:32 -0000	1.15
+++ openacs-4/packages/simulation/www/citybuild/object-edit.tcl	22 Jan 2004 12:49:45 -0000	1.16
@@ -65,7 +65,7 @@
     {name:text,optional
         {label "URI"}
         {html {size 50}}
-        {help_text {[ad_decode [ad_form_new_p -key item_id] 1 "Leave blank to default to Title.  This will become part of the URL for the object." ""]}}
+        {help_text {[ad_decode [ad_form_new_p -key item_id] 1 "Leave blank to default to Title.  This will become part of the URL for the object. Spaces are replaced with dashes." ""]}}
         {mode {[ad_decode [ad_form_new_p -key item_id] 1 "edit" "display"]}}
     }
     {description:text(textarea),optional
@@ -443,7 +443,7 @@
     if { !$elm_required_p } {
         append elm_decl ",optional"
     }
-    
+
     ad_form -extend -name object -form \
         [list [concat [list $elm_decl [list label \$pretty_name]] $extra]]
 }
@@ -552,8 +552,9 @@
     if { [empty_string_p $name] } {
         set name [util_text_to_url -existing_urls $existing_items -text $title]
     } else {
+        set name [util_text_to_url -text $name]
         if { [lsearch $existing_items $name] != -1 } {
-            form set_error object name "This name is already in use"
+            form set_error object name "The name \"$name\" is already in use"
             break
         }
     }
@@ -638,7 +639,6 @@
         from   cr_item_rels
         where  item_id = :item_id
     } {
-        ns_log Notice "pm debug $related_object_id $relation_tag"
         set "rel__${relation_tag}__${order_n}" $related_object_id
     }
     
@@ -725,15 +725,21 @@
             append elm_before_html {"><img src="/resources/acs-subsite/Delete24.gif" width="24" height="24" border="0">}
             append elm_before_html {</a>}
 
-            append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
-            append elm_after_html {<a href="javascript:CopyText('}
-            append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
-            append elm_after_html {');" title="} 
-            append elm_after_html [ad_quotehtml "Copy a tag for this $relation_tag to the clipboard"]
-            append elm_after_html {"><img src="/resources/acs-subsite/stock_copy.png" width="24" height="24" }
-            append elm_after_html {alt="Copy" border="0"></a>}
+            if { ![string equal $relation_tag "stylesheet"] } {
+                append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
+                append elm_after_html {<a href="javascript:CopyText('}
+                append elm_after_html [ad_quotehtml "<relation tag=\"$relation_tag\" index=\"$order_n\" embed>"]
+                append elm_after_html {');" title="} 
+                append elm_after_html [ad_quotehtml "Copy a tag for this $relation_tag to the clipboard"]
+                append elm_after_html {"><img src="/resources/acs-subsite/stock_copy.png" width="24" height="24" }
+                append elm_after_html {alt="Copy" border="0"></a>}
+            }
         }
 
+        if { [string equal $relation_tag "image"] } {
+            element set_properties object $elm help_text "To make this image appear when the object is viewed, put the html snippet in the Content field."            
+        }
+
     } else {
         append elm_before_html {<img src="/resources/acs-subsite/spacer.gif" height="1" width="50">}
         append elm_before_html {&nbsp;}
Index: openacs-4/packages/simulation/www/doc/xml/index.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/xml/index.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/www/doc/xml/index.xml	14 Nov 2003 14:03:11 -0000	1.4
+++ openacs-4/packages/simulation/www/doc/xml/index.xml	22 Jan 2004 12:49:46 -0000	1.5
@@ -17,6 +17,6 @@
       </xi:include>
   <appendix id="licensing">
     <title>Licencing</title>
-    <para>TODO</para>
+    <para></para>
   </appendix>
 </book>