Index: openacs-4/contrib/packages/simulation/lib/object-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/object-display.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/contrib/packages/simulation/lib/object-display.tcl 18 Nov 2003 13:31:31 -0000 1.11 +++ openacs-4/contrib/packages/simulation/lib/object-display.tcl 18 Nov 2003 14:22:55 -0000 1.12 @@ -84,8 +84,8 @@ if { [permission::write_permission_p -object_id $item(item_id) -party_id [ad_conn untrusted_user_id]] } { - set edit_url [export_vars -base [ad_conn package_url]citybuild/object-edit { { item_id $item(item_id) } }] - set delete_url [export_vars -base [ad_conn package_url]object-delete { { item_id $item(item_id) } }] + set edit_url [export_vars -base [apm_package_url_from_id $package_id]citybuild/object-edit { { item_id $item(item_id) } }] + set delete_url [export_vars -base [apm_package_url_from_id $package_id]/citybuild/object-delete { { item_id $item(item_id) } }] } ##### Index: openacs-4/contrib/packages/simulation/lib/sim-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-objects.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/simulation/lib/sim-objects.tcl 18 Nov 2003 13:31:31 -0000 1.4 +++ openacs-4/contrib/packages/simulation/lib/sim-objects.tcl 18 Nov 2003 14:22:55 -0000 1.5 @@ -10,7 +10,7 @@ default_value display } size { - allowed_values {short long} + allowed_values {short long yellow-pages} default_value long } } @@ -68,6 +68,12 @@ }] } +if { $size == "yellow-pages"} { + set filter_sql "and content_type = 'sim_character' or content_type = 'sim_location'" +} else { + set filter_sql "" +} + template::list::create \ -name objects \ -multirow objects \ @@ -90,11 +96,12 @@ and i.parent_id = f.folder_id and r.revision_id = i.live_revision and ot.object_type = i.content_type + $filter_sql [template::list::orderby_clause -orderby -name "objects"] " { set description [string_truncate -len 200 $description] - set edit_url [export_vars -base "object-edit" { item_id }] - set delete_url [export_vars -base "object-delete" { item_id }] + set edit_url [export_vars -base "[apm_package_url_from_id $package_id]citybuild/object-edit" { item_id }] + set delete_url [export_vars -base "[apm_package_url_from_id $package_id]citybuild/object-delete" { item_id }] switch -glob $mime_type { text/* - {} { @@ -106,4 +113,4 @@ } } -set create_object_url [export_vars -base object-edit { parent_id }] +set create_object_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/object-edit" { parent_id }] Index: openacs-4/contrib/packages/simulation/lib/sim-template-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-objects.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/simulation/lib/sim-template-objects.tcl 12 Nov 2003 13:14:07 -0000 1.2 +++ openacs-4/contrib/packages/simulation/lib/sim-template-objects.tcl 18 Nov 2003 14:22:55 -0000 1.3 @@ -61,9 +61,9 @@ [template::list::orderby_clause -orderby -name "sim_objects"] " { set description [string_truncate -len 200 $description] - set edit_url [export_vars -base "object-edit" { item_id }] - set view_url [export_vars -base "object/$name"] - set delete_url [export_vars -base "object-delete" { item_id }] + set edit_url [export_vars -base "[apm_package_url_from_id $package_id]citybuild/object-edit" { item_id }] + set view_url [export_vars -base "[apm_package_url_from_id $package_id]object/$name"] + set delete_url [export_vars -base "[apm_package_url_from_id $package_id]citybuild/object-delete" { item_id }] } set sim_types { sim_character sim_prop sim_location } @@ -74,6 +74,6 @@ from acs_object_types ot where ot.object_type in ('[join $sim_types "','"]') " { - set create_url [export_vars -base object-edit { content_type parent_id }] + set create_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/object-edit" { content_type parent_id }] set label "Create new $pretty_name" } Index: openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-roles.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl 18 Nov 2003 09:44:30 -0000 1.6 +++ openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl 18 Nov 2003 14:22:55 -0000 1.7 @@ -65,6 +65,6 @@ where wr.workflow_id = :workflow_id [template::list::orderby_clause -orderby -name "roles"] " { - set edit_url [export_vars -base "role-edit" { role_id }] - set delete_url [export_vars -base "role-delete" { role_id return_url }] + set edit_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/role-edit" { role_id }] + set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/role-delete" { role_id return_url }] } 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.5 -r1.6 --- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl 14 Nov 2003 09:48:54 -0000 1.5 +++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl 18 Nov 2003 14:22:55 -0000 1.6 @@ -18,7 +18,7 @@ display {} edit { - set add_task_url [export_vars -base "task-edit" { workflow_id } ] + set add_task_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { workflow_id } ] } } @@ -98,7 +98,7 @@ and st.task_id = wa.action_id [template::list::orderby_clause -orderby -name "tasks"] " { - set edit_url [export_vars -base "task-edit" { action_id }] - set view_url [export_vars -base "task-edit" { action_id }] - set delete_url [export_vars -base "task-delete" { action_id return_url }] + set edit_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { action_id }] + set view_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { action_id }] + set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-delete" { action_id return_url }] } 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.5 -r1.6 --- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 14 Nov 2003 14:03:42 -0000 1.5 +++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 18 Nov 2003 14:22:55 -0000 1.6 @@ -16,6 +16,7 @@ } set package_id [ad_conn package_id] +set add_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-edit" ] # TODO: make this include honor the display_mode parameter @@ -24,7 +25,7 @@ template::list::create \ -name sim_templates \ -multirow sim_templates \ - -actions { "Add a template" template-edit } \ + -actions " {Add a template} $add_url " \ -elements { name { label "Template" @@ -43,7 +44,7 @@ template::list::create \ -name sim_templates \ -multirow sim_templates \ - -actions { "Add a template" template-edit } \ + -actions " {Add a template} $add_url " \ -elements { edit { sub_class narrow @@ -112,7 +113,10 @@ [template::list::orderby_clause -orderby -name sim_templates] " { set description [string_truncate -len 200 $description] - set edit_url [export_vars -base "template-edit?workflow_id=$workflow_id"] - set view_url [export_vars -base "template-edit?workflow_id=$workflow_id"] - set delete_url [export_vars -base "sim-template-delete?workflow_id=$workflow_id"] + + set edit_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-edit" {workflow_id} ] + + set view_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-edit" {workflow_id} ] + + set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-delete" {workflow_id} ] } Index: openacs-4/contrib/packages/simulation/lib/simulations.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/simulations.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/lib/simulations.tcl 18 Nov 2003 12:19:38 -0000 1.1 +++ openacs-4/contrib/packages/simulation/lib/simulations.tcl 18 Nov 2003 14:22:55 -0000 1.2 @@ -53,5 +53,5 @@ and ss.case_start <= now() and ss.case_end >= now() " { - set edit_url [export_vars -base "simulation-edit" { simulation_id }] + set edit_url [export_vars -base "[apm_package_url_from_id $package_id]siminst/simulation-edit" { simulation_id }] } Index: openacs-4/contrib/packages/simulation/www/yellow-pages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/yellow-pages.adp,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/simulation/www/yellow-pages.adp 18 Nov 2003 09:44:31 -0000 1.2 +++ openacs-4/contrib/packages/simulation/www/yellow-pages.adp 18 Nov 2003 14:22:56 -0000 1.3 @@ -3,5 +3,5 @@ @context;noquote@

- +

Index: openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/control-bar.adp,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp 18 Nov 2003 09:44:32 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp 18 Nov 2003 14:22:56 -0000 1.2 @@ -1,5 +1,5 @@