Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl 24 Mar 2004 00:47:26 -0000 1.13 +++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl 6 Jun 2004 02:29:10 -0000 1.14 @@ -26,135 +26,135 @@ # Now define some default layouts. set var_list { - {name 1_column} - {description "One column"} - {filename /packages/portal/lib/layouts/simple} + {p_name 1_column} + {p_description "One column"} + {p_filename /packages/portal/lib/layouts/simple} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name 2_column} - {description "Two columns"} - {filename /packages/portal/lib/layouts/simple} + {p_name 2_column} + {p_description "Two columns"} + {p_filename /packages/portal/lib/layouts/simple} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name 3_column} - {description "Three columns"} - {filename /packages/portal/lib/layouts/simple} + {p_name 3_column} + {p_description "Three columns"} + {p_filename /packages/portal/lib/layouts/simple} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 3]] + [list p_layout_id $layout_id] \ + [list p_region 3]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name left_sidebar} - {description "Left sidebar"} - {filename /packages/portal/lib/layouts/left-sidebar} + {p_name left_sidebar} + {p_description "Left sidebar"} + {p_filename /packages/portal/lib/layouts/left-sidebar} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name right_sidebar} - {description "Right sidebar"} - {filename /packages/portal/lib/layouts/right-sidebar} + {p_name right_sidebar} + {p_description "Right sidebar"} + {p_filename /packages/portal/lib/layouts/right-sidebar} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name left_right_sidebar} - {description "Left and right sidebars"} - {filename /packages/portal/lib/layouts/left-right-sidebar} + {p_name left_right_sidebar} + {p_description "Left and right sidebars"} + {p_filename /packages/portal/lib/layouts/left-right-sidebar} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 3]] + [list p_layout_id $layout_id] \ + [list p_region 3]] package_exec_plsql -var_list $var_list portal_layout add_region # And some themes set var_list { - {name default} - {description "Default OpenACS Theme"} - {filename /packages/portal/lib/themes/standard-theme} - {resource_dir /resources/portal/themes/standard-theme} + {p_name default} + {p_description "Default OpenACS Theme"} + {p_filename /packages/portal/lib/themes/standard-theme} + {p_resource_dir /resources/portal/themes/standard-theme} } package_instantiate_object -var_list $var_list portal_theme set var_list { - {name blank} - {description "No graphics"} - {filename /packages/portal/lib/themes/nada-theme} - {resource_dir /resources/portal/themes/nada-theme} + {p_name blank} + {p_description "No graphics"} + {p_filename /packages/portal/lib/themes/nada-theme} + {p_resource_dir /resources/portal/themes/nada-theme} } package_instantiate_object -var_list $var_list portal_theme set var_list { - {name deco} - {description "An Art Deco Theme"} - {filename /packages/portal/lib/themes/deco-theme} - {resource_dir /resources/portal/themes/deco-theme} + {p_name deco} + {p_description "An Art Deco Theme"} + {p_filename /packages/portal/lib/themes/deco-theme} + {p_resource_dir /resources/portal/themes/deco-theme} } package_instantiate_object -var_list $var_list portal_theme