Index: openacs-4/contrib/packages/simulation/lib/cases.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/cases.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/lib/cases.tcl 14 Nov 2003 14:31:41 -0000 1.1 +++ openacs-4/contrib/packages/simulation/lib/cases.tcl 2 Dec 2003 13:46:53 -0000 1.2 @@ -26,12 +26,13 @@ -elements $elements db_multirow cases select_cases " - select w.pretty_name - from workflows w, - workflow_cases wc, - workflow_case_role_party_map wcrpm - where w.workflow_id = wc.workflow_id + select wc.case_id, + w.pretty_name + from workflow_cases wc, + workflow_case_role_party_map wcrpm, + workflows w + where wcrpm.party_id = :party_id and wc.case_id = wcrpm.case_id - and wcrpm.party_id = :party_id + and w.workflow_id = wc.workflow_id [template::list::orderby_clause -orderby -name "cases"] " \ No newline at end of file Index: openacs-4/contrib/packages/simulation/lib/sim-objects.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-objects.adp,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/simulation/lib/sim-objects.adp 18 Nov 2003 14:52:45 -0000 1.2 +++ openacs-4/contrib/packages/simulation/lib/sim-objects.adp 2 Dec 2003 13:46:53 -0000 1.3 @@ -1,2 +1 @@ <p><listtemplate name="objects"></listtemplate></p> - 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.8 -r1.9 --- openacs-4/contrib/packages/simulation/lib/sim-objects.tcl 18 Nov 2003 15:59:11 -0000 1.8 +++ openacs-4/contrib/packages/simulation/lib/sim-objects.tcl 2 Dec 2003 13:46:53 -0000 1.9 @@ -10,19 +10,54 @@ default_value display } size { - allowed_values {short long yellow-pages} + allowed_values {short long} default_value long } } +###################################################################### +# Set general variables + set package_id [ad_conn package_id] +if { ![exists_and_not_null user_id] } { + set user_id [auth::get_user_id] +} + +set create_p [permission::permission_p -object_id $package_id -privilege sim_object_create] +set write_p [permission::permission_p -object_id $package_id -privilege sim_object_write] + + +###################################################################### +# +# objects list +# +###################################################################### + +#--------------------------------------------------------------------- +# Set up supporting variables for list + set add_url [export_vars -base "[ad_conn package_url]citybuild/object-edit" { parent_id }] +if { $create_p } { + set actions "{Add an object} $add_url" +} else { + set actions "" +} if { ![exists_and_not_null parent_id] } { set parent_id [bcms::folder::get_id_by_package_id -parent_id 0] } +if { $size == "yellow-pages"} { + set filter_sql "and content_type = 'sim_character' or content_type = 'sim_location' + and +" +} else { + set filter_sql "" +} + +#--------------------------------------------------------------------- +# Set basic elements list set elements { object_type_pretty { label "Type" @@ -35,19 +70,26 @@ } } +#--------------------------------------------------------------------- +# Edit column +# Put an edit link first if { [string equal $display_mode "edit"] } { - # Put an edit link first set elements [concat { edit { sub_class narrow - link_url_col edit_url display_template { - <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border="0" alt="Edit"> + <if @objects.edit_p@> + <a href="@objects.edit_url@" title="Edit this object"> + <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border="0" alt="Edit"> + </a> + </if> } } } $elements] } +#--------------------------------------------------------------------- +# Description column if { [string equal $size "long"] } { set elements [concat $elements { description { @@ -57,33 +99,37 @@ }] } +#--------------------------------------------------------------------- +# Delete column +# Put a delete link last if { [string equal $display_mode "edit"] } { - # Put a delete link last set elements [concat $elements { delete { sub_class narrow link_url_col delete_url display_template { - <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0" alt="Edit"> + <if @objects.edit_p@ true> + <a href="@objects.delete_url@" title="Delete this object" + ><img src="/resources/acs-subsite/Delete16.gif" height="16" + width="16" border="0" alt="Edit"></a> + </if> } } }] } -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 \ - -actions " {Add an object} $add_url " \ + -actions $actions \ -elements $elements +#--------------------------------------------------------------------- +# database query -db_multirow -extend { edit_url view_url delete_url } objects select_objects " + +db_multirow -extend { edit_url view_url delete_url edit_p } objects select_objects " select i.item_id, i.name, r.title, @@ -105,6 +151,7 @@ set description [string_truncate -len 200 $description] 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 }] + set edit_p [expr $write_p || [permission::write_permission_p -object_id $item_id]] switch -glob $mime_type { text/* - {} { 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.6 -r1.7 --- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 18 Nov 2003 14:22:55 -0000 1.6 +++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl 2 Dec 2003 13:46:53 -0000 1.7 @@ -81,6 +81,13 @@ </a> } } + clone { + display_template { + <a href="@sim_templates.clone_url@">Clone this template</a> + } + + } + } } } @@ -94,7 +101,7 @@ # ###################################################################### -db_multirow -extend { edit_url view_url delete_url } sim_templates select_sim_templates " +db_multirow -extend { edit_url view_url delete_url clone_url } sim_templates select_sim_templates " select w.workflow_id, w.pretty_name as name, 'placeholder' as description, @@ -119,4 +126,6 @@ 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} ] + + set clone_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-clone" {workflow_id} ] } Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-priv-test-users-create.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql 2 Dec 2003 13:46:53 -0000 1.1 @@ -0,0 +1,57 @@ +-- create dummy users for permissions testing +-- create each user and then assign appropriate privs directly + +-- this is a temp solution - should instead create all the groups +-- and assign privs to groups as part of normal install, and then +-- put test users in appropriate groups + +-- need package id! + +-- WARNING - all of these users are dangerous until they are added to registered user (-2) with +-- group::add_member -group_id -2 -user_id user_id + +create function inline_0 () returns integer as ' +declare + random_seed int4; + package_id int4; + user_id int4; +begin + -- hack in package_id + package_id := 581; + + -- set a random seed to avoid duplicate records + random_seed := trunc(random() * 100000); + + -- create SimAdmin user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''sally'' || random_seed,''email'' || random_seed,null,''Sally'',''SimAdmin'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_admin''); + + -- create TemplateAuthor user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''tom'' || random_seed,''email1'' || random_seed,null,''Tom'',''TemplateAuthor'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_template_creator''); + perform acs_permission__grant_permission(package_id,user_id,''sim_inst''); + perform acs_permission__grant_permission(package_id,user_id,''sim_object_create''); + + -- create CaseAuthor user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''cassie'' || random_seed,''email2'' || random_seed,null,''Cassie'',''CaseAuthor'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_template_creator''); + perform acs_permission__grant_permission(package_id,user_id,''sim_inst''); + perform acs_permission__grant_permission(package_id,user_id,''sim_object_create''); + + -- create ServiceAdmin user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''sergei'' || random_seed,''email3'' || random_seed,null,''Sergei'',''ServiceAdmin'',null,null,null,''t'',null) into user_id; + -- power to create openacs users + + -- create CityAdmin user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''cindy'' || random_seed,''email4'' || random_seed,null,''Cindy'',''CityAdmin'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_set_map_p''); + perform acs_permission__grant_permission(package_id,user_id,''sim_object_writer''); + + -- create Actor user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''alice'' || random_seed,''email5'' || random_seed,null,''Alice'',''Actor'',null,null,null,''t'',null) into user_id; + + return 0; +end;' language 'plpgsql'; +select inline_0(); +drop function inline_0 (); + Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-privs-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql 1 Dec 2003 15:15:08 -0000 1.4 +++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-privs-create.sql 2 Dec 2003 13:46:53 -0000 1.5 @@ -1,17 +1,28 @@ --- privileges -select acs_privilege__create_privilege('sim_admin','',null); -select acs_privilege__create_privilege('sim_template_create','',null); -select acs_privilege__create_privilege('sim_inst','',null); -select acs_privilege__create_privilege('sim_set_map_p','',null); -select acs_privilege__create_privilege('sim_object_writer','',null); -select acs_privilege__create_privilege('sim_object_create','',null); -select acs_privilege__create_privilege('sim_object_write','',null); +-- set up privileges and hierarchy, top-down +-- syntax is select acs_privilege__add_child(parent, child) --- add children +select acs_privilege__create_privilege('sim_admin','Administer Simulation Package',null); select acs_privilege__add_child('admin','sim_admin'); -select acs_privilege__add_child('sim_admin','sim_template_create'); + +select acs_privilege__create_privilege('sim_inst','Instantiate Simulation Templates into Simulations',null); select acs_privilege__add_child('sim_admin','sim_inst'); -select acs_privilege__add_child('sim_admin','sim_set_map_p'); -select acs_privilege__add_child('sim_admin','sim_object_writer'); + +select acs_privilege__create_privilege('sim_object_create','Can create simulation objects.',null); +select acs_privilege__create_privilege('sim_object_write','Can edit other people\'s simulation objects',null); +select acs_privilege__create_privilege('sim_object_writer','Has write and create privs',null); +-- writer includes both create and write select acs_privilege__add_child('sim_object_writer','sim_object_create'); select acs_privilege__add_child('sim_object_writer','sim_object_write'); +select acs_privilege__add_child('sim_admin','sim_object_writer'); + +select acs_privilege__create_privilege('sim_set_map_p','Can toggle whether or not sim objects are shown on the map',null); +select acs_privilege__add_child('sim_admin','sim_set_map_p'); + +select acs_privilege__create_privilege('sim_template_read','Read Simulation Templates',null); +select acs_privilege__create_privilege('sim_template_create','Create Simulation Templates',null); +select acs_privilege__create_privilege('sim_template_creator','Create and Read Simulation Templates',null); +select acs_privilege__add_child('sim_admin_creator','sim_template_create'); +select acs_privilege__add_child('sim_admin_creator','sim_template_read'); +select acs_privilege__add_child('sim_admin','sim_template_creator'); + + Index: openacs-4/contrib/packages/simulation/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.adp,v diff -u -r1.23 -r1.24 --- openacs-4/contrib/packages/simulation/www/index.adp 18 Nov 2003 09:44:31 -0000 1.23 +++ openacs-4/contrib/packages/simulation/www/index.adp 2 Dec 2003 13:46:53 -0000 1.24 @@ -16,18 +16,19 @@ <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/> </div> -<div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid black;"> +<div style="margin: 4px; padding: 4px; border: 1px solid black;"> <h3><a href="yellow-pages">Yellow Pages</a></h3> - - Todo... </div> +<if @citybuild_p@> <div style="margin: 4px; padding: 4px; border: 1px solid black;"> <h3><a href="citybuild/">CityBuild</a></h3> <include src="/packages/simulation/lib/sim-objects" size="short" display_mode="display"/> </div> +</if> +<if @simbuild_p@> <div style="margin: 4px; padding: 4px; border: 1px solid black;"> <h3><a href="simbuild/">SimBuild</a></h3> @@ -37,4 +38,5 @@ <div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid black;"> <h3><a href="siminst/">SimInst</a></h3> -</div> \ No newline at end of file +</div> +</if> \ No newline at end of file Index: openacs-4/contrib/packages/simulation/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/contrib/packages/simulation/www/index.tcl 18 Nov 2003 15:59:12 -0000 1.10 +++ openacs-4/contrib/packages/simulation/www/index.tcl 2 Dec 2003 13:46:53 -0000 1.11 @@ -11,6 +11,9 @@ set context "" set user_id [auth::get_user_id] +set citybuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create] +set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_inst] + ###################################################################### # # active_cases 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.3 -r1.4 --- openacs-4/contrib/packages/simulation/www/yellow-pages.adp 18 Nov 2003 14:22:56 -0000 1.3 +++ openacs-4/contrib/packages/simulation/www/yellow-pages.adp 2 Dec 2003 13:46:53 -0000 1.4 @@ -3,5 +3,5 @@ <property name="context">@context;noquote@</property> <p> - <include src="/packages/simulation/lib/sim-objects" size="yellow-pages" display_mode="display"> + <include src="/packages/simulation/lib/yellow-pages"> </p> Index: openacs-4/contrib/packages/simulation/www/citybuild/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.adp,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/citybuild/index.adp 13 Nov 2003 14:13:10 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/citybuild/index.adp 2 Dec 2003 13:46:53 -0000 1.2 @@ -4,7 +4,7 @@ <include src="/packages/simulation/lib/sim-objects" size="long" display_mode="edit"> -<if @admin_p@> +<if @map_p@> <h2>Map XML</h2> <p> Index: openacs-4/contrib/packages/simulation/www/citybuild/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 13 Nov 2003 14:55:26 -0000 1.2 +++ openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 13:46:53 -0000 1.3 @@ -8,10 +8,15 @@ {type:optional} } + set page_title "CityBuild" set context [list $page_title] set package_id [ad_conn package_id] + +permission::require_permission -object_id $package_id -privilege sim_object_create + set admin_p [permission::permission_p -object_id $package_id -privilege admin] +set map_p [expr $admin_p ||[permission::permission_p -object_id $package_id -privilege sim_set_map_p]] set notification_widget [notification::display::request_widget \ -type [simulation::notification::xml_map::type_short_name] \ 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.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp 13 Nov 2003 14:19:24 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp 2 Dec 2003 13:46:53 -0000 1.2 @@ -50,3 +50,5 @@ </property> <formtemplate id="object"></formtemplate> +TODO: Show on map should be read-only unless user has "sim_set_map_p" +priv on package_id \ 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.5 -r1.6 --- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl 28 Nov 2003 13:15:09 -0000 1.5 +++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl 2 Dec 2003 13:46:53 -0000 1.6 @@ -559,8 +559,15 @@ } -new_data { - permission::require_permission -privilege create -object_id [ad_conn package_id] + # TODO + # For now, assume we are always using this to create global objects + # When we use this form to create case objects, we should simply check for create permission on the case + # we could alternately switch to using the cr folder system, in which case: + # sim_object_create on package_id is replaced by 'create' on a root folder, and + # create on a case is replaced by create on a case's folder + permission::require_permission -privilege sim_object_create -object_id [ad_conn package_id] + set existing_items [db_list select_items { select name from cr_items where parent_id = :parent_id }] if { [empty_string_p $name] } { Index: openacs-4/contrib/packages/simulation/www/doc/data-model.dia =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/data-model.dia,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/packages/simulation/www/doc/data-model.dia 28 Nov 2003 13:28:57 -0000 1.5 +++ openacs-4/contrib/packages/simulation/www/doc/data-model.dia 2 Dec 2003 13:46:53 -0000 1.6 @@ -1,98 +1,95 @@ -��������}�r�8��>�B������H�`k�'����-�_ML�lrà%Z�$*H��o�)�)�A�P��SU��a^�8�܋��ϯ����$/�l��GJ���d�Ȗ�v�����㟷�����,��/��Uof�7�����e��˧OOOOd�\�e��u�H������������_?�f�^`������qY���c�̶�&���]���ʳ���c=j?n���|�g����O��??�/���:'���W�]��_�/���p̥wI�f��R>t\G���1�Q��]����y?շ���۵�n��H���U�=�#�ͺ~�����ի��^=�z���vY^�qZ[�˲uok#��H�*�Z����ƹ�x�ܧe��̣�#O�|86�nK�OC^�!IW����o��}��X����8�q��9E_�>��O�6�l���i�ޭ��9�~�����\��Uk�ۯ���:��Hx/R��t�=/�ᘎ+=�}�{��q���V#d�L���$�_��o��l��}�7O!���dQ���u��x��rv;�{���[�#C�t���ߜ��Ӝ���t�Gh���E�ApC9m���ot]��y�\N ޮ�Ɂ���.�摀�3���M����qd2Ռ*M7��1��#/�;���e�2����1��!�{��a6��Vׄ3r�C��D����+�x�<�h����k��Ƿ7�t=�*$?�;b�KMW�m�6C����x���������(��O�έ������L�t뺇�AK��p3#�n��1�2搾�%3��I���[��1$C��v�����q�z� -G�VԮ���ۂصB�.W�e�/;Hj�@R*↺!�(��R*S�[�r}V-�T}�3�5��jN2M��ӓ�~2�Pnw���W��q&&��q���3�+��2},N,u����#aft�"S鞝��ʿ�3��j3b7(6��^h�l���1bc���JhK��' ���_����u\-�kN��~ƣ��z)�O-�qjɵ�"�NNg��GǪz�%#b�����W��h�E�JZ�5�L�$S�k�5cO -�\?^Q����T|'7^��B��q��哏^PX7��<.��f�%١9��Nj��Mi��Y�s��I�����oP��ڍr�Y���Q#,:�6�6+v�"9��~��4����;b�[�e��M���Ũ���&*fP���T� -OG}��DLt'{5?�ue�w�wƮ��w͞�`�3s����G�����}�Z�R����C?n֯����G -�F��~>�n�F�۶�'�xK����Y��%]�����k�i>�5ee#�hT,��c�����Y S���f�}�,�b��;��r� G9�TF���� -p�h�f!7k��j��F5����.��2=\��x�ފ�����=Xl��p\����̢\�v�.���E\�8��38�y�����:㠃Uй*��\|+!��S���I�%�*�^�_6X3�����n8`��ث����usۍ�����.hE�P@���BX�O�=a�� ��$���X@�j��y$�=���LU��|�����{�M0M��br鴹v2⺮w���z��v� ��{�a��ۻ��U��8�b=�2�/��s��曕�zS(u��°���i89�����͕�����Ķs�U�g,��/�> ]�W]������u0���W+K��ߧ�eE���p*�M���E{�i89�u�� -a�4n�n��;˅�s;��K�Y�Y�B[����������n/k*��ڎB7�� -eL. �ݎ��S�A8�V�1�'����w�p�K���mt�f���\�C�Sa� -�g�F����:�C��D�G�l�7lS�3٘�_�\"�g�ș�) �������K�&�'��ةks -g��0���s!�.�t_~j~d�\:k\qa����o��)�����7�QV��3�&����pH`��G6}��2�[�㮠K?Z�5?Z�5?Z�5?Z�Oj ��њ�-����&Οg_���}���W鵌�x6i���]��P��]�%e$����H��$�q��w_2� -�������vlA�A�ބq�����(�%^e�%.����6'���}N%߇_�U�]�;=�����| -�A���y�E��J�)w������ٿ<eV�go?>���[h\u��;Y��:��4�Ce����$���fY�0�<�J��Z�f� �#����u%� -!���� +��������}As�8���~����a�� ��vo����z�7�{/ua�-sK$=._����l�(R BU�_Wtwن�ŗH�|������Y����E�m�H��q�l�2ݮ~�����V|��_>��2��"�]��f&c[��~��P���|����D��E\f9Y���H>��x��?�A�>��a6��˸����ߍ�2O��d��7����ŗU�=n��Q�q�l����?�t_�����2��s�ڻx���I���Ҏ�'�\z����nvY��!���hH�u���U�A��/?�������7ޮ�v��F�M�����l����/�`���^}m��ի�E���2�����]���x[���E2�P�����85 +�0��o�>-ˬge��YxJ��ñ�t[��I�z( +/_��C=�*O�������T�)�����Z��g{����:i������/�<�囟Q������;Q_�s�Z��'|�"�zL�I������~ا�����`�o5B���:~N�����,�����|����K�~z�XgO��8/g���e_?�?2�I�?��9|>�ɫI'~�v��[t7��朏�F����W����j�X���!��o �8s�:�D�,�G&Sͨ2�t� +���?�⍫���]�/������b�7�f#�nuM8#�Q<dOQK�������Èf��L��{|{cL�s�B�q��#v?��tE.ٶl3��?��7��Y�O�->Ί�Y�D���_��d���L�{��N-��73r�f��+c�\�0CkM�tn��C24_m7I�G�l7-��p�mE� +>�-�]+�r�Y���s���$��p!n��2�+�2廵)�gՒI��>#�XӚ��$��Y>=y}��'s �v�{���gbb��غ1S�RQ/����RGܞ���?f�@*2������[;s�VQ1#v�b�����flL#6Fl|�����V���x��x������\.]�EѲ`��ԑ_�g<J���Ҍ[Y��r��f�\�,���t�Kt���^2"�]���;�~E��6IQī��Zs�$O2��vY36!�Ԁ����Eը)�M�w�w�Ei+�.w�\>����uS�.��Rzk�^���z�:ߔ��5;�Y���Zh�\�E��Q��(w��x5¢�h�m�b/�����1O�|�����!&��]�~�d��!]���Inb�b���[8�Nũ�t�1�N�Dw���P�YWz�yg�*�|��Y:��=3�oK|4��i�ܷo��)u���=��f�:�/}�kD_���a��m�|ҏ�t�Z�� +Z�uZ>��κ���� YSV6��)�F�"k1F��ة�2eZ��`����2)y�S{> �r���Iet�.��7��6nr�&_ ��j�Q��.����.��E��ꭘ�[��=@Ѓ�p\��p��Y�,��mG��p��!�Y����8��s�g�9��3:Xu����Π�ŷ�O=eɛ��^b�����a�5�n +�qqh��V[���� +^7ױ�H�p^߿���V�P@�P��{(�U�����пH� z���_�G߳�[��T�[�W����8a`������-&�N�k'#��z��~��w�j����wP,�m��K<_���#(���,���2�8g�l�Y��7�R��/[�i,�����q���\9�я �Nl;�[5Ʋ9���Х~Օ��yߙ:[�>}������}ʌPVT�>A �r�t��=^������Y7]N�6O���fﺳ\�?W�#�����u/��y/kJ�������2��(t�P���P�����hm<E�sj5�|� +�g�'���;zq�F�j�����>�8�݀xֱm4;�-�#=T�L�z����{�65?��y���%BxV��i��0�/�*~�4i�|�yꀝ�6�pvъ +|�?�M�BN���GVɥ��W��?��@�r+���[}Ce��=�j�yj��V�|dӷ�/�u=� +���5?Z�5?Z�5?Z�5���К���B�]�n��y�%y�ݧ��|�^˸�g���}�%_%_ߵZRF��j���L��y�%����*)Zo�&���M���Yk�r\�U�\�r���lsB�X��T�}�-Y%���� �z�����|̞�[dۭ��rqGx���A����Sfu�p����{���U'H1�����OK1T�\O�*A��>a����S�t�P��k�H,\Wb��� �+ ���� --W�OA�8Р�A/����餋�}��tQ������#��x�y^)��7� -��+�W���^�x� -��+@�^�ȫ>������t��1�ܕ��:��nW��L�`o���[���r�m;/�jF���663��7Vt�<�LF��QS9y��W�� -���|=��/���c`��2�8c;d��W���S�e�ᥣu�]��}aj��iZ'���[�Xh�e�����/���4d��[}����=�7�h���/b0N�X���2�Jo�ċ����k�z3�P>$y2���͌�̲��lo�gV|��"��iz�&��B����}�������w�4����ay:�3�e���?�+6��ĩ�xD�sʨ��Q2�P��`�uz-�8�����&/=p��,�˖>�Sm�.=6,�8/{�Cj|q{��F���D���:lD��:lD����Y��j�Ϭ�wI#������,�l�'�5NM車�f?���d��?q� -��u�сP7@��u� -P7�u�[�xN���!r����{0I�/���A������I�y�^G���r���G�".T� �t��Q�N��t�@g(t����8�"\K���8���`�l��A����U�۬L�e\�&����z\���L���1��@��/�X�м�\H|~�����멮]FBu��:X~�bV>������������0����Wv���Pg����!��s�*��~��^ -D�����ՇPn�>Df�<�B�˧,�r�Ξ -ԅ�.u!��)t�$D]�BP��ԅ�.�Ԯ�%|DU�B�C�Cx�TN�B����G8rg[��@��K9N?n��8��K�J�/�3���9CWT"9@� �,�b��;h��r�"'ڤ��0}�՝�̨�Y"Կ��Z=C���Q�3��QG���g����hjz����^��yy����EկoP�A���y�� -�7(ޠx���̠B��RA � -z�}��B�|�n�pv:Z�Me��ۇD�=�����<r�V�Q�$v���;ñ��zXw��q�I�9@�>r��h�-��4]���;�ة`�NN�v��g$x�a�t@�̓$*��D})��:�k�S`�u -~@��� -"�g�^A���Ŕ��o}JDe�c���բ�I�S�� �Y�����'A����j���P���-�hE(Z�Q���s�C>|�U�q�1�7� X=$���!���֣��,����4 8É�� -�J�y�Ɋ�y�`����o(8�� -(8Pp��t -d� -(�8bȁ �j���7� -(�+��=c -��S�rh�Ŗv�����qJ��K��H��Cd� -��hH��(�/x����9��;� �Al��� -b�6��K ���A���x�*�����B��c�,n�W`�l�j_��'c�=rR�#�Y�J5��YX��s�#��gG�l46hl�ؠ�Ac��� -}6H�~VA>Ū�<h� -`�~\�j.5�u��a6�/�������8_�ng����x�k�M��lߘ�(���RN�l�2�0$>���> ��ձ�,/�j&���6�!���x��8?85xrY������3z�g#������챔~�X��5�'݂{���BO~�!����v�y�=uh�1�t�N��ӷ/LM�> M�l�M�]oq�y��d� }ݞ�,3���_�~|����e��e��ߦG���&�ȁy#v���P��z=إ�+;Lzd/���� v�q��Z�qWou���fƛ������}�;�C���bqa�q��|�s_s���q���3p�p�� -�1;�7/�K;~�bcQ�.#�HV��/�VY�����-{d�~���ưTS"�.v� -eG�`�o^����7���Gn�`�rZh� -;=h/�>�����]�̿�C��I��c ;?{��d{:�T�˸�Kn�O�O�O��"�o!������[%7֒>�pсO�OF�l��'�S�du�c�JVf��NE%�2f{{-�|<�W�5H1/Z��?��*�1��{���ܜk1M�|���k�:d7�z�7�Z8d�Tv淂�_�n -Ù����Ih�/4���F��g����6��Zh��Zh�t/�q�B-4�B-4�B-4N�x�����%�@���h��r�?G;4�,���۞&�̛�Rǽ��Yf夕��c��}��P����g�L��G�q�絉�Y����>|�8�q5w>|�8�q���ǝbd�*T���'L)����h� ����9 ��ц�:[�k��@3�4�I�'��ʶ�`G_��W���|��'ۖ ->�ڀ��hC�(�<^%��y��{�Np�MH�3�� ���5�WF�"ynt�F#ٶٵ�S�7`�-;�{8�қ�\z�~Q�y�[�O�/n�J�[#S���c@��`X;\w��=�;�1���p�Ѻϖ��]�O_L����D��� u=���I�#�c����`'}�s����w�SCN -95��ho�95�ԐSCN -9��n��ZQ5D;H�U�4Հ -R?W���z�����@�g�p�]�A� ��&�oac,A�4A[>O� -,���G�l���}g�����x�6�~+�ꐨ`�2����6�tr���_9 -�~�����H�m�G\Ƴe�d���J��?01��ٟ3�8�dI1�f�xȞf�z=�m�l����_�\�c|�N��½'���������F ����7Y�m�.ZT��z���]����p�<��d��J�c�����4��p���>ɵی�lf:�ڐPn5ak���S��_��~I��V�R�Sdm��E�Y۟B'IBdm��E�Y�;kk>�mMOr^9Oh��|� �|I�� ��FL��3�l���� -=6��4U�9�i����V��ʿ�F'���j01�a���o�܆��:8��5hk��8��5hk��(6i��%������é'�4p,�LKt�} -���2)y�+�H� -�3���n�JٍE����M�Am,9������E�����x�`�t�Sw�`�b��`�j�Uw�x�h�/�U\G�8���}��h��v%�> ���,1��oCJ8e���O���V��(�.�;ŵϳC�-oil���Ůy#�W�8�'��p2���r.7i,��d�5��x�F)�k�dij2�4�N��\�T��q,��3�<� -e�6z�P'�zB� JdP"se%2�P!� -TȠB2��A�LG���?*d�d�B2+Ȭ �ru�oBV.$�]V�B�����̟+ی�ae[x�vr�s�-c�Q��X�ぐeA�E����e���D�kr|��H��IZ�р�h=���oE@���I?��c��ɧxfW�O���*E��vy�CJ)tCN�Ω88,9�T�SAN9��9:���)ȧAM��6�.�6H� �ruI�r�UB]�U�<T�*. -�I������UB�\�����r��(W��ぱ��P'�SJI`ӏ�s[HC����\~��w�7<"B߶o�g����PwGG~y�\>!��Cێ�s����ܹ0v�C�M(d�jә++�Wv��za�%el�q`y��{��I�\�A�ѾQjn�h��eyڒ��l��=�Y������L�+[[�K_� O��� ��� -qu�W��S�8g�JS�S$��l~�$���p��Ӯ���u�ʝ�;��_Cqz��A�5�zPv���;�~�q�x���:��te&���@��2���V���ٵ��� -t��.=�F�o�3����wA��'���uA��.H\���.H�r$~�.HV��.�B$�b�ph�� �}�A�d�}H�!هd_K�_Ŏ��>t��s��E�Q����9�ǁ�{��7� -J^��䅳��#��M�[S�NX�s)o�G�����#A}��C��A���;�#����L2=�N�����}FX�{�O�ҧ�f�A *���>���>%�O������/ϧ7�� �Θ -�ޣ=1��˃���<�ړ`�=Q��ړ} ,�kO���^�Hqi���F�H(O�<���(O�<���(O4��U�n�P� w>6H�#y���f�6�aO�xr��N�Nv�/Jv���A���U������P�'����Nj܇�)J�(ߟ�ij,;�#�Z��t������.q]a��[��f��B�_�r�2��k�G�4�t�4?�?w�}�=�<������Tf��ńu - -U�F=E'���#���c���C^�q��ầ��@��նkW0�ˎ�x��b��Y杢%��7aH�B�^KH�*S��n ����qH�^���V}FpX�;��w.kz��pY=J0�N��+��,+��)J_L)%����+�&���W�QJ��5|�j����&��Ãm��px0�`ЃA=����>]q>�gSN�)r��m���jS���-η)2��Φ�'�_ڮ�]���/��~���E�a_�}�d�/¾�"싰/��}��L�,rΗ,r^�EuJϘ,rl'��K�=e���u��-�D�aK���I��"l��%["l�.���7?�/d7�Q��mn�А�ʒ��mH �"�m,���Z&�6ʯ -)����Z3Ԛ���;֚5�aRgH���}��5��&������g��������9�c�r�d�'���}K��h�-�y�u�0�cA�<x,�Xh�i��}��W����G�f�����`� -�t-S�*e�3���<�/��j��F5�2� � -���PPԠQ�Uи���s���3� j��u����tta6u̖ΠJ�IRBi���P@i���P@i��A?��?Bk����+-C�����+M~�'� Qw��U!Z�(�X����:��YvQ���CC��.��D%Y��80ML}~P����U=�pk�RNL��x�3T���������ߛg6�xO�o�S+]Utk��Jǭk��?�ʛV_����f��hjz�ġ�'��9�E�=�&ʓu�2|��!Ç6���!Ç2|���g�d�x���z��]A1��s!!~��q��� ���e��jR��Ə��R�+@E^��~ߗ|����j�`�X��t�9^u)`�i���/���a{ -��۪�}�Ҩk9/�~�K�[�q�a�%A�(�9j�̲<mIv����?sާGG`�@`2L`���ݽ�� ���b_)��Y��F����v�����[��o�6�ց����}�6�t�l�&N��8M��z�&�&�<߲������gr�^��<�;}�Y -��@�}&eg�2�~�07o�G ��Mo�L�S��o���mΈC�/�d�z�f�f#���b�x����W q��>�Y@��3��P;C��3��P;C�l]�~����hC�L�50��3��Y&�"Ow�'<9@���yoRݪ7� -p�V�ܬ%V�5@�����x��pZI�����6N�� -p��7�ī��ng�_��|��Q.�l�����hp\��0m-S%���h��<hpY-z���\a�8GuBeJ����%�2�}",'L2��8��=���8a�-��D?jP����&�6� �M@mjP���P -��P����3�M�r��&�7� -j���Am��6�nP����>����%�(���;(O�\�Gn�M�Ca`ؠ��x�g��2@�d�!��e�?$1��8��>p�B�h@ -P��7�Y.U�"P��5��4�2�|\U�f��#dg;~T�:8~T��?:�<����]�����=���=���=���=���=��<�9t��f�t��r�t��n�t��j���=���=���=���r���_��>ˁ����M��2Q:.��p���Am�&�^��e�/�n��k�V���@J�7� - �z��ތ ~u�[ -�c��ײOv��)�W�>����S�٥�i���#.�ٿ�e���ٓ1[g�t�հ�u�����n�LWA�PRj�)O�J������MH��ɨc����/�8�(����r��t��Z]�ܽc�'.��V�Q9�#ȼ�d� =���)3�X����On�����ʛ���g;LY���0e��V��}���ԩ���ꊵJ�8�x�+(�Bmj�P[��*�V�� -�U��Bmj����'Em0̠� -�rP[��7� -j��h@�cJn�3u���L��Ü)��9�)橗3 -/-g�SE��)�H�"q��)�H�"q��)�H��\�%��)0� q -��9H�7� -�@ -P��鏞8��(6U��.2u��BI�U��Wu��mח����~��3�\���W���� ?�L�3E�9S�L�3E�9S�L�u� -%�t �h9m���&�>���d�,��v@�]9�s�'�Qez�xe�淁��>%�Uj�|b:�� �"=��=W��s �@́�1b��9s �)�e J�(9��2��5����m����@��3�<�E�K!�n���9@��������O��5�&m�a�?��o���A\��F�=�b~���{��$��P��%�e5���l慕f��VH�.v�y��H~y-?���ap��X�QZ8���(�8/�8ϳ���������vuz -��H�c{�v����K�{Bo&�z>�N -���@�#���2}�e~���,����.�o��H`U?&]�*�Tv��v*?��Vd��ғ��V����_��h��H��b�N��A<�s?��c�A<��c�D<VE�g��f@�75�@ -�Nk�y��BQ�%�*��AZ�-��9]}�W�RO��y�[�i�V�(6��D�*�����k7/���J���R/��(�oTe��<ռ�<ma�:\D�g���$w��1I�P$wN'w�FrGI�0���v5����v��%DY��x�{'%T~����6�4��^�N�f�N�������v��An��v��9n�GngLn�|:����O���I=�ċ�t��!���V_+[͌����,�+��#��`�6�o}����Uf��n�_�8�F{j -��9��)����䶥�^�T.����W>!1hE̯�� ��u1R0� �f����C�#�2jV��<l�][b�jr���ޢ3~y�/F�J�X��g� Cz���N�`�s�=-��#W��g_ۖ*o�B���#!�|���)���_}��w-�68�4u��^@lf-)�����]�/��gF�]m��՟q6R�" - WF:����;�V�]�\�,�ƟB�|-���ƘΕ+?�A{�Z#���N8�VsG�k]���CO��B�x��R. �0��0�J��"+��j���v����}�7�e��˨�Ņ���a ��|���m�6;V�sN����Xg�x��`��=|�ޣ�%����K:��.� -��NMQu�*�%���]��A�z$t됟��}N�5[䑼ꦀ���]u��pX�;,Ѡ(�s9�`��*����)ϥ�ê�Q_��^���%S�$�����2�iMﴸ -��A�� }V@�08�ϪL�Ѫ�Z�T���K�r���B�� -F��u2��+�THhF�\�j8� -��YA�ޞ�pDm��.�����Q�ͨ��2"�@U��CU��]CBV��n�����m�T�hiQ\F�g�g;x��㜶7�iz��Y����F� <�j3d�)�6�L���o'¨��&a2/�.�&��ǖ���C���&)�x���P��P�t�.�B�.�0���A�Ӄb<���8�N����w/�(�� -�a�38�>��p.8�y�����:㠃U�A�K�ץ蘠�^pC�g����緁[����9�t��4B�a��hy���^��L��P������x�M��{���D��~�Zn��hy�66���Z��ƛm�|X�e���E�AMm�8�S���q���2.�t邇�jՃ�E���E��[i -5ⲁ�BĦ�VQ��'�"�z����=��k'�#Z+�0k'T$:����UKb�&�q�qBS2�FN�JL�%�n���L_2��1�1��t(M��&�B���@��M�m�G{2��>I�)��D/�]���(�N�� -����3��<�dOѵ'7���mê�xLj����eT��kgpmZ��q�+c�u�������Na�3)r6��}~�S���4����Le����~����(���W��'�)�I�l�:��o=Z���ujRf��Tg=٢&_L��]C �%J#�2t�$C �%J0�`(�K�ԡ,8Jp��(��(��6YV��)�Si���JӜ}Q����"�˨j� -�]�\���ك�f��%���,��3�8;�vqQFe�-�6� -h���d���}���p�g����S�\D�6�['�h�l��%�-�b��;��3��>M�I"e��Pb�����|�@�������ߺ���4my�t2��^�Mh>����U�q_lPm�jT۠�f�j�A? T۠��6��A�ͻ����R���[n���(�\%���*������M��-|NW��կ�6i#1}�3��&G�w���P�緾OBu���Rp����CTMb����z��Qo�s�A���i������3z�g#Ϣ��L������F��/v������c`��9�o��"W꼌�<Ϟ�?6F�/����������4�F�]�zF������LL�|F�Avxx�8B|�o��o�a�/;xc�B\�B�p�Z���S4ږ��(�UX��Va���*긖��eJ/SB�U���/Z+�4�¯�8cn�X��z�B��q��c��+Կb�N�{��0$���}�^�Ï��q~��w�CG��q�L��{�}�[ -�bw�T'�I3J��¹Ѳ�.�xj���#��gp��i���ث7/݂�*�Ү���Z�z��a�u3�1��[���N+��j�Mj��O�7����Ԣ���� �]��n����^�� �Ӫ�3Sۍ�;8��r'4vf -�A��K�f���A��1ѝt(��t��ަ��*f�W�Me�G?7��>[��l��Ӗ��j���Թ�j�wt�;���T�xJ 7���َ��e��6��K�RK���� -5�!����~|��3sݒ����y����q����.��� ������K��8��lD�Y �r���C�L��Y9@�E!gPb��\G�Xg�<�Q��4�1�8�҃Я��0���0 �e���u�!%�*��K ���c��l��-9$�~�1�/N?� -�c!���#�Z��qj.��r���U����� -VIȤE1vU�Z���c:��a�/�&���n�H�CLoN�tߜ�w����l���f?B�7o\ �lH���kDx�NWۮ�x�aD�:ʷ5*(랾).wU�S4�T%h�Q�E�.���U����J�6j����4��^Kߤ]�f�J~�J���T���s%:W�s%:W�u��$ ѹ�+ѹ�+ѹ�+��SO���[)7h��֕�u����+Ѽ83Ù�x0�yV���t���p�.g�E,�`v�0���imw����.���+k�[�!��~����$��G�e/�dF%;BRIm$���6Oj���8F$���FRIm$���m�d������X=�$GV@?��d��\��I�����Uo�����O�x +�+ ��q��t� +��h�^��N�ڗ>�H��Z���+0��W0��� +��^�x� +��+�W���^���ށ��s���~K�I�0A�]�˯3��v�ʔ��x8���j:P+�Ѷ��!�f4n�mc�1c9a}cE�����dz5u���Zxu�ސ{Z�׳�ܫ?�*É3�C��~�y�=u?Q�^:Z'�����&z���q�-�P�u���_�/���r8��KC�:A��W�H`ك~c�V�/�"ㄏ�h�)S���I�x����F�7��C�'�X������,�?�6��y���aŇ+R����i��-��^��gY��мN�y�z��A��|����:�^�^X�#�B`�qJ�ʎGd8����%c��Z��2�S�A�!>?9jo�1��������l�c<���câ��7:���~kd�qLMA����F����F-�Q9aޚ5�v��jy�4"�.�|~�ʢ�F{rMQ����N*m�c +�?��A���q]�s7@܀nLP7�u� +P7@��u�;Q7�ŏ�T8��"�.�����9�AtY�q��d�g�u4i+> ȹ~�,�B���@���T9<@�t�Bgʮ����.µ+��������Q��Z����$Z�%h@����*)�d-�na���������{ʅ��7�O�{ໞ��e$Th����/f�ϙ?�y�JL>���0Qi8y�a��x +u�?����Gk0g����P�@�*��N`P}���Ca�C,4�|��/���@]�BP����B'IBԅ�.u!�A]�BN��_�GT��*9��9��Le��(��;�p��#w�e���9@����3����/�ī$��<9@�3t�A%"��B�2)y���� g,r�M�I���C��^�yό��%B�J��3D�O%;s*�u �z�k�������,��7��-^Q��A��oP��g(ޠx�� +�7(�~�*�nл!2�����H.��W�v��g`����T��Q�}H�_Ѓi �h��#7jU��Hr`��3;诇u������#GN��6�2�O������ +6���$lw��xF�1�@g�t�<I�"�Kԗ:�S��:f\������� Bx6��)J_L���֧DT�=F��Y-Z�d�:��P��.�]P{T-�j�ʪ� +�hE(Z@��P������%(Y�178��q����]��q^xC� ��C���j���o=�N�r�ؘM��3��^��ԛgH�7�����IY��@��� +N��A����@�����#�����p܀¾2 +�3��]�0�.��Yliǭ��o'���Į��|n:D����ۊ��ʎr��G�8/��M�� +b�6�m� �Al�ؾb�$�ڞ�g��H�`��!!��8���V|�������|2V�#� �=��ծTӜ���=7=R۽`qv��V��Ac��� +46hl���g���g�S��̓V���6�ǥ�����Q#_�6`��8�?�x�����v�9]}�W��ۤ�������o(�$��f+3� C�����0�[+p���!�f2|~m��?�q��O��Q�'��i���)?�'~6����,�K�m�e-_�~�-�W,��'��~l�Q���S����KG�d�:}���D�Ҵ�ȶۤ��G���Of���Y�2SNM���� ��_��_�;�mz���njR��7bw� �xߡ׃]Za��äG���K�b��ͮew�Q'���jf�9�������A�8���/WN���@�1�5�'ܱ�:ww������z��Ҽ���*65[�2r�d�K��hՑ�1 +ٲGf�w��]ǼI5%��a��Pv�f>��Jy�|��z�� �)������Ӄ�"�qp�p�p��5q���:dz���?���C�ǮO���3Nž����@�d�d�d�,2k��>�]^��eqqQrc-9� +�d�d��f.��q�;�OV_9��de&��TT�+sa��������p�Z���Z�c����Wo�����ȧ�h��ݡCvC�7~C��CV�Aeg~+x�E@�v�0��N +��V�B��h�|v�*N�oZh��Zh���O��-4�B-4�B-4�B�d+���mmq�!ZDO�����!g�s�Cc�����iRμ�-u�J�eVNZ��8�h��'� +e�Q[�~V�tjz��y^����[�PJ�����ǁ�W�q�����ǁ�>|�)FA����@Ł�~� hω�����ܨ�2 �mȬ�E�h���4@��+��D}Z������t�js��>��p�d�R�G]�t�m�e�ǫ�t o��so� ν Ip�^��!AP����hU$ύ#�h$�6��q���ce��v�]z�K��/�8/{k�����U�kd�:�1}(�k��:�G|�>����3Z���վ�>��)כ���>��gU?=�<uD�b���}{줏z���6�rjȩ!���� + ���rjȩ!������Z�!��h��j����A��jS?�R�T��(��.�<H�#�8���#l�E#h4�F#h�� ���R�L��m>9���W���#���f\��B'P�D�ؕ�kٷCl����C�r���7����s�.�����g�̖�����Ŷ3|���'�s��߳��m�rV<dO�x����K����ٯY.o1�['�d_��`�N1dc���h#�a��Ử�>���-2{T�NWۮ���X}H@k���̏2en�˱�~X��J��d@H]R���mGo63��mH(�������)˿ܯ�z���$Zg�h)�)���"o���O��$!���"o��폝�5�2���'9��'��B�vl�$�@�h#�z��ԶB�pY��Nr����<Ueg~+|B��C��H��S5���͉�I`�ķrr�K������5hk�����5hk�����^�G��`������8��S�%zу�f`f��<ݕh����T�x�N���Ƣ�E�ч�&ݠ�6��f�u�"Z���c�t���:C��b���1C� +j���5�ت{��<����,��M�����>�Ts4FB��j��n�U����!%�2_~�'�zcu+�m�l������١Ö�4�ՇD�b�S�̓�yf8��^k9������6���pO���ĵ{6�4�?�G�Rg�x.q�ox�8���d�z�2v=Y��Q]��%2(���sC��A�*dP!� +TȠB�#v|��2H�D!�dV�Y��̊7!+�.+��~�V��ϕm����-<f;��9Ֆ��0�z��AȲ �"p��w˲x�a��59���s�Y�$��h@�s�Sv�" ��褟~�1�i��S<���'T�� �"�D�<�!��� +��!�R�T��� +r*ȩ ����ɜ��q��S��&�F�x��$U�T����9�*���*K��r���$[�P��X�*!�Q��D +�U�W���m��h���؏SG���)�$���չ-��!GzRo.������oۏ�ϳu`}O�;�#�#�<G.��AݡmG�9]}�W]�\�s�!�&2f��̕�+;��o����26�8��|���x��ڤM�� �h�(57~4p�Բ<mIwt6j������,X�Xfy�X�ە���/Y�'M��e�g��Æ��:犫CsѩK�3�N�)�)��e� +6�u]��_��}�i�T[ƺ^�N� +���8�x�� ��}=(;k��c��8 U<��J�|�2�vh ClZ�_��u����y� +���A�c#���������� q����� �f$�H�}$a�?_$�DžKm� +�|�pR84�h��>� A��>$���C��%ٯbG�A�n���йO�Ԩ�}H������=p��%/�V���E�S�&�e'������7ԣ����G���>x�!}Ġ�j���� +�ux&�w'�UZ��>#,��ڧs��U�� �O�u���t���ŧ�������ӛny�OğO�ў�������y�u�I�מ(S{��>��'S�S�c��4��I�[$�'P�@y� �'P�@y� �'I�*tD�H�N�;$ϑ<p���tɰ']<9@d'W';�%;q���JQ�*E�Dp�o�����d'5�Cv�%R��Ov�Y����|-�|�?A�UBUW�����vխ�W3F|!�v�t�b�B���#ec:Q���; +�>��n�U|�A~*�_�bº���A�������{��1F_�!��P�p����� +���j۵+���eGy���g�s�,�Nт�Û0$\�M�%� +�)AB7�q�m�8$p/�s�~�>#8��V��5�� +l��%�y'd�ҕR�@��`��/��� +��ox֕`����+�� +%X�>B +5�Y�`X�����`8<z0�������`��8�س) +��9��6E�T�)�W�����SgS��/mW��.����?f����"싰/¾u2�a_�}�E�]ھ�w&L9�K9�ɢ����gL9��Eޥm������:{["l��%��S�$I�T�D�aK�-�DUz曟���V�67Da@hHie�w��6��qV�6 +�Eg-�l�W�t��@���Z3�f�53�5k�äΐb3�� Wk*h�M��%�]�$�k;sU��s����dN�������:[@�"� +;`�ǂ�<x,�X����9x��ǯ�&�� +���&�E;4�C3?�F6�6Z��U��g��x�'^.-��5@�6j�d�@F2i�4��A��*�q'�P�<:eg~+<�1�:�����l��-�A�X)�����J( +�4���J( +�4���J�~>�-~���ZWZ�晓ƵW���O8�����B��QV�c �uh���$�Q��3�P�vquh'*�����Ɓib�8�/�ꉅ[�ȗrbT�[���x��w///�8���{�|S�Z骢[��U:n]K�H�9W���'5�|FS�+&-��8���-�H�i7Q��d���C�>� G�>d���C��?�'#�s����C^� +�!՞ ���|O���&.�eT�bXx��g0~T�2^:(�t�����$��@ +P��*?����KL�?���'�kP��V���F��X�y���_�&�:�kc. zF��Q�g��iK�#0m������>e8:�aw�����u?�N��JA�Ϣt4�5����7���̧�x˶)�� +d�[�I��dc5)p���iB���45Q����է}fx +>��R}�Ap��3�Bh�L�W�3);��90?�[x��AxC=J��lzKeJ���l~$�lsFj�}�$���7{6�Q�V��C�8�$��s�(���jg���v��jg���v��jg�"��s(����nF2eZ��`����2)y��<��r����{���V]�n�����f-��J�j�5=�c�8���J +<<n�q�n��F�q�&^%tv;����>���rQd�Tu�p��G8����i�h�*�p�?G;��Aˀ�j�S�@'(�rs�9�*SB�U'�. �i�a�8a�i�� |�!�}� �lw&�Q����&�6� �M@mjP����&�j�O��`�Am��6�nP����5@ +j��� � +p������(YF)�5`�Ay���8�pm� +��U=��c<�l�2� ���,��!�ѭ��p��*Fj��F�9�r���������d���|0�!;��������I�y�Ǐ��l������������������@͡�0̠��䠻pܠ�P��5����8����7����>���,�RD�Y��7��6n�H���q8���� +j��6�2�.�|)w[&_˶����R*��nH���G�f�GݪP��4��}��ƘN9��)������.�O����q���-��ͬxȞ��:[��x��=���mV�w�d� +ʆ�RCMyJU:��DtmB�oOFc��E�Yǹ�CQ���|�#^��m�����{>q�m��� A��'��i�/N�I�B?��~zp{/wи��V���=�a��Է�)SG��F@��Ӕ���N��7VW�Ujʼn?}�U�K^A�j�P[��*�V�� +�U��Bmj�P[�<)j��`�U@���*��nP[�@��Sr��-g�L�L��gșN1O��ixi9Ӟ*B$N�8E��S$N�8E��S$N�8E��(9$N�`�S �A��n�8j�$N�ĩ?E��:X�v��åJB�ҥ����0n��t������m���f�����!g��)r�ș"g��)r�ș"g:�s�k(�K @�ic��6��yv�&�e����r�ȹ���>a܈*�c��+#7� +� +�) �Rs����a�9�xv�2.���1b��9s �@́�17L�-�HPr�@ɡ�d�AF�(]m�e�g(v��A�.�] +i6pܠ��rΈ��t�����o�6i�c��C��X��0��7��9��[O����7� ��&��l�(�.���e�0/�4t��@�w�k����G��k�����{���B���!�HGQ�y�y�=5/���5�x�N���S�Fz����g�^��z31��uh������/��_�g9L44v�^xC]F��1�U���#��S�I� 3���|,���Χ,�r��@[�E�t x�1�Ǥ����v �x�1�� {'�*z<�x,�0���aj��vZ{�s��2.�V�0�8��*oi����s��H�Ȑzf��BL3��G�q,$�W��0P�'�X�y��'UZfזzq�G9}�*������i��"?�'~� ���Ir�"�s:�4�;bHr����l-�#�y����C�.!�Jm�S�;)��&�g�y�����w�6�wZ����/�� ���r;�� �����s;>r;cr;��AvǸ��}�UH��&^<�� +Q���Z�jf�5�f�XQ�٠�{�a~��5]��2�|u����9d�0�SS��A�NYǏe&�-�r�8���� ��C+b~mw�N�<�����MH5Ӈ�N: �Q�(��a����Ts�������|12��Pb��.?���;�ew����i� ��b�-�ڶTy�0*� +� ��L� +DH��k��k��� �����b3kI�����7�|��83�x�jsw�����Ji�H��3�a?HO��ޱ�2���e�7���k��W6�t�\�� +�#���t©�ʘ;8�]���͌z�V7��s��rI(�!�׀�VtY�NW�.�#���7���S��-�(7_F�(.��y5����oÀ��ٱ��szu~�:[ē����[�/�58�^�a�v�oPTtj���U�F�.�8O��W���#�[��t��sz��"��U7�����E�Ú�a�E��a�8,V9 +.���^Ly.�V�����2V�(��� ᴬ8�֗Nkz��m�, +ZUL���y|Ve�V��:�j<E]J�[��:.U0�`T��Q�]�BBC0��bT� WА8�8� +*��4�#jۮwA4���mF���Q��B|�"4����gv��_��oC�RFK��2�?�<��CM紽y�N�{'�J��t7��N��T�!�NI�g��|~+8F�4Y�y�u��6�>�T�T +�f7IQī](Ѕ](Ѕ��{t�@ +t�@�qtG�����M��w�/��x�E��m� +[����9����s���ϳ +�@��:���]z�.E�����=�'4�0>� +�:��G7�9���T��MG˻E��g*E�����g���m���[�h�&�M�S�r[�G˻�������6�l����,[�- +jj�š�:o~���@��G�q�K<�V�D/f�-��Jk �� +|h'"6 +��*,<���5w��(G,X;��Z��Y;�"�Б�U�ZS5�X؏�����7rBWb�,�p�4f������� �Cib�5��4��o�m{=ړi��IBN 6&z��=�F�tz'Vxm�V��m� e {��=�iէlV��cR�mܭ.�:�^;�k�b'�ۧXc����$XG=�NNw +��I���L��ӝ�~f�e�P��e�(H���P��(v�G��6�r?�M�O:g#'��|~���\ ����t�S��0�̤:��5�r`r��:J0�`(�P1���$!J0�`(�P��Cy^�e�Q��GihE���ɲ�~�O �H���W���p���Y^FU�o��:`�f? ���8�0�,�l�'e��g��p���2*�m�m@�-�%˴���d�,�3�8����"J���:YF;� +`�,�m��<ݩ�5p�g�qm�M)C@���|�=䓶���|�Te��� +���i�3���D�*mB�}�&@���b�jT۠��6�T�8����6��A� +�m�M� +X�ڼ�r�<EE��*!�Wy�\e��o���<m�s���~K�I�����7a8��x�#��8�߄�>��}�c(���d5/�j��6(�D�z�k<�,O[g�p%���?yu�Xf�5-���0��|�����M��h3���R�e�y����1j|�h�lW�� ̍�>��6����3z���'�fb��3�����3��[~��;;y������*���_�J���ѶT5Fa��Z�� +kՏ�VQǵ�Xu-S�x�ҭ�}�7~��Z��/~��s���gԫ~���k$_���u��+�؇!!��5����~~�ď;�����:b�ȍSg?�#���jPG�[��:�O�Qb>��v!��Sk����<���OW��^��x��U��v��0ע��OG[��I�i�ߒu�t?uZ�g�T�hmRS'�x}Z�1��7�ޤvNh�z�wC�P��j���V����n���� �ݐ[8��3S� +r�]j6mݨb�����CQg���6��T1s��n*K=�����غ�e���̝V�M4�εW[����9�v�b�S������v�$-C +� v�Xj��X�U�H�n��y��Nf���昙��؇�N�[ �D��|O�ht�p~H���wN_Z��pf#:�9@�����e����r. +9��-�:��:�晎�t�Q�Q�1��~�ՇY֏�a.�-�;� +)aT��]J(��k�g�@&o�!!�cЏA|q�1n��e��ײՏSs�G�3�̮�����V�JB&-����ײ/]�� ����~I7�.�v�ErGbzsڧ������-`�͌4��y��fC*�X#��u��v���S +#"�Q��Q�@�X��M)�p��������*A�/�v��������wU*X�Q[m�����X�&�4�W�CWb��:��+ѹ�+ѹҬse�$I�Ε�\�Ε�\�Ε�\yޞz*�=�J��@S=��|?�+ut�h^�����4ċ�γ��`�#u3��p9�/b���+��glOk�S��Uv��-�]Y�����w����M'���>j,{a'3*���Hj#����yR���1"���6��Hj#���6h$ۮ��\<��&9������p$c��:~N�_>�_�Wy��������+z � \ No newline at end of file Index: openacs-4/contrib/packages/simulation/www/doc/permissions-table.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/permissions-table.html,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/simulation/www/doc/permissions-table.html 1 Dec 2003 10:29:42 -0000 1.4 +++ openacs-4/contrib/packages/simulation/www/doc/permissions-table.html 2 Dec 2003 13:46:53 -0000 1.5 @@ -7,7 +7,7 @@ <TITLE></TITLE> <META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.0 (Linux)"> <META NAME="CREATED" CONTENT="20031120;15335300"> - <META NAME="CHANGED" CONTENT="20031201;11352700"> + <META NAME="CHANGED" CONTENT="20031202;11112200"> <STYLE> <!-- @@ -50,21 +50,21 @@ <TR> <TD HEIGHT=17 ALIGN=LEFT><BR></TD> <TD ALIGN=CENTER>Read</TD> + <TD ALIGN=CENTER>Create</TD> <TD ALIGN=CENTER>Write</TD> - <TD ALIGN=CENTER>Edit</TD> <TD ALIGN=CENTER>Read</TD> <TD ALIGN=CENTER>Inst</TD> - <TD ALIGN=CENTER>Edit</TD> + <TD ALIGN=CENTER>Write</TD> <TD ALIGN=CENTER>Self</TD> <TD ALIGN=CENTER>Case</TD> <TD ALIGN=CENTER>Global</TD> <TD ALIGN=CENTER>Read</TD> + <TD ALIGN=CENTER>Create</TD> <TD ALIGN=CENTER>Write</TD> - <TD ALIGN=CENTER>Edit</TD> <TD ALIGN=CENTER>EditMap</TD> <TD ALIGN=CENTER>Read</TD> + <TD ALIGN=CENTER>Create</TD> <TD ALIGN=CENTER>Write</TD> - <TD ALIGN=CENTER>Edit</TD> <TD ALIGN=CENTER>Mine</TD> <TD ALIGN=CENTER>All</TD> <TD ALIGN=CENTER>AddUser</TD> @@ -276,14 +276,14 @@ <TD ALIGN=LEFT><BR></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> - <TD ALIGN=LEFT>Can create and edit templates</TD> - <TD ALIGN=LEFT><I>create_template</I></TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Create</TD> + <TD ALIGN=LEFT>Can create and edit sim templates</TD> + <TD ALIGN=LEFT><I>sim_template_create</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> - <TD ALIGN=LEFT>Can change other people's templates</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> + <TD ALIGN=LEFT>Can change other people's sim templates</TD> <TD ALIGN=LEFT>admin</TD> <TD ALIGN=LEFT>package</TD> </TR> @@ -296,12 +296,12 @@ </TR> <TR> <TD ALIGN=LEFT VALIGN=MIDDLE>Inst</TD> - <TD ALIGN=LEFT>Can instantiate a template into a simulation and edit the simulation</TD> + <TD ALIGN=LEFT>Can instantiate a sim template into a simulation and edit the simulation</TD> <TD ALIGN=LEFT><I>sim_inst</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> <TD ALIGN=LEFT>Can change other people's simulations</TD> <TD ALIGN=LEFT>admin</TD> <TD ALIGN=LEFT>package</TD> @@ -354,44 +354,44 @@ <TR> <TD ROWSPAN=4 HEIGHT=72 ALIGN=LEFT VALIGN=MIDDLE>Global Objects</TD> <TD ALIGN=LEFT VALIGN=MIDDLE>Read</TD> - <TD ALIGN=LEFT>Can see all objects</TD> + <TD ALIGN=LEFT>Can see all sim objects</TD> <TD ALIGN=LEFT>n/a</TD> <TD ALIGN=LEFT><BR></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> - <TD ALIGN=LEFT>Can create global objects</TD> - <TD ALIGN=LEFT><I>create_sim_object</I></TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Create</TD> + <TD ALIGN=LEFT>Can create global sim objects</TD> + <TD ALIGN=LEFT><I>sim_object_create</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> - <TD ALIGN=LEFT>Can change other people's objects</TD> - <TD ALIGN=LEFT><I>write_sim_object</I></TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> + <TD ALIGN=LEFT>Can change other people's sim objects</TD> + <TD ALIGN=LEFT><I>sim_object_write</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> <TD ALIGN=LEFT VALIGN=MIDDLE>SetMapP</TD> - <TD ALIGN=LEFT>Can set and un-set on_map_p for any object</TD> - <TD ALIGN=LEFT><I>set_map_p</I></TD> + <TD ALIGN=LEFT>Can set and un-set on_map_p for any sim object</TD> + <TD ALIGN=LEFT><I>sim_set_map_p</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> <TD ROWSPAN=3 HEIGHT=54 ALIGN=LEFT VALIGN=MIDDLE>Case Objects</TD> <TD ALIGN=LEFT VALIGN=MIDDLE>Read</TD> - <TD ALIGN=LEFT>Can see objects in a case</TD> + <TD ALIGN=LEFT>Can see sim objects in a case</TD> <TD ALIGN=LEFT>read</TD> <TD ALIGN=LEFT><I>workflow_case</I></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> - <TD ALIGN=LEFT>Can create own objects in a case</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Create</TD> + <TD ALIGN=LEFT>Can create own sim objects in a case</TD> <TD ALIGN=LEFT>create</TD> <TD ALIGN=LEFT><I>workflow_case</I></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> - <TD ALIGN=LEFT>Can change other people's objects in a case</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> + <TD ALIGN=LEFT>Can change other people's sim objects in a case</TD> <TD ALIGN=LEFT>admin</TD> <TD ALIGN=LEFT><I>sim_simulation</I></TD> </TR> @@ -413,8 +413,8 @@ <TD HEIGHT=17 ALIGN=LEFT><BR></TD> <TD ALIGN=LEFT><BR></TD> <TD ALIGN=LEFT><BR></TD> + <TD ALIGN=LEFT><I>italics indicates simulation-specific priv or object</I></TD> <TD ALIGN=LEFT><BR></TD> - <TD ALIGN=LEFT><BR></TD> </TR> <TR> <TD HEIGHT=17 ALIGN=LEFT>Anonymous includes registered Users</TD> Index: openacs-4/contrib/packages/simulation/www/doc/permissions-table.sxc =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/permissions-table.sxc,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/simulation/www/doc/permissions-table.sxc 1 Dec 2003 10:29:42 -0000 1.4 +++ openacs-4/contrib/packages/simulation/www/doc/permissions-table.sxc 2 Dec 2003 13:46:53 -0000 1.5 @@ -1,43 +1,51 @@ -PK�����mT�/E�����������mimetypeapplication/vnd.sun.xml.calcPK���mT�/���������������content.xml�]�r۸��S�ڙ^E�HY�����&�mf�$S'����$$aM����i_n���)J�DJI��I2�D���w~q�ʗ?>>xB�cJ�Zv������dr����������.�����/���3��1vхG�(@D�]J��|��Ӈ�oA�mY�BD>�d�&����;�|~7 -�q,��-�J�u<ᵮ/��K��_$w�ZS!�ˢr���v�V�5��;}L���,�R+�1|��;�H�=g[���yJ?���l֙�bJ{4Y���`�BY�X�}L��))��Ķ#���?M�' -|Z@v��m�_L��H�ۡ���Ka��[y3�q�a�>le���ۑ'$���]r~��!C��S���VBi�������X:v�C�ϯ/c]/���3��t����B�"�$�n�1M��0���U�/0���9�ɍ�b�JU>A�c�����4��C&�߀��=��Xo@2Zr%3|z�F�胯����]}p9�SN�L{�bؕ�a�w!�rl:�#!�$�ێY,��\ť�b�9�8��Gi�O�L�'q%胔����7Kj��I�X{�=8v�9#L�i8b"� �n�lx~���g���LљQD�ᙶ��f -δutnQ�?��"Et>�t -�zv���E42��8���QD�ֶ�m2iKHg}m�f�����$�dڶ;��@�ɼ��t�=}H&���F�6$����ؚ:bE5��<0�y�=Ex2���<ʷC�8j�P����,�"�� 5�;Nw�G�����t����@����:�=.s -����0?�ҋ��v'��<��a�<i�'/<�C��"qQ�l�|?�B�6����(�Q� -�n�k'j���?t�?:����:�ԞS�xB�D�:e����4bjgl��[��RDdL�>+�ҜPќ^��*���E(A�8�}�0OM=T -�ð���jj(�#uR��9%K�g�)�,h8������Ä�NO;EuP���*��i��L��1S1�/^�j}�iUo�Z�tx�+�t֢}��8��W�+�9ڙc��1W f#�X�T���u�*3�� -����l���p�m_�v�J���=��{�P�Pn��T��\�D��{˪&*�J�Wo�~M�l���xLc��쳾=v��F����w]�Iz�����&=�08t�y�*�k -y�j�1W�U�{��(vR�.u9n���7Ii;�В�ܮ�C=)z���y��]�#��x��Gg�X��2'>v�ڈF��D��|���(�LM�s��c�>ܹ9��}zqMqP�X��e��S(��ߐ5b �E Čf( -�'�R��<�.⫲.�!ǐuWg���8� {36��n - s?��� ��� ����z}�A���b$�jQNab� -�2�c4��3=e|���3Q��� -��>��`=U�&JD&*͜��Du����L��&$���~�z/חI�K�s����S/�H7L�e�������u9��K��D�X�\I��<��<U�Gy~���5����7hX^�������7j������%:v�&nZ�CZxPF�:1��%��0j�:��ͱ��q�l�w��rة�쵑%�u0�R�@���:G�UO�Z�5 "s7ZV���Y��P ~iͯ\Z�RP.�k7�7���`(D���ɛ���z��H -*�W/�[ȅ\����ge���O�>=��\aƨ��2*Ԡ��-�h�������K������]�B�0�c��l��H�@�+!Oy��bX�F9��a�(��e~Ox����F������'��6� 8�bx��z����f���:���}�5�&�Yf��.xs��ʸ��0�"Ζ�쌸��.��\�kL�凱7Wƅ��K�B�\�P�����(���KX�.S������o6�N�c���cg;h��n���HLi�I��F��������l/��o�:�n��l�|06a��}����fh�B� �5*�U��+��=j��l�(_~��t*/hQ�a"�a���{qy���^��y�j3�)y^)�coj�vC(y hT�Hh�\�50,8"���5Nf�O^j�[�]��c@��;�j���4�:ٿ`E����*�S�|�Ę{����X���t���W��X�è��$[8�n���ݴw��0-��NNv�w�Ac˟~�>��9q(y��+_��2Hޡ��1m�t�uWEl�c�&bਢW�E�^�1X�t�ZwVNu�}��S!�#����|�dd#�bX��Zh3r�������\��f����E�j<[�1�>�^ -o�G�#��W��'����B2A��)b D4�Q��xE3,�C�e�^��| -��4���+��.�#��^�hw��˧!8�R��������Τ�i���1��W���lc,���h(��u��l'͑Y��g#�j|�N���4�Q�e�ŷ8�c@g��-�%C~��� �;���yM�tf�(�fA���]��]���9�Q#MF��9GYkSTlT�c.T@)�JfXL"����%yW�����n�ԋ��{�S�a$�r��6�̤`5[ZM���v5��H�~���\F�G�{�PH���{_%i����s*���'X�Jr� Ib�z_M����.{Th��L�i�e�ub�(3��Z��Kyy���2;sI4U�H�ǝ{J5 >�w�����"L4�5ĥ��\��Yҗ�-��7�{8I�UEUew�LFwo�4O��ۈf�Q^��z��s�<!�J$"m�_J�އ�*Z&Ե��C"�x��Д�[�9��0-U�ø��Ǝ5���JxR�8���~'�S�_��!�'� -回a����y}n9�iF�N_5{_�r��0ĩ�����+��z�����^��_�o�4� dt�8��M<��h�{�ǏHmv�G��C!1�`0��کb�3��?ʡ��,���� f�gIo@�z�e���ڎ�p���|�>. ��@�� -䨳���eMx�� ?��;op�)��#q�n�"|��⨡�m-�TY�}����t��;���������[�,����zz��]��_�p�z}m��� -�M�2�p��G�<�݈���_��3�@������G�G����P�/"j��O�\��e::-��2[+�Κ~J�Kɕ����PK)���6�����PK���mT�/������������ -���styles.xml�Xmo�6��_��C��%�m����i�i4ɰ}d$J&*�E�I��oz�%yk��&A���;ޝ�:�/r��0�v�Y�:��,!4[�7�o��,�a������\�qX���&,�L�W��W��ͫ�__;���JL?(���_�;���lr����u\mn��čV#�!�N�p�n�(O}��)�=e���]�A��WV]�{1�-et{��Ұ� G�Im���[��5���v�](�p�\��_]�o/P��>'�Ө��ZUZ��O#A�x��!���r�A|�?��2�H0�H�28�q��B���EK/&�K�ƿ��r�Vqm��nK��)��Mp�W�Jخ8���r����o�#� -�*t��i�$X��Qɪ��Z�:�#J"b��q��Οp�6�@�G��g�E�Up�3G��W:�[��pb��P;﮾܀�_G���e�bN�[mIUB���,�d�Hp���T*kԠT��q��V��^\(jvL -�{e�b\��y�4%9�Y�2��T-Ĭ����7W{f<TDDzO+[�V�2�����gĬ(s|ߦ؎�F>dyP���R De�f/�7*LA�V�șZ���}��DJ�<���lw�SA�G��XLH$��WNkl�5��L�@����) Fr�r$��5��x����g?'�n'/���;&F<��IN�4�.���w���Wɚ����R�!g���)��@0�>y -��Ӫ}/P��'�����k����L�\7���27${�\���s}�vcө|��揸��k$%��0�����*Hf�#�$n� �ګi�9LE ��������I eM��6�-&�f�o�)D��Ͽ��>Ym�wB8��/%j����V���[[1�ѩ$^�j.kwJ�[+���#9Y�D���6N�_�el��p�K���c����i�v��>Xg�0���1����QʾY�D���[Y�#�Ԏ-I������\��F�1d���G�-3���Kջ�*9�:T#�q!�2�I�+���,��ms��2� -�r��A��F��P�h�0l��6�7��#��=�͗/�G����,X�<�J�𤌉������>/�g�||��B%���'�}�Ϗ�S��$Σ@}�K��OC@+8��(�$�1Ml�x��>�-����z�|k4N[���V�)�fQZ�q:'y��X�0Z��wZ���c��������E�R�d��m�a�ݟT06B#KQ^�ި��~)]1���О�Yۃ`M�8�����x�ُ�d|�������LvY��or�<�z����������;�������0��� -�F�S�9\/�?n�� �6-�=s,Z��������P����o���]E��-�]E��/�?|���ϗ�?PKϓD~����PK�����mT�/��f^���������meta.xml<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE office:document-meta PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd"><office:document-meta xmlns:office="http://openoffice.org/2000/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" office:version="1.0"><office:meta><meta:generator>OpenOffice.org 1.1.0 (Linux)</meta:generator><!--645(Build:8693)--><meta:creation-date>2003-11-20T15:33:53</meta:creation-date><dc:date>2003-12-01T11:35:27</dc:date><meta:print-date>2003-11-27T11:46:47</meta:print-date><dc:language>en-US</dc:language><meta:editing-cycles>19</meta:editing-cycles><meta:editing-duration>PT5H13M35S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="2" meta:cell-count="126"/></office:meta></office:document-meta>PK���mT�/���������������settings.xml�Z�s�8����ם��[��T��Z�V�H1�!ay�~�>��8��Sg�9��_N����叵�++����+�z, HLj!b_ �I��B�������:YZz�L�ݢf�@�0��_L���Z�D�օ�6�;��-��I����i� -3$���P�c+���e.:cI���JX��])�C���$I���VXcD��(:�Nb�j�^c�Vդ��o`W�DE������o)7.�����ఖ��[)��R�|d`({L�+l���eBD�!]��A>|�� ϑ,wA��N.�� -߁�^�^=��|����#D,��V��v�R\��Xo��0�Z�~�! 4���)�4�s�G�#���x aP��TCϧހ�(`��n����z�%�b�Y1���oJ��.FA�Z0��%�����y(����ʜ����_6��1�;�=�b�[�%��-�(7��[n�ޢ*4�� ���� '��Ӄ�r��W�� - ��=q�$Og-��8��I���e�azcx�)j��`��S�LN�S������ U�� �6� �����Kq -���[��A)���{�}X܌=���^�~����<�����QU����ƔO�j���V;;/�_�����!#u �خ� F�@�"�л�m`D�x��c�]J12&�������2fV�����,����;79�־�@Y�����а� -���K�M���I��5��b.=J�oX ��Ӗ� ->>v��B���̩�ך�?[3ny��`�f��k9�Z������r��%9� -�b*ʇ�-*kG�rv�$�Cf%�����a�H��><?U�Fh���_�daÙm��gO;?]���i����T����g��e��.ݸ �m��O��1��SG#�--��Z% -k����u��,��~���24Z�l�:u&������p0SV&ms,�Nej��%�������`"_��F��P��[w}����RtӔ��E����7�6�,ͮ�~ -��N���tl0�g���c�i[i -ku��4�>t�����5|�Oܞ~7�mض_�����˾��;���!��eő;]Y*X����P �5A���Mn1w6���e�U5����[�G��5�M��8������\�!�m�|m�H\�],��P��s��OSkk7Ɨca�jzm��j=Jb���v����֣��rݙ�1��^��@ٯ7��?IY�R��<x�_,~b�����ܞ�I�職g�?�x��m?I�^��wU0��.�L}�5A��d�A��3�eA�.�̀'@�>����s�4JBR��� -�����a7� ٔ)E߯�@����-b�Y�]ػ~���J׃>O�J?�����#��|=��`�C�RN� -Βw9n����\2ٍ�=�L�㾕n�aDƘ�x6�* &������W���y/�4�PK -������Y$��PK���mT�/���������������META-INF/manifest.xml�ұj�0�O��n�ө;��)�ڃ3t�9Ȓ��!~����B��I��_p���q��kg3X� ����38T��+l7O�s^쪟r/ZiuC���A���Ϗ�����M�Ů?"�U.���`#�A���\C�o����5�s�Ft�w���$+��$f�ц"��S�e�cGȮ3ZI�Ƴ�c?�8��4 -�f0&�$�2@��&�WJ�x��?�1]C���r�C��u=����lK,��J�ai�iS�Y��/PKS�S�������PK������mT�/E�������������������������mimetypePK����mT�/)���6������������������B���content.xmlPK����mT�/ϓD~���� -����������������styles.xmlPK������mT�/��f^�������������������g��meta.xmlPK����mT�/ -������Y$���������������{��settings.xmlPK����mT�/S�S��������������������h��META-INF/manifest.xmlPK������Z������� \ No newline at end of file +PK������Q�/E�����������mimetypeapplication/vnd.sun.xml.calcPK����Q�/���������������content.xml�]�r�6�ߧ��3{HY����q����N�p�IHBM���^�Av_�O��(J�,JIP��v&����������< �1%�-��kD<�c2>o}��s{����/g��|��?_�:a�������G���/�~��� +������Ϻ[��q�{��$��go9N���S�z_����<�#�o����D��m�K�0t1���������.����u���@�bco�a��m��{��}�{�R�i����N��i_�tNOO��������α<����iW�w�mF\��#��aٛ@�Y~��B"}�D�~�Y2;�ap��(�?,���U�9��f�I�Vj�^�9?o�!�� B��%W�[t�~w�y$ +��#/�gZ' �L`(��',�������Ap wZ`D��#����7Q��5}���a�IQ>@��}v7� +'4�χL��b��˱ހd��If���R��o���Ǜ���p\M8�;�1"�aO*x�9߆��F��G0RJ{mMb�l��+u��̀��!C`����1i�L`��w������,i��R"�k�)���8��=�ěh����:G��cSD}��N��LYE��h`�ɑ����"�}SD'V{'���v-{0�":���=qM9=��N\�Xk�͠-! +�M۱�����%96ö��N�!ٌۃNo�7�d3p;��ɩc�f�v:���X^���t��llOO��_�d�囡��i$p�v��`12���]�w� �W5�p�������=w� �77�||�o���.}B.kGp����h�@��F����< +��)�e[iK�Z8���Q��W"�N�I� +8 +�~���L���*�ԚSxL�D�:%�his3�26�BL�N!dcL�)�2� +(/�W�E�� +9m>oJP���nj��W��J�~�����J��H��i֓%γ��<4�=4�]^�aCv�'��:�F�ld��$�W�U��-�3g/o��hX5��7�?^��:�5o]�@G~~� ��%���͊�^����|�Pd6j�fEf3X�.]}�Ѫ�)R��[S���B6�����,�ĕk�F+�s�2ױQ��FcQ�F�\�����8/���Qx����&��}��W� +T��<��]���ɚ���`�����r�ղk��+9�~/VRs�.�X���w��q#aě�U�-�zP�=�B��fz���L��)&>���dge��v���"�D�|��c�sLƪOj�3��b�s�3u�����3EA�c!A�O�ĺ<�n�5b Ĺ#hBS��ǜ�(CmA�e^�ېcH�NWg:+�i焃l�VŬ5�iO�m蠡x4���8i�:��C�y{>��.Z�(�&0��3�2`42�3}e|��зQO��� +u�_}���6���(M٨4��H6��,$,d��C���5�Q���,9����vI�ܨK"��gYh���{��uk��K�34 C�ﵜv�t-��[�yt ��w8m���@�~(6�*�Zi-�<�@S��h���t +Eu�{epIo�|� +��I��s5 ���J "Ӫ��E���⫬�(?�Ξ�uW!��<*���o?����I�r w]!��7�� +cɨ�_<�W�9�=P6����K@�`�>���<aG���R*�"��5����V���s�����f&��ȱ�'w�ү��)N��)뫕���b�\�'\�9�7(իi��� :����ߚ>�~�c�F���L�#&���5�K����7TH)N�������Ҹ��1��N�p}p�Sd���Nw2�S�YgP�kqfvö۳p��5��i��fv��vGݱ7��kMD��y^�lm\�bBk(L��hϓ�a���w<�c`��W6l�Iq�]��S\R�߀�>x�^X{�����sl��I�9���''�� �����G;�#����aw��w�/3�k���W�}�>�������}ȵ����N��������]_Ra���[ %O!����ق�87�:=�����!�J�P�A��N�]�q�t�[�T]��V��e��#S�Sv��l�0Tf�s�J��\,n�U��yo���sO���β5U�Z�4bF�^�m�����s�#��_�ށ_�^�˒#f���q{:/���y��O@Q9 ��'��Wm)eg�;�J�m�s�O���5d}u�~�˨�oh��eX�!6P�~�̔��_��E�&�җ���/Wę7�7?�����q����������$�(��=L�8S�[f�^��=�D�O2�ܤ�~��qk���)�L�D�G@�K)���t���yc���ΰi�U�����<�>����BMj���B���mJ�֫�;��=�X�Ղ�)�e%L #@�1!(�AJ^A�̧|�J���dv��ZH���Hi��=ן��_�Z-�oC"�YK�!�M�ͤ��iҭ2��j�4O�����E�AMql�:`�+�kx6�g�,�yj������4�Qƥ��&��)مf�eA�o��Lo��M-�f^�'Y��������f�{���Xz�Tc +d���(�T`.�C)��L���D +�q�~�^��b���,�|Uv@2.�^|�%1iX��.Cc�~�O +.]8�{��Z\.#d��s�}@��$64��'N�w���r@�1��ɾWR�$�Q�}90���m�(qS�yhL+>(ϫ��{!m�ſ�c]���g�X��A(��<�6��{ +��}�P� P�~n�3�h&p����3�W���_2������8NTVV^�rYB�u9�`9Ѷ.����*n��ڗ/U���uIL�܆0���95y�h�B��D2��j��D�_Y5�q�ȸ��@=-(G���%AY˘Rv? +��v+���:��W]�/�YV�䝪 +9�I�SAk:��:���.ب�f�+B�!N�俭���c4Y�x�X[(�KZ�����D��甽љxJ���GjA,����� ��)�P�j����B�C�'Yf��=�B"2Ė7�ހ8 +(��c�z�Z��p�����. �U��F��r�i���2ol�=�@�c*<��S��Byx�=iK��ҭD�֔x�2�qCɓľd)] +F>�V��~�l��C��?���Đ�)�������t���nQq=J�r�ɟ�=��_�[<\�����z�'���!��O���{1�5(x!���XBYu���?���I����?���?~LT*ӻ[���uWR���\ŗ��I�w�T]��PȰ����d�ȼJwE�!�e�"�tduOH���J%m�҂U�{��[>��]�i��SZ,J�Dȿ/�PK&�ɳ +�����PK����Q�/������������ +���styles.xml�Xmo�6��_��C��%9i����i�i4ɰ}d$J&*�I�I��/z�%yk��&A���;ޝ�<{(r�sA]��,pLc����ۛwމ{��������Wo��$Ƨ ��S� ��c�\ݾ�����z�Ybz��f�g�~s��s�Ɂc|���q��Y"7Z���T���]KY��>�SX{�<�<�v��=��5ju�䤶Rh����Z�VO8�Lj+`��OY���lf��.�����j�<�~���Z�V���H�D=^�}6d�x�@�O�5ZF�=�$�28�q��B���EK/&�+�ƿ��r�Qq���ݖ&kS��8�Rخ8晢r�5�Br� +�7̑s��]'eF=E�W�ST2�j@�\�sDId��#Nt����nКh�H��¹�b� g�p�if�s|-�N̝[J�``���׃����1{�S�I�rņ��?S�djR�D�ST�R�F-J]��[��ҋKE����^����;�!��$G4�P�ꅘUTr8��znj�At,��rm�֥��Zfm��3bV�9~hSl�n#�<(�[Vz QU���KB��@��)r���"c���[�R5�(�[��T�*q��p�5���q�94��!apx5�J�Y�$Q�F��5�Xܱ���ωZ���O +�-#�d�$'�4�*���w���Wɚ����ҷ!g�Ꞥ)��@��>y +���j|/P��'����=�+����L�Z5���2�${�\��ٹ�ss�cө|���XLﵒ�f���G^$;��r7�b�U4��"� +`��k}�gH[����h�I����t +�����/�OV���Nq�F��/�q�5i�q��V�{tj�'X�U�N�CK� �a)<R��HԾ�o�t�E^ +{��cs�r�x̙Dj�C*�V�"��o��U:�$��0J�7�ȡtt}+�p�ޱ!���pv���~��֖̓�����Ȭ��R�n�KNm���8��u�DĨ��h�x5�tۜ;�wL�k���rP� +�Fb�l8�5�y���{���5īm�CĨ�Z��拗�#x�Ќ{,N���!<)c�?�h�2����I��8�k��P)��z���#�����y�/{i�ih�a�şT;�I�*�ā�nh�h@��pK~�0�M���-�V`� +�]T��F��I�n%61��������Xcl^��������hWʭLغ-*�u�'�Fhd)�E���W���P��. +��:k;jS=�'!�;4�c�#.�$v�C��8S]V���\;ό�$2滛��;<�N�-���u:�extB���Q��dW�ԏ�s?���,��pj��=O×��a�x(u����|r���~Q����Y����������џPK��L�}����PK������Q�/,o®���������meta.xml<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE office:document-meta PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd"><office:document-meta xmlns:office="http://openoffice.org/2000/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" office:version="1.0"><office:meta><meta:generator>OpenOffice.org 1.1.0 (Linux)</meta:generator><!--645(Build:8693)--><meta:creation-date>2003-11-20T15:33:53</meta:creation-date><dc:date>2003-12-02T11:15:41</dc:date><meta:print-date>2003-12-02T11:14:45</meta:print-date><dc:language>en-US</dc:language><meta:editing-cycles>20</meta:editing-cycles><meta:editing-duration>PT5H17M57S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="2" meta:cell-count="144"/></office:meta></office:document-meta>PK����Q�/���������������settings.xml�[s�J��ϯ��/��dݸ����D5���$�����̀fw�$�ꜭ�*&�=_�ܚ������%�R�( 1���})M��s�{��������~�*Їd¯5Cv@ƸnPL=�Y�Nd�փ�6�;��-��X-$��Y���֍T���,�~�I�^��k"��Ƽ��L���N�X,�ɵ�n���<=�GQtUb�R�V�c�Fդ�ٯ�Kr�"m��Q{�}�r�"Q_�O���Oa}����d�`��Ki[����(@����z�FȖ"¤z�B~ y��q�w�b�6t��Y�|o|"���z��YmW���D,��V���OR܆/X���0Ҭ���� +��BXz����s������MtBV�a6C?������c�`���k����r>t��hE X�0b}j���;��c�C�!�X����:����#���9��#@���9��6�QVLɹ�7�Æ� +�A��;�[n��^� ��D����C�f~D���ٓ��� Y�8o�u��&#eJR��7��S� +�g樥ʗ|Ff��c�9��)�a���Z̻� +E +�*���;4<U�P�>)�A)��H������4�?�2��p� +e�Bw|�.@�&��O�1[�T�V������F��z���X��>��8��Hs�܆#��kP�0�@8���oLG `0=ч�Y X�%��,�`��;��,�����"s?��������v��.��,P�/�������rf��� +d���%����X���=3z�<M<0�]LU>G������8z˒2��1��x���q�/2��O�}��c��ٷ���}����Y�/�zh���W�(/�����du���&E�=� +}��Ꝣ��-����ҞM��O�PQt��F�v�^WM�X������6h�̍�¹Ǎ���榋�AF���s�44*WE�m{��=��7�ѯ�����f�b�tK��Z��@�+�S�퇵~3�z��E��sG���`����љ�gwQ�W���ǘ�Ñ���0l _ZדN�̦7t'�qgZ�:�����cy=U��e��F���Wi��F������������� 2�hMn��r[�5UȧBވQ��Y�&�s���J��lެA5k��� {QmkM!����u[+ +{��@��:����?*�'� +S�WI��Z��r��������������+:�_���@�F���ѩx�]������������ϐ�wbV�a +~7֏�b��v��Ŏۿ��</'�U��!"Y�{�6� +dY�4���h߷�=@��<�]�IHr�����A��9O����I�Lk��v���)jFow ���j�}˰7�u3�M�z>Dp�3N-��>Q>փ��,[�*����4�6�-ib#�Lʑ�O�1t���=�(��JdW�hbB��Jf.����������PK�6�{���[$��PK����Q�/���������������META-INF/manifest.xml�ұj�0�O��n�ө;��)�ڃ3t�9Ȓ��!~����B��I��_p���q��kg3X� ����38T��+l7O�s^쪟r/ZiuC���A���Ϗ�����M�Ů?"�U.���`#�A���\C�o����5�s�Ft�w���$+��$f�ц"��S�e�cGȮ3ZI�Ƴ�c?�8��4 +�f0&�$�2@��&�WJ�x��?�1]C���r�C��u=����lK,��J�ai�iS�Y��/PKS�S�������PK�������Q�/E�������������������������mimetypePK�����Q�/&�ɳ +������������������B���content.xmlPK�����Q�/��L�}���� +�������������� +��styles.xmlPK�������Q�/,o®�������������������?��meta.xmlPK�����Q�/�6�{���[$���������������S��settings.xmlPK�����Q�/S�S��������������������F��META-INF/manifest.xmlPK������Z������� \ No newline at end of file Index: openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-create.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl 28 Nov 2003 16:55:52 -0000 1.1 +++ openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl 2 Dec 2003 13:46:54 -0000 1.2 @@ -7,12 +7,15 @@ workflow_id:integer } -set page_title "Create mapped template" -set context [list [list "." "SimInst"] $page_title] +set user_id [auth::require_login] +set page_title "Create Mapped Template" +set context [list [list "." "SimInst"] $page_title] set old_name [workflow::get_element -workflow_id $workflow_id -element pretty_name] -set name_default "$old_name Mapped" +acs_user::get -user_id $user_id -array user_array +set name_default "$old_name mapped by $user_array(name)" + ad_form \ -name template \ -export { workflow_id } \ Index: openacs-4/packages/simulation/lib/cases.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/cases.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/simulation/lib/cases.tcl 14 Nov 2003 14:31:41 -0000 1.1 +++ openacs-4/packages/simulation/lib/cases.tcl 2 Dec 2003 13:46:53 -0000 1.2 @@ -26,12 +26,13 @@ -elements $elements db_multirow cases select_cases " - select w.pretty_name - from workflows w, - workflow_cases wc, - workflow_case_role_party_map wcrpm - where w.workflow_id = wc.workflow_id + select wc.case_id, + w.pretty_name + from workflow_cases wc, + workflow_case_role_party_map wcrpm, + workflows w + where wcrpm.party_id = :party_id and wc.case_id = wcrpm.case_id - and wcrpm.party_id = :party_id + and w.workflow_id = wc.workflow_id [template::list::orderby_clause -orderby -name "cases"] " \ No newline at end of file Index: openacs-4/packages/simulation/lib/sim-objects.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-objects.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/simulation/lib/sim-objects.adp 18 Nov 2003 14:52:45 -0000 1.2 +++ openacs-4/packages/simulation/lib/sim-objects.adp 2 Dec 2003 13:46:53 -0000 1.3 @@ -1,2 +1 @@ <p><listtemplate name="objects"></listtemplate></p> - Index: openacs-4/packages/simulation/lib/sim-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-objects.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/simulation/lib/sim-objects.tcl 18 Nov 2003 15:59:11 -0000 1.8 +++ openacs-4/packages/simulation/lib/sim-objects.tcl 2 Dec 2003 13:46:53 -0000 1.9 @@ -10,19 +10,54 @@ default_value display } size { - allowed_values {short long yellow-pages} + allowed_values {short long} default_value long } } +###################################################################### +# Set general variables + set package_id [ad_conn package_id] +if { ![exists_and_not_null user_id] } { + set user_id [auth::get_user_id] +} + +set create_p [permission::permission_p -object_id $package_id -privilege sim_object_create] +set write_p [permission::permission_p -object_id $package_id -privilege sim_object_write] + + +###################################################################### +# +# objects list +# +###################################################################### + +#--------------------------------------------------------------------- +# Set up supporting variables for list + set add_url [export_vars -base "[ad_conn package_url]citybuild/object-edit" { parent_id }] +if { $create_p } { + set actions "{Add an object} $add_url" +} else { + set actions "" +} if { ![exists_and_not_null parent_id] } { set parent_id [bcms::folder::get_id_by_package_id -parent_id 0] } +if { $size == "yellow-pages"} { + set filter_sql "and content_type = 'sim_character' or content_type = 'sim_location' + and +" +} else { + set filter_sql "" +} + +#--------------------------------------------------------------------- +# Set basic elements list set elements { object_type_pretty { label "Type" @@ -35,19 +70,26 @@ } } +#--------------------------------------------------------------------- +# Edit column +# Put an edit link first if { [string equal $display_mode "edit"] } { - # Put an edit link first set elements [concat { edit { sub_class narrow - link_url_col edit_url display_template { - <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border="0" alt="Edit"> + <if @objects.edit_p@> + <a href="@objects.edit_url@" title="Edit this object"> + <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border="0" alt="Edit"> + </a> + </if> } } } $elements] } +#--------------------------------------------------------------------- +# Description column if { [string equal $size "long"] } { set elements [concat $elements { description { @@ -57,33 +99,37 @@ }] } +#--------------------------------------------------------------------- +# Delete column +# Put a delete link last if { [string equal $display_mode "edit"] } { - # Put a delete link last set elements [concat $elements { delete { sub_class narrow link_url_col delete_url display_template { - <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0" alt="Edit"> + <if @objects.edit_p@ true> + <a href="@objects.delete_url@" title="Delete this object" + ><img src="/resources/acs-subsite/Delete16.gif" height="16" + width="16" border="0" alt="Edit"></a> + </if> } } }] } -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 \ - -actions " {Add an object} $add_url " \ + -actions $actions \ -elements $elements +#--------------------------------------------------------------------- +# database query -db_multirow -extend { edit_url view_url delete_url } objects select_objects " + +db_multirow -extend { edit_url view_url delete_url edit_p } objects select_objects " select i.item_id, i.name, r.title, @@ -105,6 +151,7 @@ set description [string_truncate -len 200 $description] 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 }] + set edit_p [expr $write_p || [permission::write_permission_p -object_id $item_id]] switch -glob $mime_type { text/* - {} { 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.6 -r1.7 --- openacs-4/packages/simulation/lib/sim-templates.tcl 18 Nov 2003 14:22:55 -0000 1.6 +++ openacs-4/packages/simulation/lib/sim-templates.tcl 2 Dec 2003 13:46:53 -0000 1.7 @@ -81,6 +81,13 @@ </a> } } + clone { + display_template { + <a href="@sim_templates.clone_url@">Clone this template</a> + } + + } + } } } @@ -94,7 +101,7 @@ # ###################################################################### -db_multirow -extend { edit_url view_url delete_url } sim_templates select_sim_templates " +db_multirow -extend { edit_url view_url delete_url clone_url } sim_templates select_sim_templates " select w.workflow_id, w.pretty_name as name, 'placeholder' as description, @@ -119,4 +126,6 @@ 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} ] + + set clone_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/template-clone" {workflow_id} ] } Index: openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql 2 Dec 2003 13:46:53 -0000 1.1 @@ -0,0 +1,57 @@ +-- create dummy users for permissions testing +-- create each user and then assign appropriate privs directly + +-- this is a temp solution - should instead create all the groups +-- and assign privs to groups as part of normal install, and then +-- put test users in appropriate groups + +-- need package id! + +-- WARNING - all of these users are dangerous until they are added to registered user (-2) with +-- group::add_member -group_id -2 -user_id user_id + +create function inline_0 () returns integer as ' +declare + random_seed int4; + package_id int4; + user_id int4; +begin + -- hack in package_id + package_id := 581; + + -- set a random seed to avoid duplicate records + random_seed := trunc(random() * 100000); + + -- create SimAdmin user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''sally'' || random_seed,''email'' || random_seed,null,''Sally'',''SimAdmin'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_admin''); + + -- create TemplateAuthor user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''tom'' || random_seed,''email1'' || random_seed,null,''Tom'',''TemplateAuthor'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_template_creator''); + perform acs_permission__grant_permission(package_id,user_id,''sim_inst''); + perform acs_permission__grant_permission(package_id,user_id,''sim_object_create''); + + -- create CaseAuthor user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''cassie'' || random_seed,''email2'' || random_seed,null,''Cassie'',''CaseAuthor'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_template_creator''); + perform acs_permission__grant_permission(package_id,user_id,''sim_inst''); + perform acs_permission__grant_permission(package_id,user_id,''sim_object_create''); + + -- create ServiceAdmin user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''sergei'' || random_seed,''email3'' || random_seed,null,''Sergei'',''ServiceAdmin'',null,null,null,''t'',null) into user_id; + -- power to create openacs users + + -- create CityAdmin user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''cindy'' || random_seed,''email4'' || random_seed,null,''Cindy'',''CityAdmin'',null,null,null,''t'',null) into user_id; + perform acs_permission__grant_permission(package_id,user_id,''sim_set_map_p''); + perform acs_permission__grant_permission(package_id,user_id,''sim_object_writer''); + + -- create Actor user and assign privs + select acs_user__new(null,''user'',null,null,null,null,''alice'' || random_seed,''email5'' || random_seed,null,''Alice'',''Actor'',null,null,null,''t'',null) into user_id; + + return 0; +end;' language 'plpgsql'; +select inline_0(); +drop function inline_0 (); + Index: openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql 1 Dec 2003 15:15:08 -0000 1.4 +++ openacs-4/packages/simulation/sql/postgresql/simulation-privs-create.sql 2 Dec 2003 13:46:53 -0000 1.5 @@ -1,17 +1,28 @@ --- privileges -select acs_privilege__create_privilege('sim_admin','',null); -select acs_privilege__create_privilege('sim_template_create','',null); -select acs_privilege__create_privilege('sim_inst','',null); -select acs_privilege__create_privilege('sim_set_map_p','',null); -select acs_privilege__create_privilege('sim_object_writer','',null); -select acs_privilege__create_privilege('sim_object_create','',null); -select acs_privilege__create_privilege('sim_object_write','',null); +-- set up privileges and hierarchy, top-down +-- syntax is select acs_privilege__add_child(parent, child) --- add children +select acs_privilege__create_privilege('sim_admin','Administer Simulation Package',null); select acs_privilege__add_child('admin','sim_admin'); -select acs_privilege__add_child('sim_admin','sim_template_create'); + +select acs_privilege__create_privilege('sim_inst','Instantiate Simulation Templates into Simulations',null); select acs_privilege__add_child('sim_admin','sim_inst'); -select acs_privilege__add_child('sim_admin','sim_set_map_p'); -select acs_privilege__add_child('sim_admin','sim_object_writer'); + +select acs_privilege__create_privilege('sim_object_create','Can create simulation objects.',null); +select acs_privilege__create_privilege('sim_object_write','Can edit other people\'s simulation objects',null); +select acs_privilege__create_privilege('sim_object_writer','Has write and create privs',null); +-- writer includes both create and write select acs_privilege__add_child('sim_object_writer','sim_object_create'); select acs_privilege__add_child('sim_object_writer','sim_object_write'); +select acs_privilege__add_child('sim_admin','sim_object_writer'); + +select acs_privilege__create_privilege('sim_set_map_p','Can toggle whether or not sim objects are shown on the map',null); +select acs_privilege__add_child('sim_admin','sim_set_map_p'); + +select acs_privilege__create_privilege('sim_template_read','Read Simulation Templates',null); +select acs_privilege__create_privilege('sim_template_create','Create Simulation Templates',null); +select acs_privilege__create_privilege('sim_template_creator','Create and Read Simulation Templates',null); +select acs_privilege__add_child('sim_admin_creator','sim_template_create'); +select acs_privilege__add_child('sim_admin_creator','sim_template_read'); +select acs_privilege__add_child('sim_admin','sim_template_creator'); + + Index: openacs-4/packages/simulation/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.adp,v diff -u -r1.23 -r1.24 --- openacs-4/packages/simulation/www/index.adp 18 Nov 2003 09:44:31 -0000 1.23 +++ openacs-4/packages/simulation/www/index.adp 2 Dec 2003 13:46:53 -0000 1.24 @@ -16,18 +16,19 @@ <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/> </div> -<div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid black;"> +<div style="margin: 4px; padding: 4px; border: 1px solid black;"> <h3><a href="yellow-pages">Yellow Pages</a></h3> - - Todo... </div> +<if @citybuild_p@> <div style="margin: 4px; padding: 4px; border: 1px solid black;"> <h3><a href="citybuild/">CityBuild</a></h3> <include src="/packages/simulation/lib/sim-objects" size="short" display_mode="display"/> </div> +</if> +<if @simbuild_p@> <div style="margin: 4px; padding: 4px; border: 1px solid black;"> <h3><a href="simbuild/">SimBuild</a></h3> @@ -37,4 +38,5 @@ <div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid black;"> <h3><a href="siminst/">SimInst</a></h3> -</div> \ No newline at end of file +</div> +</if> \ No newline at end of file Index: openacs-4/packages/simulation/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/simulation/www/index.tcl 18 Nov 2003 15:59:12 -0000 1.10 +++ openacs-4/packages/simulation/www/index.tcl 2 Dec 2003 13:46:53 -0000 1.11 @@ -11,6 +11,9 @@ set context "" set user_id [auth::get_user_id] +set citybuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create] +set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_inst] + ###################################################################### # # active_cases Index: openacs-4/packages/simulation/www/yellow-pages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/yellow-pages.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/simulation/www/yellow-pages.adp 18 Nov 2003 14:22:56 -0000 1.3 +++ openacs-4/packages/simulation/www/yellow-pages.adp 2 Dec 2003 13:46:53 -0000 1.4 @@ -3,5 +3,5 @@ <property name="context">@context;noquote@</property> <p> - <include src="/packages/simulation/lib/sim-objects" size="yellow-pages" display_mode="display"> + <include src="/packages/simulation/lib/yellow-pages"> </p> Index: openacs-4/packages/simulation/www/citybuild/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/index.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/simulation/www/citybuild/index.adp 13 Nov 2003 14:13:10 -0000 1.1 +++ openacs-4/packages/simulation/www/citybuild/index.adp 2 Dec 2003 13:46:53 -0000 1.2 @@ -4,7 +4,7 @@ <include src="/packages/simulation/lib/sim-objects" size="long" display_mode="edit"> -<if @admin_p@> +<if @map_p@> <h2>Map XML</h2> <p> Index: openacs-4/packages/simulation/www/citybuild/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/simulation/www/citybuild/index.tcl 13 Nov 2003 14:55:26 -0000 1.2 +++ openacs-4/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 13:46:53 -0000 1.3 @@ -8,10 +8,15 @@ {type:optional} } + set page_title "CityBuild" set context [list $page_title] set package_id [ad_conn package_id] + +permission::require_permission -object_id $package_id -privilege sim_object_create + set admin_p [permission::permission_p -object_id $package_id -privilege admin] +set map_p [expr $admin_p ||[permission::permission_p -object_id $package_id -privilege sim_set_map_p]] set notification_widget [notification::display::request_widget \ -type [simulation::notification::xml_map::type_short_name] \ 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.1 -r1.2 --- openacs-4/packages/simulation/www/citybuild/object-edit.adp 13 Nov 2003 14:19:24 -0000 1.1 +++ openacs-4/packages/simulation/www/citybuild/object-edit.adp 2 Dec 2003 13:46:53 -0000 1.2 @@ -50,3 +50,5 @@ </property> <formtemplate id="object"></formtemplate> +TODO: Show on map should be read-only unless user has "sim_set_map_p" +priv on package_id \ 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.5 -r1.6 --- openacs-4/packages/simulation/www/citybuild/object-edit.tcl 28 Nov 2003 13:15:09 -0000 1.5 +++ openacs-4/packages/simulation/www/citybuild/object-edit.tcl 2 Dec 2003 13:46:53 -0000 1.6 @@ -559,8 +559,15 @@ } -new_data { - permission::require_permission -privilege create -object_id [ad_conn package_id] + # TODO + # For now, assume we are always using this to create global objects + # When we use this form to create case objects, we should simply check for create permission on the case + # we could alternately switch to using the cr folder system, in which case: + # sim_object_create on package_id is replaced by 'create' on a root folder, and + # create on a case is replaced by create on a case's folder + permission::require_permission -privilege sim_object_create -object_id [ad_conn package_id] + set existing_items [db_list select_items { select name from cr_items where parent_id = :parent_id }] if { [empty_string_p $name] } { Index: openacs-4/packages/simulation/www/doc/data-model.dia =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/data-model.dia,v diff -u -r1.5 -r1.6 --- openacs-4/packages/simulation/www/doc/data-model.dia 28 Nov 2003 13:28:57 -0000 1.5 +++ openacs-4/packages/simulation/www/doc/data-model.dia 2 Dec 2003 13:46:53 -0000 1.6 @@ -1,98 +1,95 @@ -��������}�r�8��>�B������H�`k�'����-�_ML�lrà%Z�$*H��o�)�)�A�P��SU��a^�8�܋��ϯ����$/�l��GJ���d�Ȗ�v�����㟷�����,��/��Uof�7�����e��˧OOOOd�\�e��u�H������������_?�f�^`������qY���c�̶�&���]���ʳ���c=j?n���|�g����O��??�/���:'���W�]��_�/���p̥wI�f��R>t\G���1�Q��]����y?շ���۵�n��H���U�=�#�ͺ~�����ի��^=�z���vY^�qZ[�˲uok#��H�*�Z����ƹ�x�ܧe��̣�#O�|86�nK�OC^�!IW����o��}��X����8�q��9E_�>��O�6�l���i�ޭ��9�~�����\��Uk�ۯ���:��Hx/R��t�=/�ᘎ+=�}�{��q���V#d�L���$�_��o��l��}�7O!���dQ���u��x��rv;�{���[�#C�t���ߜ��Ӝ���t�Gh���E�ApC9m���ot]��y�\N ޮ�Ɂ���.�摀�3���M����qd2Ռ*M7��1��#/�;���e�2����1��!�{��a6��Vׄ3r�C��D����+�x�<�h����k��Ƿ7�t=�*$?�;b�KMW�m�6C����x���������(��O�έ������L�t뺇�AK��p3#�n��1�2搾�%3��I���[��1$C��v�����q�z� -G�VԮ���ۂصB�.W�e�/;Hj�@R*↺!�(��R*S�[�r}V-�T}�3�5��jN2M��ӓ�~2�Pnw���W��q&&��q���3�+��2},N,u����#aft�"S鞝��ʿ�3��j3b7(6��^h�l���1bc���JhK��' ���_����u\-�kN��~ƣ��z)�O-�qjɵ�"�NNg��GǪz�%#b�����W��h�E�JZ�5�L�$S�k�5cO -�\?^Q����T|'7^��B��q��哏^PX7��<.��f�%١9��Nj��Mi��Y�s��I�����oP��ڍr�Y���Q#,:�6�6+v�"9��~��4����;b�[�e��M���Ũ���&*fP���T� -OG}��DLt'{5?�ue�w�wƮ��w͞�`�3s����G�����}�Z�R����C?n֯����G -�F��~>�n�F�۶�'�xK����Y��%]�����k�i>�5ee#�hT,��c�����Y S���f�}�,�b��;��r� G9�TF���� -p�h�f!7k��j��F5����.��2=\��x�ފ�����=Xl��p\����̢\�v�.���E\�8��38�y�����:㠃Uй*��\|+!��S���I�%�*�^�_6X3�����n8`��ث����usۍ�����.hE�P@���BX�O�=a�� ��$���X@�j��y$�=���LU��|�����{�M0M��br鴹v2⺮w���z��v� ��{�a��ۻ��U��8�b=�2�/��s��曕�zS(u��°���i89�����͕�����Ķs�U�g,��/�> ]�W]������u0���W+K��ߧ�eE���p*�M���E{�i89�u�� -a�4n�n��;˅�s;��K�Y�Y�B[����������n/k*��ڎB7�� -eL. �ݎ��S�A8�V�1�'����w�p�K���mt�f���\�C�Sa� -�g�F����:�C��D�G�l�7lS�3٘�_�\"�g�ș�) �������K�&�'��ةks -g��0���s!�.�t_~j~d�\:k\qa����o��)�����7�QV��3�&����pH`��G6}��2�[�㮠K?Z�5?Z�5?Z�5?Z�Oj ��њ�-����&Οg_���}���W鵌�x6i���]��P��]�%e$����H��$�q��w_2� -�������vlA�A�ބq�����(�%^e�%.����6'���}N%߇_�U�]�;=�����| -�A���y�E��J�)w������ٿ<eV�go?>���[h\u��;Y��:��4�Ce����$���fY�0�<�J��Z�f� �#����u%� -!���� +��������}As�8���~����a�� ��vo����z�7�{/ua�-sK$=._����l�(R BU�_Wtwن�ŗH�|������Y����E�m�H��q�l�2ݮ~�����V|��_>��2��"�]��f&c[��~��P���|����D��E\f9Y���H>��x��?�A�>��a6��˸����ߍ�2O��d��7����ŗU�=n��Q�q�l����?�t_�����2��s�ڻx���I���Ҏ�'�\z����nvY��!���hH�u���U�A��/?�������7ޮ�v��F�M�����l����/�`���^}m��ի�E���2�����]���x[���E2�P�����85 +�0��o�>-ˬge��YxJ��ñ�t[��I�z( +/_��C=�*O�������T�)�����Z��g{����:i������/�<�囟Q������;Q_�s�Z��'|�"�zL�I������~ا�����`�o5B���:~N�����,�����|����K�~z�XgO��8/g���e_?�?2�I�?��9|>�ɫI'~�v��[t7��朏�F����W����j�X���!��o �8s�:�D�,�G&Sͨ2�t� +���?�⍫���]�/������b�7�f#�nuM8#�Q<dOQK�������Èf��L��{|{cL�s�B�q��#v?��tE.ٶl3��?��7��Y�O�->Ί�Y�D���_��d���L�{��N-��73r�f��+c�\�0CkM�tn��C24_m7I�G�l7-��p�mE� +>�-�]+�r�Y���s���$��p!n��2�+�2廵)�gՒI��>#�XӚ��$��Y>=y}��'s �v�{���gbb��غ1S�RQ/����RGܞ���?f�@*2������[;s�VQ1#v�b�����flL#6Fl|�����V���x��x������\.]�EѲ`��ԑ_�g<J���Ҍ[Y��r��f�\�,���t�Kt���^2"�]���;�~E��6IQī��Zs�$O2��vY36!�Ԁ����Eը)�M�w�w�Ei+�.w�\>����uS�.��Rzk�^���z�:ߔ��5;�Y���Zh�\�E��Q��(w��x5¢�h�m�b/�����1O�|�����!&��]�~�d��!]���Inb�b���[8�Nũ�t�1�N�Dw���P�YWz�yg�*�|��Y:��=3�oK|4��i�ܷo��)u���=��f�:�/}�kD_���a��m�|ҏ�t�Z�� +Z�uZ>��κ���� YSV6��)�F�"k1F��ة�2eZ��`����2)y�S{> �r���Iet�.��7��6nr�&_ ��j�Q��.����.��E��ꭘ�[��=@Ѓ�p\��p��Y�,��mG��p��!�Y����8��s�g�9��3:Xu����Π�ŷ�O=eɛ��^b�����a�5�n +�qqh��V[���� +^7ױ�H�p^߿���V�P@�P��{(�U�����пH� z���_�G߳�[��T�[�W����8a`������-&�N�k'#��z��~��w�j����wP,�m��K<_���#(���,���2�8g�l�Y��7�R��/[�i,�����q���\9�я �Nl;�[5Ʋ9���Х~Օ��yߙ:[�>}������}ʌPVT�>A �r�t��=^������Y7]N�6O���fﺳ\�?W�#�����u/��y/kJ�������2��(t�P���P�����hm<E�sj5�|� +�g�'���;zq�F�j�����>�8�݀xֱm4;�-�#=T�L�z����{�65?��y���%BxV��i��0�/�*~�4i�|�yꀝ�6�pvъ +|�?�M�BN���GVɥ��W��?��@�r+���[}Ce��=�j�yj��V�|dӷ�/�u=� +���5?Z�5?Z�5?Z�5���К���B�]�n��y�%y�ݧ��|�^˸�g���}�%_%_ߵZRF��j���L��y�%����*)Zo�&���M���Yk�r\�U�\�r���lsB�X��T�}�-Y%���� �z�����|̞�[dۭ��rqGx���A����Sfu�p����{���U'H1�����OK1T�\O�*A��>a����S�t�P��k�H,\Wb��� �+ ���� --W�OA�8Р�A/����餋�}��tQ������#��x�y^)��7� -��+�W���^�x� -��+@�^�ȫ>������t��1�ܕ��:��nW��L�`o���[���r�m;/�jF���663��7Vt�<�LF��QS9y��W�� -���|=��/���c`��2�8c;d��W���S�e�ᥣu�]��}aj��iZ'���[�Xh�e�����/���4d��[}����=�7�h���/b0N�X���2�Jo�ċ����k�z3�P>$y2���͌�̲��lo�gV|��"��iz�&��B����}�������w�4����ay:�3�e���?�+6��ĩ�xD�sʨ��Q2�P��`�uz-�8�����&/=p��,�˖>�Sm�.=6,�8/{�Cj|q{��F���D���:lD��:lD����Y��j�Ϭ�wI#������,�l�'�5NM車�f?���d��?q� -��u�сP7@��u� -P7�u�[�xN���!r����{0I�/���A������I�y�^G���r���G�".T� �t��Q�N��t�@g(t����8�"\K���8���`�l��A����U�۬L�e\�&����z\���L���1��@��/�X�м�\H|~�����멮]FBu��:X~�bV>������������0����Wv���Pg����!��s�*��~��^ -D�����ՇPn�>Df�<�B�˧,�r�Ξ -ԅ�.u!��)t�$D]�BP��ԅ�.�Ԯ�%|DU�B�C�Cx�TN�B����G8rg[��@��K9N?n��8��K�J�/�3���9CWT"9@� �,�b��;h��r�"'ڤ��0}�՝�̨�Y"Կ��Z=C���Q�3��QG���g����hjz����^��yy����EկoP�A���y�� -�7(ޠx���̠B��RA � -z�}��B�|�n�pv:Z�Me��ۇD�=�����<r�V�Q�$v���;ñ��zXw��q�I�9@�>r��h�-��4]���;�ة`�NN�v��g$x�a�t@�̓$*��D})��:�k�S`�u -~@��� -"�g�^A���Ŕ��o}JDe�c���բ�I�S�� �Y�����'A����j���P���-�hE(Z�Q���s�C>|�U�q�1�7� X=$���!���֣��,����4 8É�� -�J�y�Ɋ�y�`����o(8�� -(8Pp��t -d� -(�8bȁ �j���7� -(�+��=c -��S�rh�Ŗv�����qJ��K��H��Cd� -��hH��(�/x����9��;� �Al��� -b�6��K ���A���x�*�����B��c�,n�W`�l�j_��'c�=rR�#�Y�J5��YX��s�#��gG�l46hl�ؠ�Ac��� -}6H�~VA>Ū�<h� -`�~\�j.5�u��a6�/�������8_�ng����x�k�M��lߘ�(���RN�l�2�0$>���> ��ձ�,/�j&���6�!���x��8?85xrY������3z�g#������챔~�X��5�'݂{���BO~�!����v�y�=uh�1�t�N��ӷ/LM�> M�l�M�]oq�y��d� }ݞ�,3���_�~|����e��e��ߦG���&�ȁy#v���P��z=إ�+;Lzd/���� v�q��Z�qWou���fƛ������}�;�C���bqa�q��|�s_s���q���3p�p�� -�1;�7/�K;~�bcQ�.#�HV��/�VY�����-{d�~���ưTS"�.v� -eG�`�o^����7���Gn�`�rZh� -;=h/�>�����]�̿�C��I��c ;?{��d{:�T�˸�Kn�O�O�O��"�o!������[%7֒>�pсO�OF�l��'�S�du�c�JVf��NE%�2f{{-�|<�W�5H1/Z��?��*�1��{���ܜk1M�|���k�:d7�z�7�Z8d�Tv淂�_�n -Ù����Ih�/4���F��g����6��Zh��Zh�t/�q�B-4�B-4�B-4N�x�����%�@���h��r�?G;4�,���۞&�̛�Rǽ��Yf夕��c��}��P����g�L��G�q�絉�Y����>|�8�q5w>|�8�q���ǝbd�*T���'L)����h� ����9 ��ц�:[�k��@3�4�I�'��ʶ�`G_��W���|��'ۖ ->�ڀ��hC�(�<^%��y��{�Np�MH�3�� ���5�WF�"ynt�F#ٶٵ�S�7`�-;�{8�қ�\z�~Q�y�[�O�/n�J�[#S���c@��`X;\w��=�;�1���p�Ѻϖ��]�O_L����D��� u=���I�#�c����`'}�s����w�SCN -95��ho�95�ԐSCN -9��n��ZQ5D;H�U�4Հ -R?W���z�����@�g�p�]�A� ��&�oac,A�4A[>O� -,���G�l���}g�����x�6�~+�ꐨ`�2����6�tr���_9 -�~�����H�m�G\Ƴe�d���J��?01��ٟ3�8�dI1�f�xȞf�z=�m�l����_�\�c|�N��½'���������F ����7Y�m�.ZT��z���]����p�<��d��J�c�����4��p���>ɵی�lf:�ڐPn5ak���S��_��~I��V�R�Sdm��E�Y۟B'IBdm��E�Y�;kk>�mMOr^9Oh��|� �|I�� ��FL��3�l���� -=6��4U�9�i����V��ʿ�F'���j01�a���o�܆��:8��5hk��8��5hk��(6i��%������é'�4p,�LKt�} -���2)y�+�H� -�3���n�JٍE����M�Am,9������E�����x�`�t�Sw�`�b��`�j�Uw�x�h�/�U\G�8���}��h��v%�> ���,1��oCJ8e���O���V��(�.�;ŵϳC�-oil���Ůy#�W�8�'��p2���r.7i,��d�5��x�F)�k�dij2�4�N��\�T��q,��3�<� -e�6z�P'�zB� JdP"se%2�P!� -TȠB2��A�LG���?*d�d�B2+Ȭ �ru�oBV.$�]V�B�����̟+ی�ae[x�vr�s�-c�Q��X�ぐeA�E����e���D�kr|��H��IZ�р�h=���oE@���I?��c��ɧxfW�O���*E��vy�CJ)tCN�Ω88,9�T�SAN9��9:���)ȧAM��6�.�6H� �ruI�r�UB]�U�<T�*. -�I������UB�\�����r��(W��ぱ��P'�SJI`ӏ�s[HC����\~��w�7<"B߶o�g����PwGG~y�\>!��Cێ�s����ܹ0v�C�M(d�jә++�Wv��za�%el�q`y��{��I�\�A�ѾQjn�h��eyڒ��l��=�Y������L�+[[�K_� O��� ��� -qu�W��S�8g�JS�S$��l~�$���p��Ӯ���u�ʝ�;��_Cqz��A�5�zPv���;�~�q�x���:��te&���@��2���V���ٵ��� -t��.=�F�o�3����wA��'���uA��.H\���.H�r$~�.HV��.�B$�b�ph�� �}�A�d�}H�!هd_K�_Ŏ��>t��s��E�Q����9�ǁ�{��7� -J^��䅳��#��M�[S�NX�s)o�G�����#A}��C��A���;�#����L2=�N�����}FX�{�O�ҧ�f�A *���>���>%�O������/ϧ7�� �Θ -�ޣ=1��˃���<�ړ`�=Q��ړ} ,�kO���^�Hqi���F�H(O�<���(O�<���(O4��U�n�P� w>6H�#y���f�6�aO�xr��N�Nv�/Jv���A���U������P�'����Nj܇�)J�(ߟ�ij,;�#�Z��t������.q]a��[��f��B�_�r�2��k�G�4�t�4?�?w�}�=�<������Tf��ńu - -U�F=E'���#���c���C^�q��ầ��@��նkW0�ˎ�x��b��Y杢%��7aH�B�^KH�*S��n ����qH�^���V}FpX�;��w.kz��pY=J0�N��+��,+��)J_L)%����+�&���W�QJ��5|�j����&��Ãm��px0�`ЃA=����>]q>�gSN�)r��m���jS���-η)2��Φ�'�_ڮ�]���/��~���E�a_�}�d�/¾�"싰/��}��L�,rΗ,r^�EuJϘ,rl'��K�=e���u��-�D�aK���I��"l��%["l�.���7?�/d7�Q��mn�А�ʒ��mH �"�m,���Z&�6ʯ -)����Z3Ԛ���;֚5�aRgH���}��5��&������g��������9�c�r�d�'���}K��h�-�y�u�0�cA�<x,�Xh�i��}��W����G�f�����`� -�t-S�*e�3���<�/��j��F5�2� � -���PPԠQ�Uи���s���3� j��u����tta6u̖ΠJ�IRBi���P@i���P@i��A?��?Bk����+-C�����+M~�'� Qw��U!Z�(�X����:��YvQ���CC��.��D%Y��80ML}~P����U=�pk�RNL��x�3T���������ߛg6�xO�o�S+]Utk��Jǭk��?�ʛV_����f��hjz�ġ�'��9�E�=�&ʓu�2|��!Ç6���!Ç2|���g�d�x���z��]A1��s!!~��q��� ���e��jR��Ə��R�+@E^��~ߗ|����j�`�X��t�9^u)`�i���/���a{ -��۪�}�Ҩk9/�~�K�[�q�a�%A�(�9j�̲<mIv����?sާGG`�@`2L`���ݽ�� ���b_)��Y��F����v�����[��o�6�ց����}�6�t�l�&N��8M��z�&�&�<߲������gr�^��<�;}�Y -��@�}&eg�2�~�07o�G ��Mo�L�S��o���mΈC�/�d�z�f�f#���b�x����W q��>�Y@��3��P;C��3��P;C�l]�~����hC�L�50��3��Y&�"Ow�'<9@���yoRݪ7� -p�V�ܬ%V�5@�����x��pZI�����6N�� -p��7�ī��ng�_��|��Q.�l�����hp\��0m-S%���h��<hpY-z���\a�8GuBeJ����%�2�}",'L2��8��=���8a�-��D?jP����&�6� �M@mjP���P -��P����3�M�r��&�7� -j���Am��6�nP����>����%�(���;(O�\�Gn�M�Ca`ؠ��x�g��2@�d�!��e�?$1��8��>p�B�h@ -P��7�Y.U�"P��5��4�2�|\U�f��#dg;~T�:8~T��?:�<����]�����=���=���=���=���=��<�9t��f�t��r�t��n�t��j���=���=���=���r���_��>ˁ����M��2Q:.��p���Am�&�^��e�/�n��k�V���@J�7� - �z��ތ ~u�[ -�c��ײOv��)�W�>����S�٥�i���#.�ٿ�e���ٓ1[g�t�հ�u�����n�LWA�PRj�)O�J������MH��ɨc����/�8�(����r��t��Z]�ܽc�'.��V�Q9�#ȼ�d� =���)3�X����On�����ʛ���g;LY���0e��V��}���ԩ���ꊵJ�8�x�+(�Bmj�P[��*�V�� -�U��Bmj����'Em0̠� -�rP[��7� -j��h@�cJn�3u���L��Ü)��9�)橗3 -/-g�SE��)�H�"q��)�H�"q��)�H��\�%��)0� q -��9H�7� -�@ -P��鏞8��(6U��.2u��BI�U��Wu��mח����~��3�\���W���� ?�L�3E�9S�L�3E�9S�L�u� -%�t �h9m���&�>���d�,��v@�]9�s�'�Qez�xe�淁��>%�Uj�|b:�� �"=��=W��s �@́�1b��9s �)�e J�(9��2��5����m����@��3�<�E�K!�n���9@��������O��5�&m�a�?��o���A\��F�=�b~���{��$��P��%�e5���l慕f��VH�.v�y��H~y-?���ap��X�QZ8���(�8/�8ϳ���������vuz -��H�c{�v����K�{Bo&�z>�N -���@�#���2}�e~���,����.�o��H`U?&]�*�Tv��v*?��Vd��ғ��V����_��h��H��b�N��A<�s?��c�A<��c�D<VE�g��f@�75�@ -�Nk�y��BQ�%�*��AZ�-��9]}�W�RO��y�[�i�V�(6��D�*�����k7/���J���R/��(�oTe��<ռ�<ma�:\D�g���$w��1I�P$wN'w�FrGI�0���v5����v��%DY��x�{'%T~����6�4��^�N�f�N�������v��An��v��9n�GngLn�|:����O���I=�ċ�t��!���V_+[͌����,�+��#��`�6�o}����Uf��n�_�8�F{j -��9��)����䶥�^�T.����W>!1hE̯�� ��u1R0� �f����C�#�2jV��<l�][b�jr���ޢ3~y�/F�J�X��g� Cz���N�`�s�=-��#W��g_ۖ*o�B���#!�|���)���_}��w-�68�4u��^@lf-)�����]�/��gF�]m��՟q6R�" - WF:����;�V�]�\�,�ƟB�|-���ƘΕ+?�A{�Z#���N8�VsG�k]���CO��B�x��R. �0��0�J��"+��j���v����}�7�e��˨�Ņ���a ��|���m�6;V�sN����Xg�x��`��=|�ޣ�%����K:��.� -��NMQu�*�%���]��A�z$t됟��}N�5[䑼ꦀ���]u��pX�;,Ѡ(�s9�`��*����)ϥ�ê�Q_��^���%S�$�����2�iMﴸ -��A�� }V@�08�ϪL�Ѫ�Z�T���K�r���B�� -F��u2��+�THhF�\�j8� -��YA�ޞ�pDm��.�����Q�ͨ��2"�@U��CU��]CBV��n�����m�T�hiQ\F�g�g;x��㜶7�iz��Y����F� <�j3d�)�6�L���o'¨��&a2/�.�&��ǖ���C���&)�x���P��P�t�.�B�.�0���A�Ӄb<���8�N����w/�(�� -�a�38�>��p.8�y�����:㠃U�A�K�ץ蘠�^pC�g����緁[����9�t��4B�a��hy���^��L��P������x�M��{���D��~�Zn��hy�66���Z��ƛm�|X�e���E�AMm�8�S���q���2.�t邇�jՃ�E���E��[i -5ⲁ�BĦ�VQ��'�"�z����=��k'�#Z+�0k'T$:����UKb�&�q�qBS2�FN�JL�%�n���L_2��1�1��t(M��&�B���@��M�m�G{2��>I�)��D/�]���(�N�� -����3��<�dOѵ'7���mê�xLj����eT��kgpmZ��q�+c�u�������Na�3)r6��}~�S���4����Le����~����(���W��'�)�I�l�:��o=Z���ujRf��Tg=٢&_L��]C �%J#�2t�$C �%J0�`(�K�ԡ,8Jp��(��(��6YV��)�Si���JӜ}Q����"�˨j� -�]�\���ك�f��%���,��3�8;�vqQFe�-�6� -h���d���}���p�g����S�\D�6�['�h�l��%�-�b��;��3��>M�I"e��Pb�����|�@�������ߺ���4my�t2��^�Mh>����U�q_lPm�jT۠�f�j�A? T۠��6��A�ͻ����R���[n���(�\%���*������M��-|NW��կ�6i#1}�3��&G�w���P�緾OBu���Rp����CTMb����z��Qo�s�A���i������3z�g#Ϣ��L������F��/v������c`��9�o��"W꼌�<Ϟ�?6F�/����������4�F�]�zF������LL�|F�Avxx�8B|�o��o�a�/;xc�B\�B�p�Z���S4ږ��(�UX��Va���*긖��eJ/SB�U���/Z+�4�¯�8cn�X��z�B��q��c��+Կb�N�{��0$���}�^�Ï��q~��w�CG��q�L��{�}�[ -�bw�T'�I3J��¹Ѳ�.�xj���#��gp��i���ث7/݂�*�Ү���Z�z��a�u3�1��[���N+��j�Mj��O�7����Ԣ���� �]��n����^�� �Ӫ�3Sۍ�;8��r'4vf -�A��K�f���A��1ѝt(��t��ަ��*f�W�Me�G?7��>[��l��Ӗ��j���Թ�j�wt�;���T�xJ 7���َ��e��6��K�RK���� -5�!����~|��3sݒ����y����q����.��� ������K��8��lD�Y �r���C�L��Y9@�E!gPb��\G�Xg�<�Q��4�1�8�҃Я��0���0 �e���u�!%�*��K ���c��l��-9$�~�1�/N?� -�c!���#�Z��qj.��r���U����� -VIȤE1vU�Z���c:��a�/�&���n�H�CLoN�tߜ�w����l���f?B�7o\ �lH���kDx�NWۮ�x�aD�:ʷ5*(랾).wU�S4�T%h�Q�E�.���U����J�6j����4��^Kߤ]�f�J~�J���T���s%:W�s%:W�u��$ ѹ�+ѹ�+ѹ�+��SO���[)7h��֕�u����+Ѽ83Ù�x0�yV���t���p�.g�E,�`v�0���imw����.���+k�[�!��~����$��G�e/�dF%;BRIm$���6Oj���8F$���FRIm$���m�d������X=�$GV@?��d��\��I�����Uo�����O�x +�+ ��q��t� +��h�^��N�ڗ>�H��Z���+0��W0��� +��^�x� +��+�W���^���ށ��s���~K�I�0A�]�˯3��v�ʔ��x8���j:P+�Ѷ��!�f4n�mc�1c9a}cE�����dz5u���Zxu�ސ{Z�׳�ܫ?�*É3�C��~�y�=u?Q�^:Z'�����&z���q�-�P�u���_�/���r8��KC�:A��W�H`ك~c�V�/�"ㄏ�h�)S���I�x����F�7��C�'�X������,�?�6��y���aŇ+R����i��-��^��gY��мN�y�z��A��|����:�^�^X�#�B`�qJ�ʎGd8����%c��Z��2�S�A�!>?9jo�1��������l�c<���câ��7:���~kd�qLMA����F����F-�Q9aޚ5�v��jy�4"�.�|~�ʢ�F{rMQ����N*m�c +�?��A���q]�s7@܀nLP7�u� +P7@��u�;Q7�ŏ�T8��"�.�����9�AtY�q��d�g�u4i+> ȹ~�,�B���@���T9<@�t�Bgʮ����.µ+��������Q��Z����$Z�%h@����*)�d-�na���������{ʅ��7�O�{ໞ��e$Th����/f�ϙ?�y�JL>���0Qi8y�a��x +u�?����Gk0g����P�@�*��N`P}���Ca�C,4�|��/���@]�BP����B'IBԅ�.u!�A]�BN��_�GT��*9��9��Le��(��;�p��#w�e���9@����3����/�ī$��<9@�3t�A%"��B�2)y���� g,r�M�I���C��^�yό��%B�J��3D�O%;s*�u �z�k�������,��7��-^Q��A��oP��g(ޠx�� +�7(�~�*�nл!2�����H.��W�v��g`����T��Q�}H�_Ѓi �h��#7jU��Hr`��3;诇u������#GN��6�2�O������ +6���$lw��xF�1�@g�t�<I�"�Kԗ:�S��:f\������� Bx6��)J_L���֧DT�=F��Y-Z�d�:��P��.�]P{T-�j�ʪ� +�hE(Z@��P������%(Y�178��q����]��q^xC� ��C���j���o=�N�r�ؘM��3��^��ԛgH�7�����IY��@��� +N��A����@�����#�����p܀¾2 +�3��]�0�.��Yliǭ��o'���Į��|n:D����ۊ��ʎr��G�8/��M�� +b�6�m� �Al�ؾb�$�ڞ�g��H�`��!!��8���V|�������|2V�#� �=��ծTӜ���=7=R۽`qv��V��Ac��� +46hl���g���g�S��̓V���6�ǥ�����Q#_�6`��8�?�x�����v�9]}�W��ۤ�������o(�$��f+3� C�����0�[+p���!�f2|~m��?�q��O��Q�'��i���)?�'~6����,�K�m�e-_�~�-�W,��'��~l�Q���S����KG�d�:}���D�Ҵ�ȶۤ��G���Of���Y�2SNM���� ��_��_�;�mz���njR��7bw� �xߡ׃]Za��äG���K�b��ͮew�Q'���jf�9�������A�8���/WN���@�1�5�'ܱ�:ww������z��Ҽ���*65[�2r�d�K��hՑ�1 +ٲGf�w��]ǼI5%��a��Pv�f>��Jy�|��z�� �)������Ӄ�"�qp�p�p��5q���:dz���?���C�ǮO���3Nž����@�d�d�d�,2k��>�]^��eqqQrc-9� +�d�d��f.��q�;�OV_9��de&��TT�+sa��������p�Z���Z�c����Wo�����ȧ�h��ݡCvC�7~C��CV�Aeg~+x�E@�v�0��N +��V�B��h�|v�*N�oZh��Zh���O��-4�B-4�B-4�B�d+���mmq�!ZDO�����!g�s�Cc�����iRμ�-u�J�eVNZ��8�h��'� +e�Q[�~V�tjz��y^����[�PJ�����ǁ�W�q�����ǁ�>|�)FA����@Ł�~� hω�����ܨ�2 �mȬ�E�h���4@��+��D}Z������t�js��>��p�d�R�G]�t�m�e�ǫ�t o��so� ν Ip�^��!AP����hU$ύ#�h$�6��q���ce��v�]z�K��/�8/{k�����U�kd�:�1}(�k��:�G|�>����3Z���վ�>��)כ���>��gU?=�<uD�b���}{줏z���6�rjȩ!���� + ���rjȩ!������Z�!��h��j����A��jS?�R�T��(��.�<H�#�8���#l�E#h4�F#h�� ���R�L��m>9���W���#���f\��B'P�D�ؕ�kٷCl����C�r���7����s�.�����g�̖�����Ŷ3|���'�s��߳��m�rV<dO�x����K����ٯY.o1�['�d_��`�N1dc���h#�a��Ử�>���-2{T�NWۮ���X}H@k���̏2en�˱�~X��J��d@H]R���mGo63��mH(�������)˿ܯ�z���$Zg�h)�)���"o���O��$!���"o��폝�5�2���'9��'��B�vl�$�@�h#�z��ԶB�pY��Nr����<Ueg~+|B��C��H��S5���͉�I`�ķrr�K������5hk�����5hk�����^�G��`������8��S�%zу�f`f��<ݕh����T�x�N���Ƣ�E�ч�&ݠ�6��f�u�"Z���c�t���:C��b���1C� +j���5�ت{��<����,��M�����>�Ts4FB��j��n�U����!%�2_~�'�zcu+�m�l������١Ö�4�ՇD�b�S�̓�yf8��^k9������6���pO���ĵ{6�4�?�G�Rg�x.q�ox�8���d�z�2v=Y��Q]��%2(���sC��A�*dP!� +TȠB�#v|��2H�D!�dV�Y��̊7!+�.+��~�V��ϕm����-<f;��9Ֆ��0�z��AȲ �"p��w˲x�a��59���s�Y�$��h@�s�Sv�" ��褟~�1�i��S<���'T�� �"�D�<�!��� +��!�R�T��� +r*ȩ ����ɜ��q��S��&�F�x��$U�T����9�*���*K��r���$[�P��X�*!�Q��D +�U�W���m��h���؏SG���)�$���չ-��!GzRo.������oۏ�ϳu`}O�;�#�#�<G.��AݡmG�9]}�W]�\�s�!�&2f��̕�+;��o����26�8��|���x��ڤM�� �h�(57~4p�Բ<mIwt6j������,X�Xfy�X�ە���/Y�'M��e�g��Æ��:犫CsѩK�3�N�)�)��e� +6�u]��_��}�i�T[ƺ^�N� +���8�x�� ��}=(;k��c��8 U<��J�|�2�vh ClZ�_��u����y� +���A�c#���������� q����� �f$�H�}$a�?_$�DžKm� +�|�pR84�h��>� A��>$���C��%ٯbG�A�n���йO�Ԩ�}H������=p��%/�V���E�S�&�e'������7ԣ����G���>x�!}Ġ�j���� +�ux&�w'�UZ��>#,��ڧs��U�� �O�u���t���ŧ�������ӛny�OğO�ў�������y�u�I�מ(S{��>��'S�S�c��4��I�[$�'P�@y� �'P�@y� �'I�*tD�H�N�;$ϑ<p���tɰ']<9@d'W';�%;q���JQ�*E�Dp�o�����d'5�Cv�%R��Ov�Y����|-�|�?A�UBUW�����vխ�W3F|!�v�t�b�B���#ec:Q���; +�>��n�U|�A~*�_�bº���A�������{��1F_�!��P�p����� +���j۵+���eGy���g�s�,�Nт�Û0$\�M�%� +�)AB7�q�m�8$p/�s�~�>#8��V��5�� +l��%�y'd�ҕR�@��`��/��� +��ox֕`����+�� +%X�>B +5�Y�`X�����`8<z0�������`��8�س) +��9��6E�T�)�W�����SgS��/mW��.����?f����"싰/¾u2�a_�}�E�]ھ�w&L9�K9�ɢ����gL9��Eޥm������:{["l��%��S�$I�T�D�aK�-�DUz曟���V�67Da@hHie�w��6��qV�6 +�Eg-�l�W�t��@���Z3�f�53�5k�äΐb3�� Wk*h�M��%�]�$�k;sU��s����dN�������:[@�"� +;`�ǂ�<x,�X����9x��ǯ�&�� +���&�E;4�C3?�F6�6Z��U��g��x�'^.-��5@�6j�d�@F2i�4��A��*�q'�P�<:eg~+<�1�:�����l��-�A�X)�����J( +�4���J( +�4���J�~>�-~���ZWZ�晓ƵW���O8�����B��QV�c �uh���$�Q��3�P�vquh'*�����Ɓib�8�/�ꉅ[�ȗrbT�[���x��w///�8���{�|S�Z骢[��U:n]K�H�9W���'5�|FS�+&-��8���-�H�i7Q��d���C�>� G�>d���C��?�'#�s����C^� +�!՞ ���|O���&.�eT�bXx��g0~T�2^:(�t�����$��@ +P��*?����KL�?���'�kP��V���F��X�y���_�&�:�kc. zF��Q�g��iK�#0m������>e8:�aw�����u?�N��JA�Ϣt4�5����7���̧�x˶)�� +d�[�I��dc5)p���iB���45Q����է}fx +>��R}�Ap��3�Bh�L�W�3);��90?�[x��AxC=J��lzKeJ���l~$�lsFj�}�$���7{6�Q�V��C�8�$��s�(���jg���v��jg���v��jg�"��s(����nF2eZ��`����2)y��<��r����{���V]�n�����f-��J�j�5=�c�8���J +<<n�q�n��F�q�&^%tv;����>���rQd�Tu�p��G8����i�h�*�p�?G;��Aˀ�j�S�@'(�rs�9�*SB�U'�. �i�a�8a�i�� |�!�}� �lw&�Q����&�6� �M@mjP����&�j�O��`�Am��6�nP����5@ +j��� � +p������(YF)�5`�Ay���8�pm� +��U=��c<�l�2� ���,��!�ѭ��p��*Fj��F�9�r���������d���|0�!;��������I�y�Ǐ��l������������������@͡�0̠��䠻pܠ�P��5����8����7����>���,�RD�Y��7��6n�H���q8���� +j��6�2�.�|)w[&_˶����R*��nH���G�f�GݪP��4��}��ƘN9��)������.�O����q���-��ͬxȞ��:[��x��=���mV�w�d� +ʆ�RCMyJU:��DtmB�oOFc��E�Yǹ�CQ���|�#^��m�����{>q�m��� A��'��i�/N�I�B?��~zp{/wи��V���=�a��Է�)SG��F@��Ӕ���N��7VW�Ujʼn?}�U�K^A�j�P[��*�V�� +�U��Bmj�P[�<)j��`�U@���*��nP[�@��Sr��-g�L�L��gșN1O��ixi9Ӟ*B$N�8E��S$N�8E��S$N�8E��(9$N�`�S �A��n�8j�$N�ĩ?E��:X�v��åJB�ҥ����0n��t������m���f�����!g��)r�ș"g��)r�ș"g:�s�k(�K @�ic��6��yv�&�e����r�ȹ���>a܈*�c��+#7� +� +�) �Rs����a�9�xv�2.���1b��9s �@́�17L�-�HPr�@ɡ�d�AF�(]m�e�g(v��A�.�] +i6pܠ��rΈ��t�����o�6i�c��C��X��0��7��9��[O����7� ��&��l�(�.���e�0/�4t��@�w�k����G��k�����{���B���!�HGQ�y�y�=5/���5�x�N���S�Fz����g�^��z31��uh������/��_�g9L44v�^xC]F��1�U���#��S�I� 3���|,���Χ,�r��@[�E�t x�1�Ǥ����v �x�1�� {'�*z<�x,�0���aj��vZ{�s��2.�V�0�8��*oi����s��H�Ȑzf��BL3��G�q,$�W��0P�'�X�y��'UZfזzq�G9}�*������i��"?�'~� ���Ir�"�s:�4�;bHr����l-�#�y����C�.!�Jm�S�;)��&�g�y�����w�6�wZ����/�� ���r;�� �����s;>r;cr;��AvǸ��}�UH��&^<�� +Q���Z�jf�5�f�XQ�٠�{�a~��5]��2�|u����9d�0�SS��A�NYǏe&�-�r�8���� ��C+b~mw�N�<�����MH5Ӈ�N: �Q�(��a����Ts�������|12��Pb��.?���;�ew����i� ��b�-�ڶTy�0*� +� ��L� +DH��k��k��� �����b3kI�����7�|��83�x�jsw�����Ji�H��3�a?HO��ޱ�2���e�7���k��W6�t�\�� +�#���t©�ʘ;8�]���͌z�V7��s��rI(�!�׀�VtY�NW�.�#���7���S��-�(7_F�(.��y5����oÀ��ٱ��szu~�:[ē����[�/�58�^�a�v�oPTtj���U�F�.�8O��W���#�[��t��sz��"��U7�����E�Ú�a�E��a�8,V9 +.���^Ly.�V�����2V�(��� ᴬ8�֗Nkz��m�, +ZUL���y|Ve�V��:�j<E]J�[��:.U0�`T��Q�]�BBC0��bT� WА8�8� +*��4�#jۮwA4���mF���Q��B|�"4����gv��_��oC�RFK��2�?�<��CM紽y�N�{'�J��t7��N��T�!�NI�g��|~+8F�4Y�y�u��6�>�T�T +�f7IQī](Ѕ](Ѕ��{t�@ +t�@�qtG�����M��w�/��x�E��m� +[����9����s���ϳ +�@��:���]z�.E�����=�'4�0>� +�:��G7�9���T��MG˻E��g*E�����g���m���[�h�&�M�S�r[�G˻�������6�l����,[�- +jj�š�:o~���@��G�q�K<�V�D/f�-��Jk �� +|h'"6 +��*,<���5w��(G,X;��Z��Y;�"�Б�U�ZS5�X؏�����7rBWb�,�p�4f������� �Cib�5��4��o�m{=ړi��IBN 6&z��=�F�tz'Vxm�V��m� e {��=�iէlV��cR�mܭ.�:�^;�k�b'�ۧXc����$XG=�NNw +��I���L��ӝ�~f�e�P��e�(H���P��(v�G��6�r?�M�O:g#'��|~���\ ����t�S��0�̤:��5�r`r��:J0�`(�P1���$!J0�`(�P��Cy^�e�Q��GihE���ɲ�~�O �H���W���p���Y^FU�o��:`�f? ���8�0�,�l�'e��g��p���2*�m�m@�-�%˴���d�,�3�8����"J���:YF;� +`�,�m��<ݩ�5p�g�qm�M)C@���|�=䓶���|�Te��� +���i�3���D�*mB�}�&@���b�jT۠��6�T�8����6��A� +�m�M� +X�ڼ�r�<EE��*!�Wy�\e��o���<m�s���~K�I�����7a8��x�#��8�߄�>��}�c(���d5/�j��6(�D�z�k<�,O[g�p%���?yu�Xf�5-���0��|�����M��h3���R�e�y����1j|�h�lW�� ̍�>��6����3z���'�fb��3�����3��[~��;;y������*���_�J���ѶT5Fa��Z�� +kՏ�VQǵ�Xu-S�x�ҭ�}�7~��Z��/~��s���gԫ~���k$_���u��+�؇!!��5����~~�ď;�����:b�ȍSg?�#���jPG�[��:�O�Qb>��v!��Sk����<���OW��^��x��U��v��0ע��OG[��I�i�ߒu�t?uZ�g�T�hmRS'�x}Z�1��7�ޤvNh�z�wC�P��j���V����n���� �ݐ[8��3S� +r�]j6mݨb�����CQg���6��T1s��n*K=�����غ�e���̝V�M4�εW[����9�v�b�S������v�$-C +� v�Xj��X�U�H�n��y��Nf���昙��؇�N�[ �D��|O�ht�p~H���wN_Z��pf#:�9@�����e����r. +9��-�:��:�晎�t�Q�Q�1��~�ՇY֏�a.�-�;� +)aT��]J(��k�g�@&o�!!�cЏA|q�1n��e��ײՏSs�G�3�̮�����V�JB&-����ײ/]�� ����~I7�.�v�ErGbzsڧ������-`�͌4��y��fC*�X#��u��v���S +#"�Q��Q�@�X��M)�p��������*A�/�v��������wU*X�Q[m�����X�&�4�W�CWb��:��+ѹ�+ѹҬse�$I�Ε�\�Ε�\�Ε�\yޞz*�=�J��@S=��|?�+ut�h^�����4ċ�γ��`�#u3��p9�/b���+��glOk�S��Uv��-�]Y�����w����M'���>j,{a'3*���Hj#����yR���1"���6��Hj#���6h$ۮ��\<��&9������p$c��:~N�_>�_�Wy��������+z � \ No newline at end of file Index: openacs-4/packages/simulation/www/doc/permissions-table.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/permissions-table.html,v diff -u -r1.4 -r1.5 --- openacs-4/packages/simulation/www/doc/permissions-table.html 1 Dec 2003 10:29:42 -0000 1.4 +++ openacs-4/packages/simulation/www/doc/permissions-table.html 2 Dec 2003 13:46:53 -0000 1.5 @@ -7,7 +7,7 @@ <TITLE></TITLE> <META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.0 (Linux)"> <META NAME="CREATED" CONTENT="20031120;15335300"> - <META NAME="CHANGED" CONTENT="20031201;11352700"> + <META NAME="CHANGED" CONTENT="20031202;11112200"> <STYLE> <!-- @@ -50,21 +50,21 @@ <TR> <TD HEIGHT=17 ALIGN=LEFT><BR></TD> <TD ALIGN=CENTER>Read</TD> + <TD ALIGN=CENTER>Create</TD> <TD ALIGN=CENTER>Write</TD> - <TD ALIGN=CENTER>Edit</TD> <TD ALIGN=CENTER>Read</TD> <TD ALIGN=CENTER>Inst</TD> - <TD ALIGN=CENTER>Edit</TD> + <TD ALIGN=CENTER>Write</TD> <TD ALIGN=CENTER>Self</TD> <TD ALIGN=CENTER>Case</TD> <TD ALIGN=CENTER>Global</TD> <TD ALIGN=CENTER>Read</TD> + <TD ALIGN=CENTER>Create</TD> <TD ALIGN=CENTER>Write</TD> - <TD ALIGN=CENTER>Edit</TD> <TD ALIGN=CENTER>EditMap</TD> <TD ALIGN=CENTER>Read</TD> + <TD ALIGN=CENTER>Create</TD> <TD ALIGN=CENTER>Write</TD> - <TD ALIGN=CENTER>Edit</TD> <TD ALIGN=CENTER>Mine</TD> <TD ALIGN=CENTER>All</TD> <TD ALIGN=CENTER>AddUser</TD> @@ -276,14 +276,14 @@ <TD ALIGN=LEFT><BR></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> - <TD ALIGN=LEFT>Can create and edit templates</TD> - <TD ALIGN=LEFT><I>create_template</I></TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Create</TD> + <TD ALIGN=LEFT>Can create and edit sim templates</TD> + <TD ALIGN=LEFT><I>sim_template_create</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> - <TD ALIGN=LEFT>Can change other people's templates</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> + <TD ALIGN=LEFT>Can change other people's sim templates</TD> <TD ALIGN=LEFT>admin</TD> <TD ALIGN=LEFT>package</TD> </TR> @@ -296,12 +296,12 @@ </TR> <TR> <TD ALIGN=LEFT VALIGN=MIDDLE>Inst</TD> - <TD ALIGN=LEFT>Can instantiate a template into a simulation and edit the simulation</TD> + <TD ALIGN=LEFT>Can instantiate a sim template into a simulation and edit the simulation</TD> <TD ALIGN=LEFT><I>sim_inst</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> <TD ALIGN=LEFT>Can change other people's simulations</TD> <TD ALIGN=LEFT>admin</TD> <TD ALIGN=LEFT>package</TD> @@ -354,44 +354,44 @@ <TR> <TD ROWSPAN=4 HEIGHT=72 ALIGN=LEFT VALIGN=MIDDLE>Global Objects</TD> <TD ALIGN=LEFT VALIGN=MIDDLE>Read</TD> - <TD ALIGN=LEFT>Can see all objects</TD> + <TD ALIGN=LEFT>Can see all sim objects</TD> <TD ALIGN=LEFT>n/a</TD> <TD ALIGN=LEFT><BR></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> - <TD ALIGN=LEFT>Can create global objects</TD> - <TD ALIGN=LEFT><I>create_sim_object</I></TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Create</TD> + <TD ALIGN=LEFT>Can create global sim objects</TD> + <TD ALIGN=LEFT><I>sim_object_create</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> - <TD ALIGN=LEFT>Can change other people's objects</TD> - <TD ALIGN=LEFT><I>write_sim_object</I></TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> + <TD ALIGN=LEFT>Can change other people's sim objects</TD> + <TD ALIGN=LEFT><I>sim_object_write</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> <TD ALIGN=LEFT VALIGN=MIDDLE>SetMapP</TD> - <TD ALIGN=LEFT>Can set and un-set on_map_p for any object</TD> - <TD ALIGN=LEFT><I>set_map_p</I></TD> + <TD ALIGN=LEFT>Can set and un-set on_map_p for any sim object</TD> + <TD ALIGN=LEFT><I>sim_set_map_p</I></TD> <TD ALIGN=LEFT>package</TD> </TR> <TR> <TD ROWSPAN=3 HEIGHT=54 ALIGN=LEFT VALIGN=MIDDLE>Case Objects</TD> <TD ALIGN=LEFT VALIGN=MIDDLE>Read</TD> - <TD ALIGN=LEFT>Can see objects in a case</TD> + <TD ALIGN=LEFT>Can see sim objects in a case</TD> <TD ALIGN=LEFT>read</TD> <TD ALIGN=LEFT><I>workflow_case</I></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> - <TD ALIGN=LEFT>Can create own objects in a case</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Create</TD> + <TD ALIGN=LEFT>Can create own sim objects in a case</TD> <TD ALIGN=LEFT>create</TD> <TD ALIGN=LEFT><I>workflow_case</I></TD> </TR> <TR> - <TD ALIGN=LEFT VALIGN=MIDDLE>Edit</TD> - <TD ALIGN=LEFT>Can change other people's objects in a case</TD> + <TD ALIGN=LEFT VALIGN=MIDDLE>Write</TD> + <TD ALIGN=LEFT>Can change other people's sim objects in a case</TD> <TD ALIGN=LEFT>admin</TD> <TD ALIGN=LEFT><I>sim_simulation</I></TD> </TR> @@ -413,8 +413,8 @@ <TD HEIGHT=17 ALIGN=LEFT><BR></TD> <TD ALIGN=LEFT><BR></TD> <TD ALIGN=LEFT><BR></TD> + <TD ALIGN=LEFT><I>italics indicates simulation-specific priv or object</I></TD> <TD ALIGN=LEFT><BR></TD> - <TD ALIGN=LEFT><BR></TD> </TR> <TR> <TD HEIGHT=17 ALIGN=LEFT>Anonymous includes registered Users</TD> Index: openacs-4/packages/simulation/www/doc/permissions-table.sxc =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/permissions-table.sxc,v diff -u -r1.4 -r1.5 --- openacs-4/packages/simulation/www/doc/permissions-table.sxc 1 Dec 2003 10:29:42 -0000 1.4 +++ openacs-4/packages/simulation/www/doc/permissions-table.sxc 2 Dec 2003 13:46:53 -0000 1.5 @@ -1,43 +1,51 @@ -PK�����mT�/E�����������mimetypeapplication/vnd.sun.xml.calcPK���mT�/���������������content.xml�]�r۸��S�ڙ^E�HY�����&�mf�$S'����$$aM����i_n���)J�DJI��I2�D���w~q�ʗ?>>xB�cJ�Zv������dr����������.�����/���3��1vхG�(@D�]J��|��Ӈ�oA�mY�BD>�d�&����;�|~7 -�q,��-�J�u<ᵮ/��K��_$w�ZS!�ˢr���v�V�5��;}L���,�R+�1|��;�H�=g[���yJ?���l֙�bJ{4Y���`�BY�X�}L��))��Ķ#���?M�' -|Z@v��m�_L��H�ۡ���Ka��[y3�q�a�>le���ۑ'$���]r~��!C��S���VBi�������X:v�C�ϯ/c]/���3��t����B�"�$�n�1M��0���U�/0���9�ɍ�b�JU>A�c�����4��C&�߀��=��Xo@2Zr%3|z�F�胯����]}p9�SN�L{�bؕ�a�w!�rl:�#!�$�ێY,��\ť�b�9�8��Gi�O�L�'q%胔����7Kj��I�X{�=8v�9#L�i8b"� �n�lx~���g���LљQD�ᙶ��f -δutnQ�?��"Et>�t -�zv���E42��8���QD�ֶ�m2iKHg}m�f�����$�dڶ;��@�ɼ��t�=}H&���F�6$����ؚ:bE5��<0�y�=Ex2���<ʷC�8j�P����,�"�� 5�;Nw�G�����t����@����:�=.s -����0?�ҋ��v'��<��a�<i�'/<�C��"qQ�l�|?�B�6����(�Q� -�n�k'j���?t�?:����:�ԞS�xB�D�:e����4bjgl��[��RDdL�>+�ҜPќ^��*���E(A�8�}�0OM=T -�ð���jj(�#uR��9%K�g�)�,h8������Ä�NO;EuP���*��i��L��1S1�/^�j}�iUo�Z�tx�+�t֢}��8��W�+�9ڙc��1W f#�X�T���u�*3�� -����l���p�m_�v�J���=��{�P�Pn��T��\�D��{˪&*�J�Wo�~M�l���xLc��쳾=v��F����w]�Iz�����&=�08t�y�*�k -y�j�1W�U�{��(vR�.u9n���7Ii;�В�ܮ�C=)z���y��]�#��x��Gg�X��2'>v�ڈF��D��|���(�LM�s��c�>ܹ9��}zqMqP�X��e��S(��ߐ5b �E Čf( -�'�R��<�.⫲.�!ǐuWg���8� {36��n - s?��� ��� ����z}�A���b$�jQNab� -�2�c4��3=e|���3Q��� -��>��`=U�&JD&*͜��Du����L��&$���~�z/חI�K�s����S/�H7L�e�������u9��K��D�X�\I��<��<U�Gy~���5����7hX^�������7j������%:v�&nZ�CZxPF�:1��%��0j�:��ͱ��q�l�w��rة�쵑%�u0�R�@���:G�UO�Z�5 "s7ZV���Y��P ~iͯ\Z�RP.�k7�7���`(D���ɛ���z��H -*�W/�[ȅ\����ge���O�>=��\aƨ��2*Ԡ��-�h�������K������]�B�0�c��l��H�@�+!Oy��bX�F9��a�(��e~Ox����F������'��6� 8�bx��z����f���:���}�5�&�Yf��.xs��ʸ��0�"Ζ�쌸��.��\�kL�凱7Wƅ��K�B�\�P�����(���KX�.S������o6�N�c���cg;h��n���HLi�I��F��������l/��o�:�n��l�|06a��}����fh�B� �5*�U��+��=j��l�(_~��t*/hQ�a"�a���{qy���^��y�j3�)y^)�coj�vC(y hT�Hh�\�50,8"���5Nf�O^j�[�]��c@��;�j���4�:ٿ`E����*�S�|�Ę{����X���t���W��X�è��$[8�n���ݴw��0-��NNv�w�Ac˟~�>��9q(y��+_��2Hޡ��1m�t�uWEl�c�&bਢW�E�^�1X�t�ZwVNu�}��S!�#����|�dd#�bX��Zh3r�������\��f����E�j<[�1�>�^ -o�G�#��W��'����B2A��)b D4�Q��xE3,�C�e�^��| -��4���+��.�#��^�hw��˧!8�R��������Τ�i���1��W���lc,���h(��u��l'͑Y��g#�j|�N���4�Q�e�ŷ8�c@g��-�%C~��� �;���yM�tf�(�fA���]��]���9�Q#MF��9GYkSTlT�c.T@)�JfXL"����%yW�����n�ԋ��{�S�a$�r��6�̤`5[ZM���v5��H�~���\F�G�{�PH���{_%i����s*���'X�Jr� Ib�z_M����.{Th��L�i�e�ub�(3��Z��Kyy���2;sI4U�H�ǝ{J5 >�w�����"L4�5ĥ��\��Yҗ�-��7�{8I�UEUew�LFwo�4O��ۈf�Q^��z��s�<!�J$"m�_J�އ�*Z&Ե��C"�x��Д�[�9��0-U�ø��Ǝ5���JxR�8���~'�S�_��!�'� -回a����y}n9�iF�N_5{_�r��0ĩ�����+��z�����^��_�o�4� dt�8��M<��h�{�ǏHmv�G��C!1�`0��کb�3��?ʡ��,���� f�gIo@�z�e���ڎ�p���|�>. ��@�� -䨳���eMx�� ?��;op�)��#q�n�"|��⨡�m-�TY�}����t��;���������[�,����zz��]��_�p�z}m��� -�M�2�p��G�<�݈���_��3�@������G�G����P�/"j��O�\��e::-��2[+�Κ~J�Kɕ����PK)���6�����PK���mT�/������������ -���styles.xml�Xmo�6��_��C��%�m����i�i4ɰ}d$J&*�E�I��oz�%yk��&A���;ޝ�:�/r��0�v�Y�:��,!4[�7�o��,�a������\�qX���&,�L�W��W��ͫ�__;���JL?(���_�;���lr����u\mn��čV#�!�N�p�n�(O}��)�=e���]�A��WV]�{1�-et{��Ұ� G�Im���[��5���v�](�p�\��_]�o/P��>'�Ө��ZUZ��O#A�x��!���r�A|�?��2�H0�H�28�q��B���EK/&�K�ƿ��r�Vqm��nK��)��Mp�W�Jخ8���r����o�#� -�*t��i�$X��Qɪ��Z�:�#J"b��q��Οp�6�@�G��g�E�Up�3G��W:�[��pb��P;﮾܀�_G���e�bN�[mIUB���,�d�Hp���T*kԠT��q��V��^\(jvL -�{e�b\��y�4%9�Y�2��T-Ĭ����7W{f<TDDzO+[�V�2�����gĬ(s|ߦ؎�F>dyP���R De�f/�7*LA�V�șZ���}��DJ�<���lw�SA�G��XLH$��WNkl�5��L�@����) Fr�r$��5��x����g?'�n'/���;&F<��IN�4�.���w���Wɚ����R�!g���)��@0�>y -��Ӫ}/P��'�����k����L�\7���27${�\���s}�vcө|��揸��k$%��0�����*Hf�#�$n� �ګi�9LE ��������I eM��6�-&�f�o�)D��Ͽ��>Ym�wB8��/%j����V���[[1�ѩ$^�j.kwJ�[+���#9Y�D���6N�_�el��p�K���c����i�v��>Xg�0���1����QʾY�D���[Y�#�Ԏ-I������\��F�1d���G�-3���Kջ�*9�:T#�q!�2�I�+���,��ms��2� -�r��A��F��P�h�0l��6�7��#��=�͗/�G����,X�<�J�𤌉������>/�g�||��B%���'�}�Ϗ�S��$Σ@}�K��OC@+8��(�$�1Ml�x��>�-����z�|k4N[���V�)�fQZ�q:'y��X�0Z��wZ���c��������E�R�d��m�a�ݟT06B#KQ^�ި��~)]1���О�Yۃ`M�8�����x�ُ�d|�������LvY��or�<�z����������;�������0��� -�F�S�9\/�?n�� �6-�=s,Z��������P����o���]E��-�]E��/�?|���ϗ�?PKϓD~����PK�����mT�/��f^���������meta.xml<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE office:document-meta PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd"><office:document-meta xmlns:office="http://openoffice.org/2000/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" office:version="1.0"><office:meta><meta:generator>OpenOffice.org 1.1.0 (Linux)</meta:generator><!--645(Build:8693)--><meta:creation-date>2003-11-20T15:33:53</meta:creation-date><dc:date>2003-12-01T11:35:27</dc:date><meta:print-date>2003-11-27T11:46:47</meta:print-date><dc:language>en-US</dc:language><meta:editing-cycles>19</meta:editing-cycles><meta:editing-duration>PT5H13M35S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="2" meta:cell-count="126"/></office:meta></office:document-meta>PK���mT�/���������������settings.xml�Z�s�8����ם��[��T��Z�V�H1�!ay�~�>��8��Sg�9��_N����叵�++����+�z, HLj!b_ �I��B�������:YZz�L�ݢf�@�0��_L���Z�D�օ�6�;��-��I����i� -3$���P�c+���e.:cI���JX��])�C���$I���VXcD��(:�Nb�j�^c�Vդ��o`W�DE������o)7.�����ఖ��[)��R�|d`({L�+l���eBD�!]��A>|�� ϑ,wA��N.�� -߁�^�^=��|����#D,��V��v�R\��Xo��0�Z�~�! 4���)�4�s�G�#���x aP��TCϧހ�(`��n����z�%�b�Y1���oJ��.FA�Z0��%�����y(����ʜ����_6��1�;�=�b�[�%��-�(7��[n�ޢ*4�� ���� '��Ӄ�r��W�� - ��=q�$Og-��8��I���e�azcx�)j��`��S�LN�S������ U�� �6� �����Kq -���[��A)���{�}X܌=���^�~����<�����QU����ƔO�j���V;;/�_�����!#u �خ� F�@�"�л�m`D�x��c�]J12&�������2fV�����,����;79�־�@Y�����а� -���K�M���I��5��b.=J�oX ��Ӗ� ->>v��B���̩�ך�?[3ny��`�f��k9�Z������r��%9� -�b*ʇ�-*kG�rv�$�Cf%�����a�H��><?U�Fh���_�daÙm��gO;?]���i����T����g��e��.ݸ �m��O��1��SG#�--��Z% -k����u��,��~���24Z�l�:u&������p0SV&ms,�Nej��%�������`"_��F��P��[w}����RtӔ��E����7�6�,ͮ�~ -��N���tl0�g���c�i[i -ku��4�>t�����5|�Oܞ~7�mض_�����˾��;���!��eő;]Y*X����P �5A���Mn1w6���e�U5����[�G��5�M��8������\�!�m�|m�H\�],��P��s��OSkk7Ɨca�jzm��j=Jb���v����֣��rݙ�1��^��@ٯ7��?IY�R��<x�_,~b�����ܞ�I�職g�?�x��m?I�^��wU0��.�L}�5A��d�A��3�eA�.�̀'@�>����s�4JBR��� -�����a7� ٔ)E߯�@����-b�Y�]ػ~���J׃>O�J?�����#��|=��`�C�RN� -Βw9n����\2ٍ�=�L�㾕n�aDƘ�x6�* &������W���y/�4�PK -������Y$��PK���mT�/���������������META-INF/manifest.xml�ұj�0�O��n�ө;��)�ڃ3t�9Ȓ��!~����B��I��_p���q��kg3X� ����38T��+l7O�s^쪟r/ZiuC���A���Ϗ�����M�Ů?"�U.���`#�A���\C�o����5�s�Ft�w���$+��$f�ц"��S�e�cGȮ3ZI�Ƴ�c?�8��4 -�f0&�$�2@��&�WJ�x��?�1]C���r�C��u=����lK,��J�ai�iS�Y��/PKS�S�������PK������mT�/E�������������������������mimetypePK����mT�/)���6������������������B���content.xmlPK����mT�/ϓD~���� -����������������styles.xmlPK������mT�/��f^�������������������g��meta.xmlPK����mT�/ -������Y$���������������{��settings.xmlPK����mT�/S�S��������������������h��META-INF/manifest.xmlPK������Z������� \ No newline at end of file +PK������Q�/E�����������mimetypeapplication/vnd.sun.xml.calcPK����Q�/���������������content.xml�]�r�6�ߧ��3{HY����q����N�p�IHBM���^�Av_�O��(J�,JIP��v&����������< �1%�-��kD<�c2>o}��s{����/g��|��?_�:a�������G���/�~��� +������Ϻ[��q�{��$��go9N���S�z_����<�#�o����D��m�K�0t1���������.����u���@�bco�a��m��{��}�{�R�i����N��i_�tNOO��������α<����iW�w�mF\��#��aٛ@�Y~��B"}�D�~�Y2;�ap��(�?,���U�9��f�I�Vj�^�9?o�!�� B��%W�[t�~w�y$ +��#/�gZ' �L`(��',�������Ap wZ`D��#����7Q��5}���a�IQ>@��}v7� +'4�χL��b��˱ހd��If���R��o���Ǜ���p\M8�;�1"�aO*x�9߆��F��G0RJ{mMb�l��+u��̀��!C`����1i�L`��w������,i��R"�k�)���8��=�ěh����:G��cSD}��N��LYE��h`�ɑ����"�}SD'V{'���v-{0�":���=qM9=��N\�Xk�͠-! +�M۱�����%96ö��N�!ٌۃNo�7�d3p;��ɩc�f�v:���X^���t��llOO��_�d�囡��i$p�v��`12���]�w� �W5�p�������=w� �77�||�o���.}B.kGp����h�@��F����< +��)�e[iK�Z8���Q��W"�N�I� +8 +�~���L���*�ԚSxL�D�:%�his3�26�BL�N!dcL�)�2� +(/�W�E�� +9m>oJP���nj��W��J�~�����J��H��i֓%γ��<4�=4�]^�aCv�'��:�F�ld��$�W�U��-�3g/o��hX5��7�?^��:�5o]�@G~~� ��%���͊�^����|�Pd6j�fEf3X�.]}�Ѫ�)R��[S���B6�����,�ĕk�F+�s�2ױQ��FcQ�F�\�����8/���Qx����&��}��W� +T��<��]���ɚ���`�����r�ղk��+9�~/VRs�.�X���w��q#aě�U�-�zP�=�B��fz���L��)&>���dge��v���"�D�|��c�sLƪOj�3��b�s�3u�����3EA�c!A�O�ĺ<�n�5b Ĺ#hBS��ǜ�(CmA�e^�ېcH�NWg:+�i焃l�VŬ5�iO�m蠡x4���8i�:��C�y{>��.Z�(�&0��3�2`42�3}e|��зQO��� +u�_}���6���(M٨4��H6��,$,d��C���5�Q���,9����vI�ܨK"��gYh���{��uk��K�34 C�ﵜv�t-��[�yt ��w8m���@�~(6�*�Zi-�<�@S��h���t +Eu�{epIo�|� +��I��s5 ���J "Ӫ��E���⫬�(?�Ξ�uW!��<*���o?����I�r w]!��7�� +cɨ�_<�W�9�=P6����K@�`�>���<aG���R*�"��5����V���s�����f&��ȱ�'w�ү��)N��)뫕���b�\�'\�9�7(իi��� :����ߚ>�~�c�F���L�#&���5�K����7TH)N�������Ҹ��1��N�p}p�Sd���Nw2�S�YgP�kqfvö۳p��5��i��fv��vGݱ7��kMD��y^�lm\�bBk(L��hϓ�a���w<�c`��W6l�Iq�]��S\R�߀�>x�^X{�����sl��I�9���''�� �����G;�#����aw��w�/3�k���W�}�>�������}ȵ����N��������]_Ra���[ %O!����ق�87�:=�����!�J�P�A��N�]�q�t�[�T]��V��e��#S�Sv��l�0Tf�s�J��\,n�U��yo���sO���β5U�Z�4bF�^�m�����s�#��_�ށ_�^�˒#f���q{:/���y��O@Q9 ��'��Wm)eg�;�J�m�s�O���5d}u�~�˨�oh��eX�!6P�~�̔��_��E�&�җ���/Wę7�7?�����q����������$�(��=L�8S�[f�^��=�D�O2�ܤ�~��qk���)�L�D�G@�K)���t���yc���ΰi�U�����<�>����BMj���B���mJ�֫�;��=�X�Ղ�)�e%L #@�1!(�AJ^A�̧|�J���dv��ZH���Hi��=ן��_�Z-�oC"�YK�!�M�ͤ��iҭ2��j�4O�����E�AMql�:`�+�kx6�g�,�yj������4�Qƥ��&��)مf�eA�o��Lo��M-�f^�'Y��������f�{���Xz�Tc +d���(�T`.�C)��L���D +�q�~�^��b���,�|Uv@2.�^|�%1iX��.Cc�~�O +.]8�{��Z\.#d��s�}@��$64��'N�w���r@�1��ɾWR�$�Q�}90���m�(qS�yhL+>(ϫ��{!m�ſ�c]���g�X��A(��<�6��{ +��}�P� P�~n�3�h&p����3�W���_2������8NTVV^�rYB�u9�`9Ѷ.����*n��ڗ/U���uIL�܆0���95y�h�B��D2��j��D�_Y5�q�ȸ��@=-(G���%AY˘Rv? +��v+���:��W]�/�YV�䝪 +9�I�SAk:��:���.ب�f�+B�!N�俭���c4Y�x�X[(�KZ�����D��甽љxJ���GjA,����� ��)�P�j����B�C�'Yf��=�B"2Ė7�ހ8 +(��c�z�Z��p�����. �U��F��r�i���2ol�=�@�c*<��S��Byx�=iK��ҭD�֔x�2�qCɓľd)] +F>�V��~�l��C��?���Đ�)�������t���nQq=J�r�ɟ�=��_�[<\�����z�'���!��O���{1�5(x!���XBYu���?���I����?���?~LT*ӻ[���uWR���\ŗ��I�w�T]��PȰ����d�ȼJwE�!�e�"�tduOH���J%m�҂U�{��[>��]�i��SZ,J�Dȿ/�PK&�ɳ +�����PK����Q�/������������ +���styles.xml�Xmo�6��_��C��%9i����i�i4ɰ}d$J&*�I�I��/z�%yk��&A���;ޝ�<{(r�sA]��,pLc����ۛwމ{��������Wo��$Ƨ ��S� ��c�\ݾ�����z�Ybz��f�g�~s��s�Ɂc|���q��Y"7Z���T���]KY��>�SX{�<�<�v��=��5ju�䤶Rh����Z�VO8�Lj+`��OY���lf��.�����j�<�~���Z�V���H�D=^�}6d�x�@�O�5ZF�=�$�28�q��B���EK/&�+�ƿ��r�Qq���ݖ&kS��8�Rخ8晢r�5�Br� +�7̑s��]'eF=E�W�ST2�j@�\�sDId��#Nt����nКh�H��¹�b� g�p�if�s|-�N̝[J�``���׃����1{�S�I�rņ��?S�djR�D�ST�R�F-J]��[��ҋKE����^����;�!��$G4�P�ꅘUTr8��znj�At,��rm�֥��Zfm��3bV�9~hSl�n#�<(�[Vz QU���KB��@��)r���"c���[�R5�(�[��T�*q��p�5���q�94��!apx5�J�Y�$Q�F��5�Xܱ���ωZ���O +�-#�d�$'�4�*���w���Wɚ����ҷ!g�Ꞥ)��@��>y +���j|/P��'����=�+����L�Z5���2�${�\��ٹ�ss�cө|���XLﵒ�f���G^$;��r7�b�U4��"� +`��k}�gH[����h�I����t +�����/�OV���Nq�F��/�q�5i�q��V�{tj�'X�U�N�CK� �a)<R��HԾ�o�t�E^ +{��cs�r�x̙Dj�C*�V�"��o��U:�$��0J�7�ȡtt}+�p�ޱ!���pv���~��֖̓�����Ȭ��R�n�KNm���8��u�DĨ��h�x5�tۜ;�wL�k���rP� +�Fb�l8�5�y���{���5īm�CĨ�Z��拗�#x�Ќ{,N���!<)c�?�h�2����I��8�k��P)��z���#�����y�/{i�ih�a�şT;�I�*�ā�nh�h@��pK~�0�M���-�V`� +�]T��F��I�n%61��������Xcl^��������hWʭLغ-*�u�'�Fhd)�E���W���P��. +��:k;jS=�'!�;4�c�#.�$v�C��8S]V���\;ό�$2滛��;<�N�-���u:�extB���Q��dW�ԏ�s?���,��pj��=O×��a�x(u����|r���~Q����Y����������џPK��L�}����PK������Q�/,o®���������meta.xml<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE office:document-meta PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd"><office:document-meta xmlns:office="http://openoffice.org/2000/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" office:version="1.0"><office:meta><meta:generator>OpenOffice.org 1.1.0 (Linux)</meta:generator><!--645(Build:8693)--><meta:creation-date>2003-11-20T15:33:53</meta:creation-date><dc:date>2003-12-02T11:15:41</dc:date><meta:print-date>2003-12-02T11:14:45</meta:print-date><dc:language>en-US</dc:language><meta:editing-cycles>20</meta:editing-cycles><meta:editing-duration>PT5H17M57S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="2" meta:cell-count="144"/></office:meta></office:document-meta>PK����Q�/���������������settings.xml�[s�J��ϯ��/��dݸ����D5���$�����̀fw�$�ꜭ�*&�=_�ܚ������%�R�( 1���})M��s�{��������~�*Їd¯5Cv@ƸnPL=�Y�Nd�փ�6�;��-��X-$��Y���֍T���,�~�I�^��k"��Ƽ��L���N�X,�ɵ�n���<=�GQtUb�R�V�c�Fդ�ٯ�Kr�"m��Q{�}�r�"Q_�O���Oa}����d�`��Ki[����(@����z�FȖ"¤z�B~ y��q�w�b�6t��Y�|o|"���z��YmW���D,��V���OR܆/X���0Ҭ���� +��BXz����s������MtBV�a6C?������c�`���k����r>t��hE X�0b}j���;��c�C�!�X����:����#���9��#@���9��6�QVLɹ�7�Æ� +�A��;�[n��^� ��D����C�f~D���ٓ��� Y�8o�u��&#eJR��7��S� +�g樥ʗ|Ff��c�9��)�a���Z̻� +E +�*���;4<U�P�>)�A)��H������4�?�2��p� +e�Bw|�.@�&��O�1[�T�V������F��z���X��>��8��Hs�܆#��kP�0�@8���oLG `0=ч�Y X�%��,�`��;��,�����"s?��������v��.��,P�/�������rf��� +d���%����X���=3z�<M<0�]LU>G������8z˒2��1��x���q�/2��O�}��c��ٷ���}����Y�/�zh���W�(/�����du���&E�=� +}��Ꝣ��-����ҞM��O�PQt��F�v�^WM�X������6h�̍�¹Ǎ���榋�AF���s�44*WE�m{��=��7�ѯ�����f�b�tK��Z��@�+�S�퇵~3�z��E��sG���`����љ�gwQ�W���ǘ�Ñ���0l _ZדN�̦7t'�qgZ�:�����cy=U��e��F���Wi��F������������� 2�hMn��r[�5UȧBވQ��Y�&�s���J��lެA5k��� {QmkM!����u[+ +{��@��:����?*�'� +S�WI��Z��r��������������+:�_���@�F���ѩx�]������������ϐ�wbV�a +~7֏�b��v��Ŏۿ��</'�U��!"Y�{�6� +dY�4���h߷�=@��<�]�IHr�����A��9O����I�Lk��v���)jFow ���j�}˰7�u3�M�z>Dp�3N-��>Q>փ��,[�*����4�6�-ib#�Lʑ�O�1t���=�(��JdW�hbB��Jf.����������PK�6�{���[$��PK����Q�/���������������META-INF/manifest.xml�ұj�0�O��n�ө;��)�ڃ3t�9Ȓ��!~����B��I��_p���q��kg3X� ����38T��+l7O�s^쪟r/ZiuC���A���Ϗ�����M�Ů?"�U.���`#�A���\C�o����5�s�Ft�w���$+��$f�ц"��S�e�cGȮ3ZI�Ƴ�c?�8��4 +�f0&�$�2@��&�WJ�x��?�1]C���r�C��u=����lK,��J�ai�iS�Y��/PKS�S�������PK�������Q�/E�������������������������mimetypePK�����Q�/&�ɳ +������������������B���content.xmlPK�����Q�/��L�}���� +�������������� +��styles.xmlPK�������Q�/,o®�������������������?��meta.xmlPK�����Q�/�6�{���[$���������������S��settings.xmlPK�����Q�/S�S��������������������F��META-INF/manifest.xmlPK������Z������� \ No newline at end of file Index: openacs-4/packages/simulation/www/siminst/map-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-create.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/simulation/www/siminst/map-create.tcl 28 Nov 2003 16:55:52 -0000 1.1 +++ openacs-4/packages/simulation/www/siminst/map-create.tcl 2 Dec 2003 13:46:54 -0000 1.2 @@ -7,12 +7,15 @@ workflow_id:integer } -set page_title "Create mapped template" -set context [list [list "." "SimInst"] $page_title] +set user_id [auth::require_login] +set page_title "Create Mapped Template" +set context [list [list "." "SimInst"] $page_title] set old_name [workflow::get_element -workflow_id $workflow_id -element pretty_name] -set name_default "$old_name Mapped" +acs_user::get -user_id $user_id -array user_array +set name_default "$old_name mapped by $user_array(name)" + ad_form \ -name template \ -export { workflow_id } \