Index: openacs-4/packages/content-portlet/.DS_Store =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/.DS_Store,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/.DS_Store 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1 @@ +Bud1�i0blobwwwfwi0blobicnvwwwfwswlong�  @� @� @� @ E�DSDB ` @� @� @ \ No newline at end of file Index: openacs-4/packages/content-portlet/content-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/content-portlet.info,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/content-portlet.info 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,30 @@ + + + + + Content Portlet + Content Portlet + f + t + + + Byron Linares (admin) + 0 + + + + + + + + + + + + + + + + + + Index: openacs-4/packages/content-portlet/catalog/content-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/catalog/content-portlet.de_DE.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/catalog/content-portlet.de_DE.ISO-8859-1.xml 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,9 @@ + + + + Content Portlet + Content Portlets verwalten + Neues %element_pretty_name% + Name + Neu + Index: openacs-4/packages/content-portlet/catalog/content-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/catalog/content-portlet.en_US.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/catalog/content-portlet.en_US.ISO-8859-1.xml 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,39 @@ + + + + Add new section + Add new unit + Content Portlet + Content Portlet Administration + Back + You Can delete this section + Content + Decreasing + Delete Section + Welcome to the content section of your course. + Here you will find the study material that your teacher has uploaded for you. +If you have any doubts about the usage of this application you can consult the user's guide + Edit Header Page + Edit content index + Edit Name + Home + Increasing + Content Index page + This section have mapped object + Name + New + New %element_pretty_name% + New Seccion + Next + Each Unit is divided in the following sections: <br /><ul> +<li> Introduction</li> +<li> Content</li> +<li> Activities</li> +<li> Glossary</li> +<li> Annexed</li> +</ul> +These sections can change once the Unit is created. And it is possible to create new sub-sections. + + Welcome to GES Web content editor + Welcome this section you can create a web content for you coures + Index: openacs-4/packages/content-portlet/catalog/content-portlet.es_GT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/catalog/content-portlet.es_GT.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/catalog/content-portlet.es_GT.ISO-8859-1.xml 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,41 @@ + + + + Agregar Secci�n + Agregar una Unidad/Capitulo nuevo. + Portlet Contenido + Administracion de contenido + Atr�s + Puede Eliminar esta seccion si desea + Contenido + Desender + Eliminar Secci�n + Bienvenido a la secci�n de contenido de tu curso. + Aqu� encontrar�s el material de estudio que tu catedr�tico ha subido. +Si tienes dudas de c�mo usar esta aplicaci�n puedes consultar el manual + Editar P�gina de Encabezado + Editar �ndice de contenido + Editar Nombre + Inicio + Incrementar + Indice de contenido + Esta secci�n NO puede ser borrada, ya que tiene elementos. + Nombre + Nuevo + Nuevo %element_pretty_name% + Nueva Secci�n + Siguiente + Cada Unidad o Capitulo se divide en las siguiente secciones:<br /><ul> +<li> Introducci�n</li> +<li> Contenido</li> +<li> Actividades</li> +<li> Glosario</li> +<li> Anexo</li> +</ul> + Dichas secciones pueden cambiarse una vez creada la Unidad / + Capitulo. Y se puede crear adicionalmente nuevas sub-secciones. + + Bienvenido al editor de contenido web de GES + En esta secci�n usted podr� crear contenido web para su curso +Si tiene dudas de c�mo usar esta aplicaci�n puede consultar el manual + Index: openacs-4/packages/content-portlet/misc/admin/category-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-add-edit.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-add-edit.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1 @@ +@name@ \ No newline at end of file Index: openacs-4/packages/content-portlet/misc/admin/category-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-add-edit.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-add-edit.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,62 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-08-24 + @arch-tag: F871480C-371A-46DB-81EF-F5761D7A984C + @cvs-id $Id: category-add-edit.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + + tree_id:integer + name:notnull + category_id:integer,optional + return_url:optional + {parent_id:integer,optional [db_null]} + {language "es_GT"} + {mode 1} + +} -properties { +} -validate { +} -errors { +} + +set user_id [ad_maybe_redirect_for_registration] +set package_id [ad_conn package_id] +permission::require_permission -object_id $tree_id -privilege category_tree_write +set description "User category for content package" + +if {$mode eq 1 && [exists_and_not_null category_id]} { + ## edit mode#### + category::update -category_id $category_id \ + -locale $language \ + -name $name \ + -description $description + +} elseif {$mode eq 2} { + if {[content_category::valid_level_and_count -tree_id $tree_id \ + -category_id $parent_id]} { + set new_cat [category::add -tree_id $tree_id \ + -parent_id $parent_id \ + -locale $language \ + -name $name \ + -description $description] + set parent_cat [content_category::category_parent -category_id $new_cat -tree_id $tree_id] + } +} elseif {$mode eq 3} { + set new_cat [content_category::new_subtree -tree_id $tree_id] + set parent_cat $new_cat + +} + +if {[exists_and_not_null return_url]} { + if {[exists_and_not_null new_cat]} { + ad_returnredirect "$return_url&new_cat=$new_cat&parent_cat=$parent_cat" + } else { + ad_returnredirect $return_url + } +} else { + # ad_return_template +} \ No newline at end of file Index: openacs-4/packages/content-portlet/misc/admin/category-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-confirm.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-confirm.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,10 @@ + + Confirmacion + +
+
+
+@body_msg;noquote@ +
+ + \ No newline at end of file Index: openacs-4/packages/content-portlet/misc/admin/category-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-confirm.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-confirm.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,37 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-09-13 + @arch-tag: F4A0ADC6-B070-4452-B70E-2FB409C8A738 + @cvs-id $Id: category-confirm.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + + tree_id:integer + category_id:integer,notnull + {locale ""} + object_id:integer,optional + return_url:optional + + +} -properties { +} -validate { +} -errors { +} + +set user_id [ad_maybe_redirect_for_registration] +set body_msg "[_ content-portlet.can_delete]" +permission::require_permission -object_id $tree_id -privilege category_tree_write +set tree_list [content_category::get_tree_levels -subtree_id $category_id $tree_id] +set tree_list [linsert $tree_list 0 $category_id] +foreach category $tree_list { + set my_category_id [lindex $category 0] + if {[db_string dbqd.xowiki.www.admin.category-delete.check_mapped_objects {}] eq 1} { + set body_msg "[_ content-portlet.mapped_objects]" + ad_return_template + } +} + Index: openacs-4/packages/content-portlet/misc/admin/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-delete-2.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-delete-2.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,37 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-08-27 + @arch-tag: 37E094FE-5831-4CF6-80AC-0FC7C1A64252 + @cvs-id $Id: category-delete-2.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + + tree_id:integer + category_id:integer,notnull + {locale ""} + object_id:integer,optional + return_url:optional + +} -properties { +} -validate { +} -errors { +} + + +set user_id [ad_maybe_redirect_for_registration] +permission::require_permission -object_id $tree_id -privilege category_tree_write + +db_transaction { + category::delete $category_id + category_tree::flush_cache $tree_id +} on_error { + ad_return_complaint 1 "[_ content-portlet.still_contains_subcategories]" + ad_script_abort +} + +ad_returnredirect $return_url + Index: openacs-4/packages/content-portlet/misc/admin/category-delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-delete-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-delete-postgresql.xql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,26 @@ + + + + + + + + + + + + postgresql + 7.2 + + + + + + select case when count(*) = 0 then 0 else 1 end + where exists (select 1 from category_object_map + where category_id = :my_category_id) + + + + + \ No newline at end of file Index: openacs-4/packages/content-portlet/misc/admin/category-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-delete.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-delete.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,48 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-08-27 + @arch-tag: 2D2A97D5-0515-479D-90D6-A22F05718776 + @cvs-id $Id: category-delete.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + + tree_id:integer + category_id:integer,notnull + {locale ""} + object_id:integer,optional + return_url:optional + +} -properties { +} -validate { +} -errors { +} + + +set user_id [ad_maybe_redirect_for_registration] +permission::require_permission -object_id $tree_id -privilege category_tree_write +set delete_url [export_vars -no_empty -base category-delete-2 { tree_id category_id:multiple locale object_id }] +set cancel_url [export_vars -no_empty -base tree-view { tree_id locale object_id }] +set page_title "Delete categories" + +set tree_list [content_category::get_tree_levels -subtree_id $category_id $tree_id] +set tree_list [linsert $tree_list 0 $category_id] +foreach category $tree_list { + set my_category_id [lindex $category 0] + if {[db_string check_mapped_objects {}] eq 1} { + ad_return_complaint 1 "[_ content-portlet.mapped_objects]" + ad_script_abort + } + lappend category_ids $my_category_id +} + +ns_log notice "byronnnnn $tree_id $category_ids $return_url" +set result [content_category::category_delete $tree_id $category_ids] +if {$result eq 0} { + ad_return_complaint 1 "[_ content-portlet.still_contains_subcategories]" +} +ad_returnredirect $return_url + Index: openacs-4/packages/content-portlet/misc/admin/category-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-view.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-view.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,56 @@ + + @title@ + + + + + @ah_sources;noquote@ + + + + + + +Regresar


+
+ @cat_tree;noquote@ + + +
+
+ +
+

+#content-portlet.unit_descirption# +

+
+ + +
+ + + + Index: openacs-4/packages/content-portlet/misc/admin/category-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/category-view.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/category-view.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,168 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-08-24 + @arch-tag: 9EFDF2BF-FE25-4238-8A63-2FFDB9C7BD31 + @cvs-id $Id: category-view.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + tree_id:optional + package_id:optional + {new_cat 0} + {parent_cat 0} +} -properties { +} -validate { +} -errors { +} + + +set ah_sources [ah::js_sources] +if {![exists_and_not_null tree_id] && [exists_and_not_null package_id]} { + set tree_id [lindex [lindex [category_tree::get_mapped_trees $package_id] 0] 0] +} + + + +set user_id [ad_maybe_redirect_for_registration] +set package_id [ad_conn package_id] +permission::require_permission -object_id $tree_id -privilege category_tree_write + +set tree_list [category_tree::get_tree $tree_id] +array set tree [category_tree::get_data $tree_id] +set class "liClosed" + +set tmp_level 1 +set title "\#content-portlet.edit_index\#" +set context_bar [list [_ content-portlet.edit_index]] +set return_url [ad_return_url] +set root_add_link "category-add-edit?tree_id=${tree_id}&name=Root&mode=3&return_url=$return_url" + +set level_1_tree "" +set level_2_tree "" +set level_list [list] +set aux_level 0 +set my_tmp_level 0 +set inplaceeditor_js "" + +set msg_fade [ah::effects -element "msg_div" \ + -effect "Fade" \ + -options "duration: 1.5"] + +set msg_fade_0 [ah::effects -element "msg_div" \ + -effect "Fade" \ + -options "duration: 0"] + +set msg_appear [ah::effects -element "msg_div" \ + -effect "Appear" \ + -options "duration: 0.5"] + +set msg2_fade [ah::effects -element "msg_div2" \ + -effect "Fade" \ + -options "duration: 1.5"] + +set msg2_appear [ah::effects -element "msg_div2" \ + -effect "Appear" \ + -options "duration: 0.5"] + +set msg2_fade_0 [ah::effects -element "msg_div2" \ + -effect "Fade" \ + -options "duration: 0"] + + +set cat_tree "\n" + +#ns_log notice "$cat_tree" Index: openacs-4/packages/content-portlet/misc/admin/order.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/order.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/order.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,4 @@ + +
+
+
\ No newline at end of file Index: openacs-4/packages/content-portlet/misc/admin/order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/order.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/order.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,56 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-07-04 + @arch-tag: 491DB986-A2AF-4EE1-9857-821F536C41CA + @cvs-id $Id: order.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + + page_id:optional + page_pos:optional + page_name:optional + content_id:optional + status:optional + dir:optional + show:optional + {action 0} + + +} -properties { +} -validate { +} -errors { +} + +if {![string match $page_pos "@page_order@"]} { + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + if {![ permission::permission_p -object_id $item_id -privilege admin]} { + set show 0 + } else { + + set my_cat_id [category::get_mapped_categories $item_id] + + set count_page [db_string select_count { + select count(ci.item_id) + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + and category_id = :my_cat_id} -default 0] + + if {$count_page > 1} { + set show 1 + } else { + set show 0 + } + } +} else { + set show 0 +} + Index: openacs-4/packages/content-portlet/misc/admin/toggle-page-order.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/toggle-page-order.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/toggle-page-order.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,4 @@ + + + @alt@ + Index: openacs-4/packages/content-portlet/misc/admin/toggle-page-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/admin/toggle-page-order.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/admin/toggle-page-order.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,116 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-06-25 + @arch-tag: E81B62CE-430F-4586-9DFA-2AC7C57672D6 + @cvs-id $Id: toggle-page-order.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} { + page_id:optional + page_pos:optional + page_name:optional + content_id:optional + status:optional + dir:optional + show:optional + {action 0} +} -properties { +} -validate { +} -errors { +} + +set page_list [list] +set next_list [list] +if {![string match $page_pos "@page_order@"]} { + set wiki_url "[site_node::get_url_from_object_id -object_id $content_id]$page_name" + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set cat_id [category::get_mapped_categories $item_id] + + if {![ permission::permission_p -object_id $item_id -privilege admin]} { + set show 0 + } else { + + db_foreach select_page { + select ci.item_id as tmp_item_id, r.revision_id, ci.name, ci.content_type, r.title, category_id,p.page_order, ci.publish_status + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + and category_id = :cat_id + order by p.page_order} { + + lappend page_list [list $tmp_item_id $page_order $name $revision_id $publish_status] + } + + + set order_page [lsort -$dir -command content_compare::compare $page_list] + set count 0 + foreach pages $order_page { + set current_pos [lsearch -exact $pages $page_id] + if {$current_pos >= 0} { + incr count + set next_list [lindex $order_page $count] + break + } + incr count + } + + if {[llength $next_list] > 0} { + + if {$action == 0} { + set show 1 + switch $dir { + "decreasing" { + set img_name "up" + } + "increasing" { + set img_name "down" + } + } + set nexturl [export_vars -base admin/toggle-page-order {page_id page_pos page_name content_id status dir {action 1} {show 0}}] + set alt "[_ content-portlet.page_${dir}]" + } elseif {$action == 1} { + + set tmp_order [lindex $next_list 1] + set tmp_item_id [lindex $next_list 0] + set tmp_page_id [lindex $next_list 3] + set tmp_status [lindex $next_list 4] + db_dml update_page { + UPDATE xowiki_page + SET page_order = :tmp_order where page_id = :page_id + } + + ns_cache flush xotcl_object_cache ::$item_id + ns_cache flush xotcl_object_cache ::$page_id + db_0or1row make_live { + select content_item__set_live_revision(:page_id, :status) + } + + + db_dml update_page { + UPDATE xowiki_page + SET page_order = :page_pos where page_id = :tmp_page_id + } + + + ns_cache flush xotcl_object_cache ::$tmp_item_id + ns_cache flush xotcl_object_cache ::$tmp_page_id + db_0or1row make_live { + select content_item__set_live_revision(:tmp_page_id, :tmp_status) + } + + ad_returnredirect "${wiki_url}\#cont1" + } + } else { + set show 0 + } + } +} else { + set show 0 +} Index: openacs-4/packages/content-portlet/misc/portlets/ges-categories.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/portlets/ges-categories.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/portlets/ges-categories.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,130 @@ +# $Id: ges-categories.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +# display the category tree with associated pages +# -gustaf neumann +# +# valid parameters from the adp include are +# tree_name: match pattern, if specified displays only the trees +# with matching names +# no_tree_name: if specified, tree names are not displayed +# open_page: name (e.g. en:iMacs) of the page to be opened initially +# tree_style: boolean, default: true, display based on mktree +# skin: name of adp-file to render content + +::xowiki::Page proc __render_html { + -package_id + {-tree_name ""} + -tree_style + -no_tree_name:boolean + -count:boolean + {-summary 0} + {-open_page ""} + {-category_ids ""} + {-except_category_ids ""} +} { + + set folder_id [$package_id folder_id] + # get the folder id from the including page + set open_item_id [expr {$open_page ne "" ? + [CrItem lookup -name $open_page -parent_id $folder_id] : 0}] + + set content "" + foreach tree [category_tree::get_mapped_trees $package_id] { + foreach {tree_id my_tree_name ...} $tree {break} + if {$tree_name ne "" && ![string match $tree_name $my_tree_name]} continue + if {!$no_tree_name} { + append content "

$my_tree_name

" + } + set categories [list] + set pos 0 + set cattree(0) [::xowiki::CatTree new -volatile -orderby pos -name $my_tree_name] + foreach category_info [category_tree::get_tree $tree_id] { + foreach {cid category_label deprecated_p level} $category_info {break} + set c [::xowiki::Category new -orderby pos -category_id $cid -package_id $package_id \ + -level $level -label $category_label -pos [incr pos]] + set cattree($level) $c + set plevel [expr {$level -1}] + $cattree($plevel) add $c + set category($cid) $c + lappend categories $cid + #set itemobj [Object new -set name en:index -set title MyTitle -set prefix "" -set suffix ""] + #$cattree(0) add_to_category -category $c -itemobj $itemobj -orderby title + } + + set sql "category_object_map c, cr_items ci, cr_revisions r, xowiki_page p \ + where c.object_id = ci.item_id and ci.parent_id = $folder_id \ + and ci.content_type not in ('::xowiki::PageTemplate') \ + and category_id in ([join $categories ,]) \ + and r.revision_id = ci.live_revision \ + and p.page_id = r.revision_id + and ci.name not in ('es:header_page','es:index','es:indexe')" + + if {$except_category_ids ne ""} { + append sql \ + " and not exists (select * from category_object_map c2 \ + where ci.item_id = c2.object_id \ + and c2.category_id in ($except_category_ids))" + } + ns_log notice "--c category_ids=$category_ids" + if {$category_ids ne ""} { + foreach cid [split $category_ids ,] { + append sql " and exists (select * from category_object_map \ + where object_id = ci.item_id and category_id = $cid)" + } + } + + if {$count} { + db_foreach get_counts \ + "select count(*) as nr,category_id from $sql group by category_id" { + $category($category_id) set count $nr + set s [expr {$summary ? "&summary=$summary" : ""}] + $category($category_id) href [ad_conn url]?category_id=$category_id$s + $category($category_id) open_tree + } + append content [$cattree(0) render -tree_style $tree_style] + } else { + db_foreach get_pages \ + "select ci.item_id, ci.name, ci.content_type, r.title, category_id, p.page_order from $sql" { + if {$title eq ""} {set title $name} + set itemobj [Object new] + set prefix "" + set suffix "" + foreach var {name title prefix page_order suffix} {$itemobj set $var [set $var]} + $cattree(0) add_to_category \ + -category $category($category_id) \ + -itemobj $itemobj \ + -orderby page_order \ + -open_item [expr {$item_id == $open_item_id}] + } + append content [$cattree(0) render -tree_style $tree_style] + } + } + return $content +} + +set link "" +if {![info exists name]} {set name "Categories"} +# TODO new style includelets, based on ::xo::cc +set summary [expr {[ns_conn isconnected] ? [ns_queryget summary 0]} : 0] +foreach _ {category_ids except_category_ids} { + if {![info exists $_]} { + # TODO new style includelets, based on ::xo::cc + set $_ [expr {[ns_conn isconnected] ? [ns_queryget $_ ""] : ""}] + } +} + +set content [::xowiki::Page __render_html \ + -package_id [$__including_page set package_id] \ + -tree_name [expr {[info exists tree_name] ? $tree_name : ""}] \ + -tree_style [expr {[info exists tree_style] ? $tree_style : 1}] \ + -no_tree_name [info exists no_tree_name] \ + -count [info exists count] \ + -summary $summary \ + -open_page [expr {[info exists open_page] ? $open_page : ""}] \ + -category_ids $category_ids \ + -except_category_ids $except_category_ids \ + ] + +if {![info exists skin]} {set skin portlet-skin} +if {![string match /* $skin]} {set skin [file dir $__adp_stub]/$skin} +template::set_file $skin + Index: openacs-4/packages/content-portlet/misc/www/ges-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/www/ges-view.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/www/ges-view.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,174 @@ + + @title;noquote@ + @context;noquote@ + @header_stuff;noquote@ + + + + + + + + + + + + +
+ + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ @content;noquote@
+
+ + +
Digg! + +
+
+ + + + +
+ Add to My Yahoo! +
+
+
+ +@footer;noquote@ + + + Categories: @per_object_categories_with_links;noquote@ + +

+ +

#general-comments.Comments# +

    @gc_comments;noquote@

+
+ +

@gc_link;noquote@

+
+ + + \ No newline at end of file Index: openacs-4/packages/content-portlet/misc/www/page-instance-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/www/page-instance-new.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/www/page-instance-new.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,71 @@ +# +::xowiki::Package initialize -ad_doc { + + This is the resolver for this package. It turns a request into + an object and executes the object with the computed method + + @author byron linares (bhlr@galileo.edu) + + +} -parameter { +} + +set autoname [::$package_id get_parameter autoname 0] +set folder_id [::xowiki::Page require_folder -name xowiki -package_id $package_id] +set page [::xowiki::PageInstance new ] +set page_index [db_string page_index { + select count(p.page_id) from cr_items ci, cr_revisions r, xowiki_page p + where ci.parent_id = :folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id} -default 0] + +set page_name "es:page_[incr page_index]" +if {[db_string select_name { + select 1 from cr_items + where name = :page_name + and parent_id = :folder_id} -default 0]} { + + set page_name "es:[format "%0.0f" [expr [random] * 10]]_[format "%0.0f" [expr [random] * 10]]_page_[incr page_index]" +} + +$page configure -name $page_name -parent_id $folder_id -package_id $package_id + + + +set list_page_order [db_list select_order { + select p.page_order + from cr_items ci, cr_revisions r, xowiki_page p + where ci.parent_id = :folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + and p.page_order is not null + order by p.page_order desc + }] + +set max_page_order [lindex [lsort -decreasing -command content_compare::simple_compare $list_page_order] 0] +if {[llength $list_page_order] < 1} { + set max_page_order 0 +} +incr max_page_order + +db_0or1row select_instance [::xowiki::PageTemplate instance_select_query \ + -folder_id $folder_id \ + -select_attributes {name} \ + -where_clause "name = 'es:Template_de_ges'"] + +set template_id $item_id + +$page set page_template $template_id +$page set page_order $max_page_order +$page destroy_on_cleanup +$page initialize_loaded_object +$page save_new +set item_id [$page item_id] +set return_url "[::$package_id package_url][$page set name]" +set link [::$package_id pretty_link [$page set name]] +ad_returnredirect [export_vars -base $link {{m edit} page_template return_url item_id}] + + + Index: openacs-4/packages/content-portlet/misc/www/view-links-ges.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/misc/www/view-links-ges.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/misc/www/view-links-ges.adp 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,19 @@ + Index: openacs-4/packages/content-portlet/sql/postgresql/content-portlet-admin-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/sql/postgresql/content-portlet-admin-drop.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/sql/postgresql/content-portlet-admin-drop.sql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,118 @@ +-- +-- Copyright (C) 2001, 2002 MIT +-- +-- This file is part of dotLRN. +-- +-- dotLRN is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +-- details. +-- + +-- +-- content-portlet-admin-drop.sql +-- + +-- Deletes a portal datasource for the static portlet factory +-- (admin interface) + +-- Copyright (C) 2001 MIT +-- @author Arjun Sanyal (arjun@openforce.net) + +-- $Id: content-portlet-admin-drop.sql,v 1.1 2007/10/24 22:50:25 victorg Exp $ + +-- This is free software distributed under the terms of the GNU Public +-- License version 2 or higher. Full text of the license is available +-- from the GNU Project: http://www.fsf.org/copyleft/gpl.html +-- +-- PostGreSQL port samir@symphinity.com 11 July 2002 +-- + + + +create function inline_1() +returns integer as ' +declare + ds_id portal_datasources.datasource_id%TYPE; +begin + + select datasource_id into ds_id + from portal_datasources + where name = ''content_admin_portlet''; + + if not found then + RAISE EXCEPTION '' No datasource id found '', ds_id; + ds_id := null; + end if; + + if ds_id is NOT null then + perform portal_datasource__delete(ds_id); + end if; + + -- drop the hooks + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''GetMyName'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''GetPrettyName'' + ); + + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''Link'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''AddSelfToPage'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''Show'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''Edit'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_admin_portlet'', + ''RemoveSelfFromPage'' + ); + + -- Drop the binding + perform acs_sc_binding__delete ( + ''portal_datasource'', + ''content_admin_portlet'' + ); + + -- drop the impl + perform acs_sc_impl__delete ( + ''portal_datasource'', + ''content_admin_portlet'' + ); + + return 0; +end;' language 'plpgsql'; + +select inline_1(); +drop function inline_1(); + Index: openacs-4/packages/content-portlet/sql/postgresql/content-portlet-admin.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/sql/postgresql/content-portlet-admin.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/sql/postgresql/content-portlet-admin.sql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,190 @@ +-- +-- Copyright (C) 2001, 2002 MIT +-- +-- This file is part of dotLRN. +-- +-- dotLRN is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +-- details. +-- + +-- +-- content-admin-portlet.sql +-- + +-- Creates a portal datasource for the content portlet factory +-- (admin interface) + +-- Copyright (C) 2001 MIT +-- @author Arjun Sanyal (arjun@openforce.net) + +-- $Id: content-portlet-admin.sql,v 1.1 2007/10/24 22:50:25 victorg Exp $ + +-- This is free software distributed under the terms of the GNU Public +-- License version 2 or higher. Full text of the license is available +-- from the GNU Project: http://www.fsf.org/copyleft/gpl.html +-- +-- PostGreSQL port samir@symphinity.com 11 July 2002 +-- + +create function inline_0() +returns integer as ' +declare + ds_id portal_datasources.datasource_id%TYPE; +begin + ds_id := portal_datasource__new( + ''content_admin_portlet'', -- name + ''Displays the admin interface for the content data portlets'' -- Description + ); + + -- 4 defaults procs + + -- shadeable_p + perform portal_datasource__set_def_param ( + ds_id, -- datasource_id + ''t'', -- config_required_p + ''t'', -- configured_p + ''shadeable_p'', -- key + ''f'' -- value +); + + -- shaded_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''shaded_p'', + ''f'' +); + + -- hideable_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''hideable_p'', + ''t'' +); + + -- user_editable_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''user_editable_p'', + ''f'' +); + + -- link_hideable_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''link_hideable_p'', + ''t'' +); + + + -- content-admin-specific procs + + -- package_id must be configured + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''f'', + ''package_id'', + '''' +); + return 0; +end;' language 'plpgsql'; + +select inline_0(); + +drop function inline_0(); + + +create function inline_1() +returns integer as ' +begin + -- create the implementation + perform acs_sc_impl__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''content_admin_portlet'' + ); + + -- add all the hooks + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''GetMyName'', + ''content_admin_portlet::get_my_name'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''GetPrettyName'', + ''content_admin_portlet::get_pretty_name'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''Link'', + ''content_admin_portlet::link'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''AddSelfToPage'', + ''content_admin_portlet::add_self_to_page'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''Show'', + ''content_admin_portlet::show'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''Edit'', + ''content_admin_portlet::edit'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_admin_portlet'', + ''RemoveSelfFromPage'', + ''content_admin_portlet::remove_self_from_page'', + ''TCL'' + ); + + -- Add the binding + perform acs_sc_binding__new ( + ''portal_datasource'', -- contract_name + ''content_admin_portlet'' -- impl_name + ); + + return 0; +end;' language 'plpgsql'; + +select inline_1(); + +drop function inline_1(); Index: openacs-4/packages/content-portlet/sql/postgresql/content-portlet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/sql/postgresql/content-portlet-create.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/sql/postgresql/content-portlet-create.sql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,20 @@ +-- +-- Copyright (C) 2001, 2002 MIT +-- +-- This file is part of dotLRN. +-- +-- dotLRN is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +-- details. +-- +-- +-- PostGreSQL port samir@symphinity.com 11 July 2002 +-- +\i content-portlet-portlet.sql +\i content-portlet-admin.sql Index: openacs-4/packages/content-portlet/sql/postgresql/content-portlet-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/sql/postgresql/content-portlet-drop.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/sql/postgresql/content-portlet-drop.sql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,20 @@ +-- +-- Copyright (C) 2001, 2002 MIT +-- +-- This file is part of dotLRN. +-- +-- dotLRN is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +-- details. +-- +-- +-- PostGreSQL port samir@symphinity.com 11 July 2002 +-- +\i content-portlet-portlet-drop.sql +\i content-portlet-admin-drop.sql Index: openacs-4/packages/content-portlet/sql/postgresql/content-portlet-portlet-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/sql/postgresql/content-portlet-portlet-drop.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/sql/postgresql/content-portlet-portlet-drop.sql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,121 @@ +-- +-- Copyright (C) 2001, 2002 MIT +-- +-- This file is part of dotLRN. +-- +-- dotLRN is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +-- details. +-- + +-- +-- content-portlet-portlet-drop.sql +-- + +-- Deletes a portal datasource for the content portlet factory + +-- Copyright (C) 2001 MIT +-- @author Arjun Sanyal (arjun@openforce.net) + +-- $Id: content-portlet-portlet-drop.sql,v 1.1 2007/10/24 22:50:25 victorg Exp $ + +-- This is free software distributed under the terms of the GNU Public +-- License version 2 or higher. Full text of the license is available +-- from the GNU Project: http://www.fsf.org/copyleft/gpl.html +-- +-- PostGreSQL port samir@symphinity.com 11 July 2002 +-- + + + +create function inline_1() +returns integer as ' +declare + ds_id portal_datasources.datasource_id%TYPE; +begin + + select datasource_id into ds_id + from portal_datasources + where name = ''content_portlet''; + + if not found then + RAISE EXCEPTION '' No datasource id found '', ds_id; + ds_id := null; + end if; + + if ds_id is NOT null then + perform portal_datasource__delete(ds_id); + end if; + + -- drop the hooks + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''GetMyName'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''GetPrettyName'' + ); + + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''Link'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''AddSelfToPage'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''Show'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''Edit'' + ); + + perform acs_sc_impl_alias__delete ( + ''portal_datasource'', + ''content_portlet'', + ''RemoveSelfFromPage'' + ); + + -- Drop the binding + perform acs_sc_binding__delete ( + ''portal_datasource'', + ''content_portlet'' + ); + + -- drop the impl + perform acs_sc_impl__delete ( + ''portal_datasource'', + ''content_portlet'' + ); + + return 0; +end;' language 'plpgsql'; + +select inline_1(); +drop function inline_1(); + + + + + Index: openacs-4/packages/content-portlet/sql/postgresql/content-portlet-portlet.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/sql/postgresql/content-portlet-portlet.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/sql/postgresql/content-portlet-portlet.sql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,201 @@ +-- +-- Copyright (C) 2001, 2002 MIT +-- +-- This file is part of dotLRN. +-- +-- dotLRN is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +-- details. +-- + +-- +-- content-portlet-portlet.sql +-- + +-- Creates a portal datasource for the content portlet factory + +-- Copyright (C) 2001 MIT +-- @author Arjun Sanyal (arjun@openforce.net) + +-- $Id: content-portlet-portlet.sql,v 1.1 2007/10/24 22:50:25 victorg Exp $ + +-- This is free software distributed under the terms of the GNU Public +-- License version 2 or higher. Full text of the license is available +-- from the GNU Project: http://www.fsf.org/copyleft/gpl.html +-- +-- PostGreSQL port samir@symphinity.com 11 July 2002 +-- + + +create function inline_0() +returns integer as ' +declare + ds_id portal_datasources.datasource_id%TYPE; +begin + ds_id := portal_datasource__new( + ''content_portlet'', -- name + ''Displays an content page as a portlet'' -- description + ); + + -- 4 defaults procs + + -- shadeable_p + perform portal_datasource__set_def_param ( + ds_id, -- datasource_id + ''t'', -- config_required_p + ''t'', -- configured_p + ''shadeable_p'', -- key + ''t'' -- value + ); + + -- shaded_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''shaded_p'', + ''f'' + ); + + -- hideable_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''hideable_p'', + ''t'' + ); + + -- user_editable_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''user_editable_p'', + ''f'' +); + + -- link_hideable_p + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''t'', + ''link_hideable_p'', + ''t'' +); + + + -- content-specific procs + + -- package_id must be configured + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''f'', + ''package_id'', + '''' +); + + perform portal_datasource__set_def_param ( + ds_id, + ''t'', + ''f'', + ''page_name'', + '''' +); + + return 0; +end;' language 'plpgsql'; + +select inline_0(); + +drop function inline_0(); + + +create function inline_1() +returns integer as ' +begin + + -- create the implementation + perform acs_sc_impl__new ( + ''portal_datasource'', + ''content_portlet'', + ''content_portlet'' + ); + + -- add all the hooks + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''GetMyName'', + ''content_portlet::get_my_name'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''GetPrettyName'', + ''content_portlet::get_pretty_name'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''Link'', + ''content_portlet::link'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''AddSelfToPage'', + ''content_portlet::add_self_to_page'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''Show'', + ''content_portlet::show'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''Edit'', + ''content_portlet::edit'', + ''TCL'' + ); + + perform acs_sc_impl_alias__new ( + ''portal_datasource'', + ''content_portlet'', + ''RemoveSelfFromPage'', + ''content_portlet::remove_self_from_page'', + ''TCL'' + ); + + -- Add the binding + perform acs_sc_binding__new ( + ''portal_datasource'', -- contract_name + ''content_portlet'' -- impl_name + ); + + + return 0; +end;' language 'plpgsql'; + +select inline_1(); + +drop function inline_1(); Index: openacs-4/packages/content-portlet/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/apm-callback-procs.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/tcl/apm-callback-procs.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,149 @@ +# + +ad_library { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-09-08 + @arch-tag: DA257725-36B9-464F-96B8-663D77F70456 + @cvs-id $Id: apm-callback-procs.tcl,v 1.1 2007/10/24 22:50:25 victorg Exp $ +} + +namespace eval content-portlet::apm {} + +ad_proc -public content-portlet::apm::after_upgrade { + {-from_version_name:required} + {-to_version_name:required} +} { + apm_upgrade_logic \ + -from_version_name $from_version_name \ + -to_version_name $to_version_name \ + -spec { + 0.1d2 0.1d3 { + set count 0 + set instructor_id "" + set wiki_package_list [xowiki::Package instances] + foreach wiki_package_id $wiki_package_list { + set trees [category_tree::get_mapped_trees $wiki_package_id] + set tree_id [lindex [lindex $trees 0] 0] + set wiki_folder_id [::xowiki::Page require_folder \ + -name xowiki \ + -package_id $wiki_package_id] + set tree_list [category_tree::get_tree_levels $tree_id] + + + + set wiki_url [site_node::get_url_from_object_id \ + -object_id $wiki_package_id] + set community_id [dotlrn_community::get_community_id_from_url \ + -url $wiki_url] + + set instructors [dotlrn_community::list_users_in_role \ + -rel_type "dotlrn_instructor_rel" $community_id] + + set instructor_id [lindex [lindex $instructors 0] 3] + + set new_tree_id [content_category::map_new_tree \ + -object_id $wiki_package_id \ + -tree_name "Indice De Contenido" \ + -user_id $instructor_id] + + set new_tree_list [category_tree::get_tree_levels \ + -only_level 2 $new_tree_id] + + foreach category $tree_list { + set cat_id [lindex $category 0] + set new_cat_id [lindex [lindex $new_tree_list $count] 0] + db_foreach select_content { + select ci.item_id, p.page_order, + ci.name, ci.content_type, category_id, + xpi.page_instance_id + from category_object_map c, cr_items ci, + xowiki_page p, + xowiki_page_instance xpi + where c.object_id = ci.item_id + and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and p.page_id = xpi.page_instance_id + and category_id = :cat_id + and xpi.page_instance_id = ci.live_revision + order by p.page_order} { + category::map_object -remove_old -object_id $item_id $new_cat_id + } + incr count + } + set count 0 + + + foreach tree $trees { + set tree_id [lindex $tree 0] + category_tree::unmap -tree_id $tree_id -object_id $wiki_package_id + } + + + db_0or1row select_instance [::xowiki::PageTemplate instance_select_query \ + -folder_id $wiki_folder_id \ + -select_attributes {name} \ + -where_clause "name = 'es:Template_de_ges'"] + + set template_id $item_id + + set template [xowiki::Package instantiate_page_from_id -item_id $item_id] + + set text [list { +
+ {{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
+ + + + + + + + + + + {{adp /packages/content-portlet/www/complete-titlebar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ my_title {@title@}}}} + + + + + + + + + + + + + + + +
{{adp portlets/wiki {name header_page skin plain-include}}}
{{adp /packages/content-portlet/www/unit-navbar {page_id @revision_id@ content_id @package_id@}}}
+ + + + + + + + +
  {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@}}}
{{adp /packages/content-portlet/www/complete-subnavbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@}}}
@contenido@
+
+
+ }] + + $template set text $text + $template destroy_on_cleanup + $template save + $template initialize_loaded_object + + } + + } + + } + +} Index: openacs-4/packages/content-portlet/tcl/content-admin-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/content-admin-portlet-procs.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/tcl/content-admin-portlet-procs.tcl 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,84 @@ +# +# Copyright (C) 2001, 2002 MIT +# +# This file is part of dotLRN. +# +# dotLRN is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +ad_library { + + Procedures to support the content ADMIN portlet + + @author bhlr@galileo.edu + +} + +namespace eval content_admin_portlet { + + ad_proc -private get_my_name { + } { + return "content_admin_portlet" + } + + ad_proc -public get_pretty_name { + } { + return [parameter::get_from_package_key \ + -package_key [my_package_key] \ + -parameter admin_portlet_pretty_name] + } + + ad_proc -private my_package_key { + } { + return "content-portlet" + } + + ad_proc -public link { + } { + return "" + } + + ad_proc -public add_self_to_page { + {-portal_id:required} + {-package_id:required} + } { + Adds a content admin PE to the given portal + } { + return [portal::add_element_parameters \ + -portal_id $portal_id \ + -portlet_name [get_my_name] \ + -key package_id \ + -value $package_id + ] + } + + ad_proc -public remove_self_from_page { + {-portal_id:required} + } { + Removes content PE from the given page + } { + # This is easy since there's one and only one instace_id + portal::remove_element \ + -portal_id $portal_id \ + -portlet_name [get_my_name] + } + + ad_proc -public show { + cf + } { + Display the PE + } { + portal::show_proc_helper \ + -package_key [my_package_key] \ + -config_list $cf \ + -template_src "content-admin-portlet" + } + +} Index: openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs-postgresql.xql 24 Oct 2007 22:50:25 -0000 1.1 @@ -0,0 +1,26 @@ + + + + + + + + + + + + postgresql + 7.2 + + + + + + select case when count(*) = 0 then 0 else 1 end + where exists (select 1 from category_object_map + where category_id = :my_category_id) + + + + + \ No newline at end of file Index: openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,638 @@ +# + +ad_library { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-06-21 + @arch-tag: 55D83508-E579-4609-887E-5917B9C5744E + @cvs-id $Id: content-portlet-compare-procs.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} + +namespace eval content_compare {} +namespace eval content_page {} +namespace eval content_category {} + + +ad_proc -public content_category::delete_p { + -tree_id + -category_id +} { + set tree_list [content_category::get_tree_levels \ + -subtree_id $category_id $tree_id] + set tree_list [linsert $tree_list 0 $category_id] + foreach category $tree_list { + set my_category_id [lindex $category 0] + if {[db_string check_mapped_objects {}] eq 1} { + return 0 + } + } + return 1 +} + +ad_proc -private content_page::update_object { + {-wiki_package_id ""} +} { + + if {[empty_string_p $wiki_package_id]} { + set wiki_package_list [xowiki::Package instances] + } else { + set wiki_package_list [list $wiki_package_id] + } + foreach wiki_package_id $wiki_package_list { + set wiki_folder_id [::xowiki::Page require_folder \ + -name xowiki \ + -package_id $wiki_package_id] + + if { [db_0or1row select_instance [::xowiki::Object \ + instance_select_query \ + -folder_id $wiki_folder_id \ + -select_attributes {name} \ + -where_clause "name ='es:o_index'"]]} { + set template_id $item_id + + set myobject [xowiki::Package instantiate_page_from_id -item_id $item_id] + + set text [list {proc content {} { +set community_id [dotlrn_community::get_community_id] +set com_package_id [dotlrn_community::get_package_id $community_id] +set package_id [site_node_apm_integration::get_child_package_id \ + -package_id $com_package_id \ + -package_key "xowiki"] + +set wk_folder_id [::xowiki::Page require_folder -name xowiki -package_id $package_id] +if { ![db_0or1row select_instance [::xowiki::PageInstance instance_select_query \ + -folder_id $wk_folder_id -select_attributes {name} \ + -where_clause "name = 'es:header_page'"]]} { + + db_0or1row select_instance [::xowiki::PageTemplate instance_select_query \ + -folder_id $wk_folder_id -select_attributes {name} \ + -where_clause "name = 'es:Template_de_header'"] + set tmp_item_id $item_id + + set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page" + set standard_page "es:header_page" + if {[file readable $fn]} { + set page [source $fn] + $page configure -name $standard_page -parent_id $wk_folder_id -package_id $package_id + if {![$page exists title]} { + $page set title $template1 + } + $page set page_template $tmp_item_id + $page destroy_on_cleanup + $page set instance_attributes "Curso Curso Carrera Carrera Facultad Facultad" + $page initialize_loaded_object + $page save_new + } +} + +set user_id [ad_conn user_id] +set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id [dotlrn_community::get_community_id]] +if {$admin_p} { + return { +

+ #content-portlet.welcome# +

+

+ #content-portlet.welcome_body# +

+
[[es:header_page|#content-portlet.edit_header#]] + } +} else { + return { +

+ #content-portlet.e_welcome# +

+

+ #content-portlet.e_welcome_body# +

+ } +} +} +}] + +$myobject set text [lindex $text 0] +$myobject destroy_on_cleanup +$myobject save +$myobject initialize_loaded_object +ns_cache flush xotcl_object_cache ::[$myobject set item_id] +} +} +} + + +ad_proc -private content_category::up { + {-wiki_package_id ""} + {-level 1} +} { + + set count 0 + if {[empty_string_p $wiki_package_id]} { + set wiki_package_list [xowiki::Package instances] + } else { + set wiki_package_list [list $wiki_package_id] + } + foreach wiki_package_id $wiki_package_list { + ns_log notice "inicia actualizacion de content" + set trees [category_tree::get_mapped_trees $wiki_package_id] + set tree_id [lindex [lindex $trees 0] 0] + set wiki_folder_id [::xowiki::Page require_folder \ + -name xowiki \ + -package_id $wiki_package_id] + + if {$level eq 1} { + set tree_list [content_category::get_tree_levels $tree_id] + } else { + set tree_list [content_category::get_tree_levels -only_level 2 $tree_id] + } + + set wiki_url [site_node::get_url_from_object_id \ + -object_id $wiki_package_id] + set community_id [dotlrn_community::get_community_id_from_url -url $wiki_url] + + set instructors [dotlrn_community::list_users_in_role \ + -rel_type "dotlrn_instructor_rel" $community_id] + + set instructor_id [lindex [lindex $instructors 0] 3] + + set new_tree_id [content_category::map_new_tree -object_id $wiki_package_id \ + -tree_name "Indice De Contenido." \ + -user_id $instructor_id] + + set new_tree_list [content_category::get_tree_levels \ + -only_level 2 $new_tree_id] + + + ns_log notice " Package_id $wiki_package_id $tree_list :: $new_tree_list" + foreach category $tree_list { + set cat_id [lindex $category 0] + set new_cat_id [lindex [lindex $new_tree_list $count] 0] + db_foreach select_content { + select ci.item_id, p.page_order, + ci.name, ci.content_type, category_id, xpi.page_instance_id + from category_object_map c, cr_items ci, xowiki_page p, + xowiki_page_instance xpi + where c.object_id = ci.item_id + and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and p.page_id = xpi.page_instance_id + and category_id = :cat_id + and xpi.page_instance_id = ci.live_revision + order by p.page_order} { + ns_log notice "--------- -object_id $item_id $new_cat_id " + category::map_object -remove_old -object_id $item_id $new_cat_id + } + incr count + } + + set count 0 + + foreach tree $trees { + set tree_id [lindex $tree 0] + category_tree::unmap -tree_id $tree_id -object_id $wiki_package_id + } + + db_0or1row select_instance [::xowiki::PageTemplate instance_select_query \ + -folder_id $wiki_folder_id \ + -select_attributes {name} \ + -where_clause "name = 'es:Template_de_ges'"] + + set template_id $item_id + + set template [xowiki::Package instantiate_page_from_id -item_id $item_id] + + set text [list { +
+ {{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
+ + + + + + + + + + + {{adp /packages/content-portlet/www/complete-titlebar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ my_title {@title@}}}} + + + + + + + + + + + + + + + +
{{adp portlets/wiki {name header_page skin plain-include}}}
{{adp /packages/content-portlet/www/unit-navbar {page_id @revision_id@ content_id @package_id@}}}
+ + + + + + + + +
  {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@}}}
{{adp /packages/content-portlet/www/complete-subnavbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@}}}
@contenido@
+
+
+ }] + + $template set text $text + $template destroy_on_cleanup + $template save + $template initialize_loaded_object + } +} + + + +ad_proc -public content_category::page_order { + -tree_id + -category_id + -wiki_folder_id +} { + set tree_list [content_category::get_tree_levels \ + -subtree_id $category_id $tree_id] + set tree_list [linsert $tree_list 0 $category_id] + foreach cat_tree $tree_list { + set cat_id [lindex $cat_tree 0] + set page_list [db_list_of_lists select_content {}] + + if {[llength $page_list] > 0} { + #set next_list [lindex $order_page 0] + #set nexturl "${wiki_url}[lindex $next_list 2]\\\#cont1" + break + } + } + return $page_list +} + + +ad_proc -public content_category::category_childs { + -tree_id + -category_id + -wiki_folder_id +} { + + set tree_list [content_category::get_tree_levels -subtree_id $category_id $tree_id] + set tree_list [linsert $tree_list 0 [list $category_id "n"]] + foreach category $tree_list { + set cat_id [lindex $category 0] + set count [db_string select_cat {*SQL*} -default 0] + if {$count > 0} { + return 1 + } + } + return 0 +} + + +ad_proc -public content_category::category_delete { + tree_id + category_ids + {locale ""} +} { + + set user_id [auth::get_user_id] + permission::require_permission \ + -object_id $tree_id \ + -privilege category_tree_write + + set result 1 + db_transaction { + foreach category_id [db_list order_categories_for_delete ""] { + category::delete $category_id + } + category_tree::flush_cache $tree_id + } on_error { + set result 0 + } + return $result +} + +ad_proc -private content_category::valid_level_and_count { + -tree_id + -category_id +} { + set tree_list [content_category::get_tree_levels $tree_id] + set my_level [lindex \ + [lindex $tree_list \ + [lsearch -regexp \ + $tree_list $category_id]] \ + 3] + + if {$my_level > 2} { + return 0 + } + set sub_tree_list [content_category::get_tree_levels -only_level 1 \ + -subtree_id $category_id $tree_id] + + if {[llength $sub_tree_list] >= 5} { + return 0 + } + return 1 +} + + +ad_proc -private content_category::map_new_tree { + -object_id + -tree_name + {-user_id ""} +} { + + if {[empty_string_p $user_id]} { + set user_id [ad_conn user_id] + } + + db_transaction { + set tree_id [category_tree::add -name $tree_name -user_id $user_id] + content_category::new_subtree -tree_id $tree_id -user_id $user_id + category_tree::map -tree_id $tree_id \ + -object_id $object_id \ + -assign_single_p t \ + -require_category_p t + } + return $tree_id +} + + +ad_proc -private content_category::new_subtree { + -tree_id + {-language "es_GT"} + {-user_id ""} +} { + + if {[empty_string_p $user_id]} { + set user_id [ad_conn user_id] + } + set description "New unit for content" + set parent_id [db_null] + set unit_id [category::add -tree_id $tree_id \ + -parent_id $parent_id \ + -locale $language \ + -name "Unidad N" \ + -user_id $user_id \ + -description $description] + + category::add -tree_id $tree_id \ + -parent_id $unit_id \ + -locale $language \ + -name "Introduccion" -description $description + + category::add -tree_id $tree_id \ + -parent_id $unit_id \ + -locale $language \ + -name "Contenido" \ + -user_id $user_id \ + -description $description + + category::add -tree_id $tree_id \ + -parent_id $unit_id \ + -locale $language \ + -name "Actividades" \ + -user_id $user_id \ + -description $description + + category::add -tree_id $tree_id \ + -parent_id $unit_id \ + -locale $language \ + -name "Glosario" \ + -user_id $user_id \ + -description $description + + category::add -tree_id $tree_id \ + -parent_id $unit_id \ + -locale $language \ + -name "Anexo" \ + -user_id $user_id \ + -description $description + return $unit_id +} + +ad_proc -private content_category::category_parent { + -category_id + -tree_id + {-level 0} +} { + + + if {[db_0or1row select_parent { + select parent_id, category_id as category from categories + where category_id = :category_id + and tree_id = :tree_id + }]} { + + if {![empty_string_p $parent_id] && $level eq 0} { + return [content_category::category_parent -category_id $parent_id -tree_id $tree_id] + } elseif {![empty_string_p $parent_id] && $level ne 0} { + return $parent_id + } else { + return $category + } + } +} + + + + +ad_proc -private content_page::facultad { + {-community_id ""} +} { + if {[empty_string_p $community_id]} { + set community_id [dotlrn_community::get_community_id] + } + set ges_pk [ug::get_ges_pk $community_id] + if {![empty_string_p $ges_pk]} { + set fac [soap_db::db_string -dbn udb select_facultad { + select distinct gn.nombre_corto + from camainhorariostb mh, cacurshoratb ch, + cacarrerastb cc, gnentidadestb gn + where mh.horario = ch.horario + and ch.carrera = cc.carrera + and cc.entidad = gn.entidad + and cc.facultad = gn.facultad + and mh.ges_pk = '$ges_pk'} -default "No Facultad"] + + set facultad [string range $fac 2 end] + } else { + set facultad "Facultad" + } + return $facultad +} + +ad_proc -private content_page::carrera { + {-community_id ""} +} { + if {[empty_string_p $community_id]} { + set community_id [dotlrn_community::get_community_id] + } + set ges_pk [ug::get_ges_pk $community_id] + if {![empty_string_p $ges_pk]} { + + set carrera [soap_db::db_list -dbn udb select_carrera { + select distinct cc.nombre_corto + from camainhorariostb mh, cacurshoratb ch, + cacarrerastb cc + where mh.horario = ch.horario + and ch.carrera = cc.carrera + and mh.ges_pk = '$ges_pk'}] + if {[llength $carrera] > 0} { + return [lindex $carrera 0] + } else { + return "Carrera" + } + } + return "Carrera" +} + +ad_proc -private content_page::cours_name { + {-community_id ""} +} { + if {[empty_string_p $community_id]} { + set community_id [dotlrn_community::get_community_id] + } + set ges_pk [ug::get_ges_pk $community_id] + ns_log notice "byron $ges_pk" + if {![empty_string_p $ges_pk]} { + + set cours_name [soap_db::db_string -dbn udb select_name { + select distinct cc.nombre + from camainhorariostb mh, cacurshoratb ch, + cacursostb cc + where mh.horario = ch.horario + and ch.curso = cc.curso + and mh.ges_pk = '$ges_pk'} -default "Curso"] + + return $cours_name + } + return "Curso" +} + +ad_proc -public content_compare::value_compare { + x + y + def +} { + set xp [string first . $x] + set yp [string first . $y] + if {$xp == -1 && $yp == -1} { + if {$x < $y} { + return -1 + } elseif {$x > $y} { + return 1 + } else { + return $def + } + } elseif {$xp == -1} { + set yh [string range $y 0 [expr {$yp-1}]] + return [value_compare $x $yh -1] + } elseif {$yp == -1} { + set xh [string range $x 0 [expr {$xp-1}]] + return [value_compare $xh $y 1] + } else { + set xh [string range $x 0 $xp] + set yh [string range $y 0 $yp] + if {$xh < $yh} { + return -1 + } elseif {$xh > $yh} { + return 1 + } else { + incr xp + incr yp + #puts "rest [string range $x $xp end] [string range $y $yp + # end]" + return [value_compare [string range $x $xp end] [string range $y $yp end] $def] + } + } +} + +ad_proc -public content_compare::compare { + a + b +} { + set x [lindex $a 1] + set y [lindex $b 1] + return [content_compare::value_compare $x $y 0] +} + +ad_proc -public content_compare::simple_compare { + a + b + +} { + return [content_compare::value_compare $a $b 0] +} + +ad_proc -public content_category::get_tree_levels { + -all:boolean + {-subtree_id ""} + {-to_level 0} + {-only_level 0} + tree_id + {locale ""} +} { + Get all categories of a category tree from the cache. + + @option all Indicates that phased_out categories should be included. + @option subtree_id Return only categories of the given subtree. + @param tree_id category tree to get the categories of. + @param locale language in which to get the categories. [ad_conn locale] used by default. + @return tcl list of lists: category_id category_name deprecated_p level +} { + if {[catch {set tree [nsv_get category_trees $tree_id]}]} { + return + } + if {$to_level ne 0 && $only_level ne 0} { + set only_level 0 + } + set result "" + if {[empty_string_p $subtree_id]} { + foreach category $tree { + util_unlist $category category_id deprecated_p level + if {$all_p || $deprecated_p == "f"} { + if {$to_level < $level && $to_level ne 0} { + continue + } + if {$only_level ne $level && $only_level ne 0} { + continue + } + lappend result [list $category_id [category::get_name $category_id $locale] $deprecated_p $level] + } + } + } else { + set in_subtree_p 0 + set subtree_level 0 + foreach category $tree { + util_unlist $category category_id deprecated_p level + if {$level == $subtree_level || $level < $subtree_level} { + set in_subtree_p 0 + } + if {$in_subtree_p && $deprecated_p == "f"} { + if {$to_level < [expr $level - $subtree_level] && $to_level ne 0} { + continue + } + + if {$only_level ne [expr $level - $subtree_level] && $only_level ne 0} { + continue + } + + lappend result [list $category_id [category::get_name $category_id $locale] $deprecated_p [expr $level - $subtree_level]] + } + if {$category_id == $subtree_id} { + set in_subtree_p 1 + set subtree_level $level + } + } + } + + return $result +} Index: openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.xql 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + select category_id + from categories + where tree_id = :tree_id + and category_id in ([join $category_ids ,]) + order by left_ind desc + + + + + + + select count(ci.item_id) + from category_object_map c, cr_items ci, + cr_revisions r, xowiki_page p + where c.object_id = ci.item_id + and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + and c.category_id = :cat_id + group by category_id + order by category_id desc + + + + + + + select ci.item_id, p.page_order, ci.name, ci.content_type, category_id, xpi.page_instance_id + from category_object_map c, cr_items ci, xowiki_page p, xowiki_page_instance xpi + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and p.page_id = xpi.page_instance_id + and category_id in ([join $cat_id ","]) + and xpi.page_instance_id = ci.live_revision + order by p.page_order + + + + \ No newline at end of file Index: openacs-4/packages/content-portlet/tcl/content-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/content-portlet-procs.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/tcl/content-portlet-procs.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,82 @@ +# + +ad_library { + + Procedures to supports content portlets. + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-07-04 + @arch-tag: 16A7A29A-271C-49B1-8787-935755BF5583 + @cvs-id $Id: content-portlet-procs.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} + +namespace eval content_portlet { + + ad_proc -private get_my_name { + } { + return "content_portlet" + } + + ad_proc -public get_pretty_name { + } { + return [parameter::get_from_package_key \ + -package_key [my_package_key] \ + -parameter content_portlet_pretty_name] + } + + ad_proc -private my_package_key { + } { + return "content-portlet" + } + + ad_proc -public link { + } { + return "" + } + + ad_proc -public add_self_to_page { + {-portal_id:required} + {-package_id:required} + {-param_action:required} + {-force_region ""} + {-page_name "" } + } { + Adds a static PE to the given page + } { + # ns_log notice "content_portlet::add_self_to_page - + # Don't call me. Use static_portal_content:: instead" + return [portal::add_element_parameters \ + -portal_id $portal_id \ + -portlet_name [get_my_name] \ + -value $package_id \ + -force_region [parameter::get_from_package_key -package_key [my_package_key] -parameter content_portal_force_region] \ + -page_name [parameter::get_from_package_key -package_key [my_package_key] -parameter content_portal_page_name] \ + -pretty_name [get_pretty_name] \ + -param_action $param_action] + # error + } + + ad_proc -public remove_self_from_page { + {-portal_id:required} + {-package_id:required} + } { + Removes static PE from the given page + } { + # This is easy since there's one and only one instace_id + portal::remove_element_parameters \ + -portal_id $portal_id \ + -portlet_name [get_my_name] \ + -value $package_id + } + + ad_proc -public show { + cf + } { + } { + portal::show_proc_helper \ + -package_key [my_package_key] \ + -config_list $cf \ + -template_src "content-portlet" + } +} + Index: openacs-4/packages/content-portlet/www/.DS_Store =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/.DS_Store,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/.DS_Store 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1 @@ +Bud1�urcesfw resourcesfwi0blobicnv resourcesfwswlong�  @� @� @� @ E�DSDB ` @� @� @ \ No newline at end of file Index: openacs-4/packages/content-portlet/www/complete-navbar-bac.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-navbar-bac.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-navbar-bac.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,95 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-07-04 + @arch-tag: D0597C30-DD00-4D59-BD57-56ED6E0F16A7 + @cvs-id $Id: complete-navbar-bac.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + + page_pos:optional + page_id:optional + content_id:optional + type:optional + index:optional + + +} -properties { +} -validate { +} -errors { +} + + +set title "navbar" +set cat_index [list] +set index1 100 +set index2 100 +set index3 100 +set index4 100 +set index5 100 +set index6 100 +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + if {$my_parent_id eq $my_cat_id} { + set tree_list [category_tree::get_tree -all $tree_id] + } else { + set tree_list [category_tree::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + } + if {[llength $tree_list] < 1} { + set show 0 + set my_parent_id [content_d_return_template] + } + + set my_cat_index [expr [lsearch -regexp $tree_list $my_cat_id] + 1] + + ns_log notice "------------ $tree_list ::: $my_cat_index" + + set categories_objects [db_list_of_lists select_cat { + select count(ci.item_id), c.category_id + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + group by category_id + order by category_id desc}] + + ns_log notice "--------- $categories_objects" + foreach category $categories_objects { + if {[lsearch -regexp $tree_list [lindex $category 1]] >= 0} { + lappend cat_index [lsearch -regexp $tree_list [lindex $category 1]] + } + } + + ns_log notice " -------- cat index $cat_index" + for {set i 0} {$i < 6} {incr i} { + set adp_index [expr $i + 1] + if {$i < [llength $cat_index]} { + set index$adp_index [expr [lindex $cat_index $i] + 1] + } elseif {$i eq [llength $cat_index]} { + set index$adp_index 0 + } else { + set index$adp_index 100 + } + } + if {$index1 eq $my_cat_index} { + set img_rigth "xop005" + } else { + set img_rigth "op005" + } + ns_log notice "navbar $img_rigth $index1 :: $my_cat_index" +} else { + set show 0 +} + +ns_log notice " --------- $index5 : $index4 : $index3 : $index2 : $index1 " \ No newline at end of file Index: openacs-4/packages/content-portlet/www/complete-navbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-navbar.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-navbar.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,18 @@ + \ No newline at end of file Index: openacs-4/packages/content-portlet/www/complete-navbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-navbar.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-navbar.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,93 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-07-04 + @arch-tag: D0597C30-DD00-4D59-BD57-56ED6E0F16A7 + @cvs-id $Id: complete-navbar.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + + page_pos:optional + page_id:optional + content_id:optional + type:optional + index:optional + + +} -properties { +} -validate { +} -errors { +} + + +set title "navbar" +set cat_index [list] +set index1 100 +set index2 100 +set index3 100 +set index4 100 +set index5 100 +set index6 100 +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + set my_cat_index [expr [lsearch -regexp $tree_list $my_cat_id] + 1] + + set categories_objects [db_list_of_lists select_cat { + select count(ci.item_id), c.category_id + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + group by category_id + order by category_id desc}] + + for {set i [expr [llength $tree_list] -1]} {$i >= 0} {incr i -1} { + set category [lindex $tree_list $i] + if {[content_category::category_childs \ + -tree_id $tree_id \ + -category_id [lindex $category 0] \ + -wiki_folder_id $wiki_folder_id]} { + lappend cat_index [lsearch -regexp $tree_list [lindex $category 1]] + } + } + + if {[llength $cat_index] < 1} { + set show 0 + } + for {set i 0} {$i < 6} {incr i} { + set adp_index [expr $i + 1] + if {$i < [llength $cat_index]} { + set index$adp_index [expr [lindex $cat_index $i] + 1] + } elseif {$i eq [llength $cat_index]} { + set index$adp_index 0 + } else { + set index$adp_index 100 + } + } + if {$index1 eq $my_cat_index} { + set img_rigth "xop005" + } else { + set img_rigth "op005" + } +} else { + set show 0 +} + Index: openacs-4/packages/content-portlet/www/complete-subnavbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-subnavbar.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-subnavbar.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file Index: openacs-4/packages/content-portlet/www/complete-subnavbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-subnavbar.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-subnavbar.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,109 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-09-03 + @arch-tag: F2D1E4AE-0574-49E8-BF98-396A5685C20A + @cvs-id $Id: complete-subnavbar.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + + page_pos:optional + page_id:optional + content_id:optional + type:optional + index:optional + + +} -properties { +} -validate { +} -errors { +} + +set title "navbar" +set cat_index [list] +set index1 100 +set index2 100 +set index3 100 +set index4 100 +set index5 100 +set index6 100 +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $my_cat_id -level 1 -tree_id $tree_id] + + set level_2_list [content_category::get_tree_levels -only_level 2 $tree_id] + set level_3_list [content_category::get_tree_levels -only_level 3 $tree_id] + + if {[llength $level_2_list] < 1 || ([lsearch -regexp $level_2_list $my_cat_id] < 0 && [lsearch -regexp $level_3_list $my_cat_id] < 0)} { + set show 0 + return + } + + set tree_list [content_category::get_tree_levels -subtree_id $my_cat_id -to_level 1 $tree_id] + if {[lsearch -regexp $level_3_list $my_cat_id] >= 0} { + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id1 -to_level 1 $tree_id] + } + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + + set parent_tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + + if {[llength $parent_tree_list] < 1} { + set show 0 + ad_return_template + } + + set parent_cat_index [expr [lsearch -regexp $parent_tree_list $my_cat_id] + 1] + if {$parent_cat_index eq 0} { + set parent_cat_index [expr [lsearch -regexp $parent_tree_list $my_parent_id1] + 1] + } + + set categories_objects [db_list_of_lists select_cat { + select count(ci.item_id), c.category_id + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + group by category_id + order by category_id desc}] + + + foreach category $categories_objects { + if {[lsearch -regexp $tree_list [lindex $category 1]] >= 0} { + lappend cat_index [lsearch -regexp $tree_list [lindex $category 1]] + } + } + + if {[llength $cat_index] < 1} { + set show 0 + ad_return_template + } + + for {set i 0} {$i < 6} {incr i} { + set adp_index [expr $i + 1] + if {$i < [llength $cat_index]} { + set index$adp_index [expr [lindex $cat_index $i] + 1] + } elseif {$i eq [llength $cat_index]} { + set index$adp_index 0 + } else { + set index$adp_index 100 + } + } +} else { + set show 0 +} Index: openacs-4/packages/content-portlet/www/complete-titlebar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-titlebar.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-titlebar.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,21 @@ + + + + + + + + + +
Actividades@my_title@ +
+ + + + + + +
+
+ +
Index: openacs-4/packages/content-portlet/www/complete-titlebar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/complete-titlebar.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/complete-titlebar.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,81 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-07-18 + @arch-tag: 8085F7B0-7E09-43A8-BDEF-B42D9C90D5CC + @cvs-id $Id: complete-titlebar.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + page_pos:optional + page_id:optional + content_id:optional + my_title:optional + type:optional + +} -properties { +} -validate { +} -errors { +} + + + +set title "title bar" + +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set cat_name [category::get_name $my_cat_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $my_cat_id -level 1 -tree_id $tree_id] + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + set cat_index [expr [lsearch -regexp $tree_list $my_cat_id] + 1] + if {$cat_index eq 0} { + set cat_index [expr [lsearch -regexp $tree_list $my_parent_id1] + 1] + } + set cat_name [lindex [lindex $tree_list [expr $cat_index -1 ]] 1] + +set show_img 0 + switch $cat_index { + "2" { + if {[string match $cat_name "Contenido"]} { + set show_img 1 + } + } + "4" { + if {[string match $cat_name "Glosario"]} { + set show_img 1 + } + } + "1" { + if {[string match $cat_name "Introduccion"]} { + set show_img 1 + } + } + "3" { + if {[string match $cat_name "Actividades"]} { + set show_img 1 + } + } + default { + set show_img 0 + } + + } + + +} else { + set show 0 +} Index: openacs-4/packages/content-portlet/www/content-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/content-admin-portlet.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/content-admin-portlet.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,21 @@ + +Ver Páginas de #content-portlet.content#
+ +Administrar Páginas de #content-portlet.content#
+
+#xowiki.edit_content_index# Editar + + No community specified + + +
    + + Index: openacs-4/packages/content-portlet/www/content-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/content-admin-portlet.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/content-admin-portlet.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,79 @@ +ad_page_contract { + The display logic for the content admin portlet + + @author Byron Linares bhlr@galileo.edu +} { + package_id:optional + template_portal_id:optional + referer:optional + return_url:optional +} +set admin_p [acs_user::site_wide_admin_p] + +if {![exists_and_not_null package_id]} { + set package_id [dotlrn_community::get_community_id] +} + +if { $package_id ne "" } { + + if {![exists_and_not_null template_portal_id]} { + set template_portal_id [dotlrn_community::get_portal_id] + } + + if {[exists_and_not_null return_url]} { + set referer $return_url + } + + if {![exists_and_not_null referer]} { + set referer [ad_conn url] + } + + set element_pretty_name [parameter::get \ + -parameter admin_portlet_element_pretty_name \ + -default [_ content-portlet.admin_portlet_element_pretty_name]] + + db_multirow content select_content \ + "select m.element_id, m.pretty_name, pep.value as name + from portal_element_map m, portal_pages p, portal_element_parameters pep + where m.page_id = p.page_id + and p.portal_id = $template_portal_id + and m.datasource_id = [portal::get_datasource_id [content_portlet::get_my_name]] + and pep.element_id = m.element_id and pep.key = 'page_name'" {} + + # don't ask to insert same page twice + template::multirow foreach content {set used_page_id($name) 1} + + array set config $cf + set options "" + ::xowiki::Package initialize -package_id $config(package_id) + db_foreach instance_select \ + [::xowiki::Page instance_select_query \ + -folder_id [::$package_id folder_id] \ + -with_subtypes true \ + -from_clause ", xowiki_page P" \ + -where_clause "P.page_id = cr.revision_id" \ + -order_clause "order by ci.name" \ + ] { + if {[regexp {^::[0-9]} $name]} continue + if {[info exists used_page_id($name)]} continue + append options "" + } + + if {$options ne ""} { + set form [subst { +
    + + + Add #content-portlet.new_content_admin_portlet# + +
    + }] + set form "" + } else { + set form "All pages already used" + } + + set applet_url [$package_id package_url] +} Index: openacs-4/packages/content-portlet/www/content-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/content-portlet.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/content-portlet.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1 @@ + Index: openacs-4/packages/content-portlet/www/content-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/content-portlet.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/content-portlet.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,13 @@ +array set config $cf +set user_id [ad_conn user_id] + +set wiki_url [site_node::get_url_from_object_id -object_id $config(package_id)] + + +if {![empty_string_p [lindex $config(page_name) 0]]} { +# regsub {/[^/]+$} [ad_conn url] "/xowiki/$config(page_name)" url + set url "${wiki_url}$config(page_name)" +} else { +# regsub {/[^/]+$} [ad_conn url] "/xowiki/es:index" url + set url "${wiki_url}es:index" +} Index: openacs-4/packages/content-portlet/www/home.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/home.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/home.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,2 @@ + + #content-portlet.home# \ No newline at end of file Index: openacs-4/packages/content-portlet/www/home.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/home.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/home.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,83 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-06-20 + @arch-tag: 71F81219-A45B-4B17-BF48-22942B62A7AC + @cvs-id $Id: home.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + page_pos:optional + page_id:optional + content_id:optional + +} -properties { +} -validate { +} -errors { +} + +set page_list [list] +set show 0 +set nexturl "" +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $cat_id] + set my_parent_id [content_category::category_parent -category_id $cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $cat_id -level 1 -tree_id $tree_id] + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + set cat_index [lsearch -regexp $tree_list $cat_id] + if {$cat_index < 0} { + set cat_index [expr [lsearch -regexp $tree_list $my_parent_id1] + 0] + } + + set img_name "homeID" + append img_name "[expr $cat_index + 1]" + + set home_cat [db_string select_home { + select distinct c.category_id + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + order by category_id asc + limit 1} -default 0] + + db_foreach select_page { + select ci.item_id, r.revision_id, ci.name, ci.content_type, r.title, category_id,p.page_order + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + and category_id = :home_cat + order by p.page_order} { + + lappend page_list [list $item_id $page_order $name $revision_id] + } + + set order_page [lsort -increasing -command content_compare::compare $page_list] + set home_list [lindex $order_page 0] + set home_name [lindex $home_list 2] + set nexturl "${wiki_url}$home_name" + + +} else { + set show 0 +} + + Index: openacs-4/packages/content-portlet/www/index-page.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/index-page.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/index-page.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,17 @@ + +

    +#content-portlet.welcome# +

    +

    +#content-portlet.welcome_body# +

    +
    Editar pagina de Header
    +
    + +

    +#content-portlet.e_welcome# +

    +

    +#content-portlet.e_welcome_body# +

    +
    \ No newline at end of file Index: openacs-4/packages/content-portlet/www/index-page.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/index-page.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/index-page.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,22 @@ +# + +ad_page_contract { + + page_id:optional + content_id:optional + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-07-25 + @arch-tag: 93F019A8-44A6-4CA1-BDD6-1C105BA21B05 + @cvs-id $Id: index-page.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + +} -properties { +} -validate { +} -errors { +} +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +set user_id [ad_conn user_id] +set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id [dotlrn_community::get_community_id]] +set headerurl "${wiki_url}header_page" + Index: openacs-4/packages/content-portlet/www/navbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/navbar.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/navbar.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,23 @@ + + + +
  • + + +  @cat_name@ + + +
  • +
    + +
  • + +  @cat_name@ + +
  • +
    +
    + +
  • +
    +
    \ No newline at end of file Index: openacs-4/packages/content-portlet/www/navbar.bac.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/navbar.bac.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/navbar.bac.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,144 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-06-20 + @arch-tag: 71F81219-A45B-4B17-BF48-22942B62A7AC + @cvs-id $Id: navbar.bac.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + page_pos:optional + page_id:optional + content_id:optional + type:optional + template:optional + index:optional +} -properties { +} -validate { +} -errors { +} + +set page_list [list] +set next_list [list] +set show 0 +set width 78 +set cat_id 0 +set list_categories [list] + +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + + set cat_parent_id [db_string select_parent { + select parent_id + from categories + where tree_id = :tree_id + and category_id = :my_cat_id} -default 0] + + + db_foreach categories { + select category_id + from categories + where tree_id = :tree_id + and parent_id = :cat_parent_id} { + set all_cat_name [category::get_name $category_id] + lappend list_categories [list $category_id $all_cat_name] + } + + switch $index { + "2" { + set template_name "es:Template_de_contenido" + set cat_name "Contenido" + } + "4" { + set template_name "es:Template_de_glosario" + set cat_name "Glosario" + } + "1" { + set template_name "es:Template_de_introduccion" + set cat_name "Introduccion" + } + "3" { + set template_name "es:Template_de_actividades" + set cat_name "Actividades" + } + default { + set template_name "" + set cat_name "" + } + + } + + foreach category $list_categories { + if {[string match [lindex $category 1] $cat_name]} { + set cat_id [lindex $category 0] + break + } + } + + if {$cat_id eq 0 && $index ne 4 && ![empty_string_p $cat_parent_id]} { + set cat_id $my_cat_id + } elseif {($cat_id eq 0 && $index eq 4) || ([empty_string_p $cat_parent_id])} { + set cat_id [db_list select_all { + select category_id + from categories where tree_id = :tree_id}] + } + + if {[empty_string_p $cat_id]} { + set cat_id 0 + } + + set template_id [db_string select_temp { + select ci.item_id + from cr_items ci, xowiki_page_template p + where ci.parent_id = :wiki_folder_id + and ci.content_type in ('::xowiki::PageTemplate') + and p.page_template_id = ci.live_revision + and ci.name = :template_name + } -default "0"] + + set page_list [db_list_of_lists select_content " + select ci.item_id, p.page_order, ci.name, ci.content_type, category_id, xpi.page_instance_id + from category_object_map c, cr_items ci, xowiki_page p, xowiki_page_instance xpi + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and p.page_id = xpi.page_instance_id + and category_id in ([join $cat_id ","]) + and xpi.page_template = :template_id + and xpi.page_instance_id = ci.live_revision + order by p.page_order + "] + + set order_page [lsort -increasing -command content_compare::compare $page_list] + set count 0 + + if {[llength $order_page] > 0} { + set next_list [lindex $order_page 0] + set nexturl "${wiki_url}[lindex $next_list 2]\#cont1" + if {[lindex $next_list 5] eq $page_id} { + set img_name "xop$index" + } elseif {$template == $template_id} { + set img_name "xop${index}" + } else { + set img_name "op$index" + } + + } else { + set show 1 + set nexturl "0" + set img_name "op${index}_" + if {$index eq 0} { + set width 11 + } + } +} else { + set show 0 +} + + Index: openacs-4/packages/content-portlet/www/navbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/navbar.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/navbar.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,154 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-06-20 + @arch-tag: 71F81219-A45B-4B17-BF48-22942B62A7AC + @cvs-id $Id: navbar.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + page_pos:optional + page_id:optional + content_id:optional + type:optional + index:optional +} -properties { +} -validate { +} -errors { +} + +set page_list [list] +set next_list [list] +set show 0 +set width 76 +set styleb "" +set cat_id 0 +set list_categories [list] + +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $my_cat_id -level 1 -tree_id $tree_id] + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + set bar_category [lindex $tree_list [expr $index - 1]] + set cat_name [lindex $bar_category 1] + + set show_img 0 + switch $index { + "2" { + if {[string match $cat_name "Contenido"]} { + set show_img 1 + } + } + "4" { + if {[string match $cat_name "Glosario"]} { + set show_img 1 + } + } + "1" { + if {[string match $cat_name "Introduccion"]} { + set show_img 1 + } + } + "3" { + if {[string match $cat_name "Actividades"]} { + set show_img 1 + } + } + default { + set show_img 0 + } + + } + + + set img_name3 "ico${index}_16.png" + + + set cat_id [lindex $bar_category 0] + + if {[empty_string_p $cat_id]} { + set cat_id 0 + } + +# set page_list [db_list_of_lists select_content " +# select ci.item_id, p.page_order, ci.name, ci.content_type, category_id, xpi.page_instance_id +# from category_object_map c, cr_items ci, xowiki_page p, xowiki_page_instance xpi +# where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id +# and ci.content_type not in ('::xowiki::PageTemplate') +# and ci.name not in ('es:header_page','es:index','es:indexe') +# and p.page_id = xpi.page_instance_id +# and category_id in ([join $cat_id ","]) +# and xpi.page_instance_id = ci.live_revision +# order by p.page_order +# "] + +# if {[llength $page_list] < 1} { + + set page_list [content_category::page_order -tree_id $tree_id -category_id $cat_id -wiki_folder_id $wiki_folder_id] +# } + set order_page [lsort -increasing -command content_compare::compare $page_list] + set count 0 + + if {[llength $order_page] > 0} { + set next_list [lindex $order_page 0] + set nexturl "${wiki_url}[lindex $next_list 2]\#cont1" + if {([lindex $next_list 5] eq $page_id) || ($cat_id eq $my_cat_id) || ($my_parent_id1 eq $cat_id)} { + set img_name "xop$index" + set img_name2 "xop_" + set styleb "style=\"background-image:url(/resources/content-portlet/template/imagenes/xop1_.gif); background-repeat:repeat-x; \"" + } else { + set img_name "op$index" + set img_name2 "op1_" + } + } else { + set show 0 + set nexturl "0" + set img_name "op${index}_" + set img_name2 "op1_" + set img_name3 "" + if {$index eq 0} { + set show 1 + set categories_objects [db_list select_home { + select distinct c.category_id + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + order by category_id asc + }] + + foreach category $categories_objects { + if {[lsearch -regexp $tree_list $category] >= 0} { + lappend cat_index [lsearch -regexp $tree_list $category] + } + } + set home_cat [lindex [lindex $tree_list [lindex $cat_index 0]] 0] + if {$home_cat eq $my_cat_id} { + set img_name xop${index}_ + set img_name2 "" + set img_name3 "" + } + set width 11 + } + } +} else { + set show 0 +} + + Index: openacs-4/packages/content-portlet/www/next.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/next.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/next.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,3 @@ + + $alt +  \ No newline at end of file Index: openacs-4/packages/content-portlet/www/next.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/next.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/next.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,96 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-06-20 + @arch-tag: 71F81219-A45B-4B17-BF48-22942B62A7AC + @cvs-id $Id: next.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + page_pos:optional + page_id:optional + content_id:optional + wiki_folder_id:optional + dir:optional +} -properties { +} -validate { +} -errors { +} + +set page_list [list] +set show 0 +set next_list [list] +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $cat_id] + set my_parent_id [content_category::category_parent -category_id $cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $cat_id -level 1 -tree_id $tree_id] + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + set cat_index [lsearch -regexp $tree_list $cat_id] + + if {$cat_index < 0} { + set cat_index [expr [lsearch -regexp $tree_list $my_parent_id1] + 0] + } + + db_foreach select_page { + select ci.item_id, r.revision_id, ci.name, ci.content_type, r.title, category_id,p.page_order + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + and category_id = :cat_id + order by p.page_order} { + + lappend page_list [list $item_id $page_order $name $revision_id] + } + + + set order_page [lsort -$dir -command content_compare::compare $page_list] + set count 0 + foreach pages $order_page { + set current_pos [lsearch -exact $pages $page_id] + if {$current_pos >= 0} { + incr count + set next_list [lindex $order_page $count] + break + } + incr count + } + + if {[llength $next_list] > 0} { + set nexturl "${wiki_url}[lindex $next_list 2]" + switch $dir { + "decreasing" { + set img_name "backID" + set alt "[_ content-portlet.back]" + } + "increasing" { + set img_name "nextID" + set alt "[_ content-portlet.next]" + } + } + append img_name "[expr $cat_index + 1]" + } else { + set show 0 + set nexturl "index" + set img_name "" + } +} else { + set show 0 +} + + Index: openacs-4/packages/content-portlet/www/subnavbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/subnavbar.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/subnavbar.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,8 @@ + + + + + +
    @cat_name@
    +
    +
    \ No newline at end of file Index: openacs-4/packages/content-portlet/www/subnavbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/subnavbar.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/subnavbar.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,105 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-09-03 + @arch-tag: FB935097-E914-4127-B7D5-9FCBA7EDDE2F + @cvs-id $Id: subnavbar.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + + page_pos:optional + page_id:optional + content_id:optional + type:optional + index:optional + + +} -properties { +} -validate { +} -errors { +} + + +set page_list [list] +set next_list [list] +set show 0 +set width 76 +set cat_id 0 +set list_categories [list] + +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_pos "@page_order@"]} { + set show 1 + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $my_cat_id -level 1 -tree_id $tree_id] + + set tree_list [content_category::get_tree_levels -subtree_id $my_cat_id -to_level 1 $tree_id] + set level_2_list [content_category::get_tree_levels -only_level 2 $tree_id] + set level_3_list [content_category::get_tree_levels -only_level 3 $tree_id] + + if {[llength $level_3_list] < 1 || ([lsearch -regexp $level_2_list $my_cat_id] < 0 && [lsearch -regexp $level_3_list $my_cat_id] < 0)} { + set show 0 + ad_return_template + } elseif {[lsearch -regexp $level_3_list $my_cat_id] >= 0} { + set tree_list [content_category::get_tree_levels -subtree_id $my_parent_id1 -to_level 1 $tree_id] + } + + if {[llength $tree_list] < 1} { + set show 0 + ad_return_template + } + + set parent_tree_list [content_category::get_tree_levels -subtree_id $my_parent_id -to_level 1 $tree_id] + if {[llength $parent_tree_list] < 1} { + set show 0 + ad_return_template + } + + set parent_cat_index [expr [lsearch -regexp $parent_tree_list $my_cat_id] + 1] + if {$parent_cat_index eq 0} { + set parent_cat_index [expr [lsearch -regexp $parent_tree_list $my_parent_id1] + 1] + } + + set bar_category [lindex $tree_list [expr $index - 1]] + set cat_name [lindex $bar_category 1] + set cat_id [lindex $bar_category 0] + if {[empty_string_p $cat_id]} { + set cat_id 0 + } + + set page_list [db_list_of_lists select_content " + select ci.item_id, p.page_order, ci.name, ci.content_type, category_id, xpi.page_instance_id + from category_object_map c, cr_items ci, xowiki_page p, xowiki_page_instance xpi + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and p.page_id = xpi.page_instance_id + and category_id in ([join $cat_id ","]) + and xpi.page_instance_id = ci.live_revision + order by p.page_order + "] + + set order_page [lsort -increasing -command content_compare::compare $page_list] + + if {[llength $order_page] > 0} { + set next_list [lindex $order_page 0] + set nexturl "${wiki_url}[lindex $next_list 2]\#cont1" + if {([lindex $next_list 5] eq $page_id) || ($cat_id eq $my_cat_id) || ($my_parent_id1 eq $cat_id)} { + append parent_cat_index "_" + } else { + set img_name "op$index" + set img_name2 "op1_" + } + + } else { + set nexturl "0" + set show 0 + } +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/unit-navbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/unit-navbar.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/unit-navbar.adp 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,4 @@ + + + + Index: openacs-4/packages/content-portlet/www/unit-navbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/unit-navbar.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/unit-navbar.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,97 @@ +# + +ad_page_contract { + + + + @author byron Haroldo Linares Roman (bhlr@byronLs-Computer.local) + @creation-date 2007-09-06 + @arch-tag: D9C9886F-7A0B-46DA-8A52-71713DEDC859 + @cvs-id $Id: unit-navbar.tcl,v 1.1 2007/10/24 22:50:26 victorg Exp $ +} { + + page_pos:optional + page_id:optional + content_id:optional + index:optional + + +} -properties { +} -validate { +} -errors { +} +set show 0 +set wiki_url [site_node::get_url_from_object_id -object_id $content_id] +if {![string match $page_id "@revision_id@"]} { + set show 1 + + set form_tree_list [list] + + set wiki_folder_id [::xowiki::Page require_folder -name xowiki -package_id $content_id] + set item_id [content::revision::item_id -revision_id $page_id] + set my_cat_id [category::get_mapped_categories $item_id] + set tree_id [category::get_tree $my_cat_id] + set my_parent_id [content_category::category_parent -category_id $my_cat_id -tree_id $tree_id] + set my_parent_id1 [content_category::category_parent -category_id $my_cat_id -level 1 -tree_id $tree_id] + + set tree_list [content_category::get_tree_levels -only_level 1 $tree_id] + + set categories_objects [db_list_of_lists select_cat { + select count(ci.item_id), c.category_id + from category_object_map c, cr_items ci, cr_revisions r, xowiki_page p + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and r.revision_id = ci.live_revision + and p.page_id = r.revision_id + group by category_id + order by category_id asc}] + + + + foreach tree_level $categories_objects { + set unit_parent [content_category::category_parent \ + -category_id [lindex $tree_level 1] \ + -tree_id $tree_id] + set unit_index [lsearch -regexp $tree_list $unit_parent] + + if {$unit_index >= 0 && [lsearch -regexp $form_tree_list $unit_parent] < 0} { + lappend form_tree_list [list [lindex [lindex $tree_list $unit_index] 1] [lindex [lindex $tree_list $unit_index] 0]] + } + } + ad_form -name unidad -has_submit 1 -export {tree_id} -form { + {category:integer(select) + {label "Capitulo"} + {options $form_tree_list} + {value $my_parent_id} + {html {onChange document.unidad.submit()}} + } + } -on_submit { + set nexturl "\#" + set tree_list2 [content_category::get_tree_levels -subtree_id $category $tree_id] + set tree_list2 [linsert $tree_list2 0 $category] + foreach cat_tree $tree_list2 { + set cat_id [lindex $cat_tree 0] + + set page_list [db_list_of_lists select_content " + select ci.item_id, p.page_order, ci.name, ci.content_type, category_id, xpi.page_instance_id + from category_object_map c, cr_items ci, xowiki_page p, xowiki_page_instance xpi + where c.object_id = ci.item_id and ci.parent_id = :wiki_folder_id + and ci.content_type not in ('::xowiki::PageTemplate') + and ci.name not in ('es:header_page','es:index','es:indexe') + and p.page_id = xpi.page_instance_id + and category_id in ([join $cat_id ","]) + and xpi.page_instance_id = ci.live_revision + order by p.page_order"] + + set order_page [lsort -increasing -command content_compare::compare $page_list] + + if {[llength $order_page] > 0} { + set next_list [lindex $order_page 0] + set nexturl "${wiki_url}[lindex $next_list 2]\#cont1" + break + } + } + ad_returnredirect $nexturl + } +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndex.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndex.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndex.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,7 @@ +::xowiki::Page new -title "[_ content-portlet.index_page]" -text { +{{es:o_index -decoration plain }} +{{adp portlets/ges-categories {skin plain-include} }} +} + + + Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndexe.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndexe.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndexe.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,62 @@ +::xowiki::Object new -title "Object index" -text { +proc content {} { + +set community_id [dotlrn_community::get_community_id] +set com_package_id [dotlrn_community::get_package_id $community_id] +set package_id [site_node_apm_integration::get_child_package_id \ + -package_id $com_package_id \ + -package_key "xowiki"] + +set wk_folder_id [::xowiki::Page require_folder -name xowiki -package_id $package_id] + +if { ![db_0or1row select_instance [::xowiki::PageInstance instance_select_query \ + -folder_id $wk_folder_id -select_attributes {name} \ + -where_clause "name = 'es:header_page'"]]} { + +if { ![db_0or1row select_instance [::xowiki::PageTemplate instance_select_query \ + -folder_id $wk_folder_id -select_attributes {name} \ + -where_clause "name = 'es:Template_de_header'"]]} { + +set tmp_item_id $item_id + +set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page" + set standard_page "es:header_page" + if {[file readable $fn]} { + set page [source $fn] + $page configure -name $standard_page -parent_id $wk_folder_id -package_id $package_id + if {![$page exists title]} { + $page set title $template1 + } + $page set page_template $tmp_item_id + $page destroy_on_cleanup + $page set instance_attributes "Curso Curso Carrera Carrera Facultad Facultad" + $page initialize_loaded_object + $page save_new + } + } +} + +set user_id [ad_conn user_id] +set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id [dotlrn_community::get_community_id]] +if {$admin_p} { + return { +

    + #content-portlet.welcome# +

    +

    + #content-portlet.welcome_body# +

    +
    [[es:header_page|#content-portlet.edit_header#]] + } +} else { + return { +

    + #content-portlet.e_welcome# +

    +

    + #content-portlet.e_welcome_body# +

    + } + } +} +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateactividades.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateactividades.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateactividades.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,74 @@ +::xowiki::PageTemplate new -title "Template Actividades" -text { +
    +{{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +
    Unidad 1

    @Facultad@
    + @Carrera@
    + @Curso@

    Galileo - GES
    + + + + + + + + + +
       + + {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 1}}} + +
    + + + + + +
    Actividades@Unidad@ +
    + + + + + + +
    {{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" template @page_template@}}}{{adp /packages/content-portlet/www/home {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ template @page_template@}}}{{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "increasing" template @page_template@}}}
    +
    + @contenido@ +
    +
    +
    +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplatebody.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplatebody.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplatebody.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,45 @@ +::xowiki::PageTemplate new -title "Template Actividades" -text { + +
    +{{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@} }} +
    + + + + + + + + + + + {{adp /packages/content-portlet/www/complete-titlebar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ my_title "@title@"} }} + + + + + + + + + + + + + + + +
    {{es:header_page -decoration plain }}
    {{adp /packages/content-portlet/www/unit-navbar {page_id @revision_id@ content_id @package_id@} }}
    + + + + + + + + +
      {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@} }}
    {{adp /packages/content-portlet/www/complete-subnavbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@} }}
    @contenido@
    +
    +
    + +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplatecontenido.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplatecontenido.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplatecontenido.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,77 @@ +::xowiki::PageTemplate new -title "Template Contenido" -text { +
    +{{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + +
    Unidad 1

    @Facultad@
    + @Carrera@
    + @Curso@

    Galileo - GES
    + + + + + + + + + +
       + + {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 1}}} + +
    + + + + + + +
    Actividades@Unidad@ +
    + + + + + + +
    {{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" template @page_template@}}}{{adp /packages/content-portlet/www/home {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ template @page_template@}}}{{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "increasing" template @page_template@}}}
    +
    + @contenido@ +
    +
    +
    +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateglosario.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateglosario.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateglosario.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,76 @@ +::xowiki::PageTemplate new -title "Template Glosario" -text { +
    +{{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +
    Unidad 1

    @Facultad@
    + @Carrera@
    + @Curso@

    Galileo - GES
    + + + + + + + + + +
       + + {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 1}}} + +
    + + + + + + +
    Actividades@Glosario@ +
    + + + + + + +
    {{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" template @page_template@}}}{{adp /packages/content-portlet/www/home {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ template @page_template@}}}{{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "increasing" template @page_template@}}}
    +
    +
    @contenido@
    +
    +
    +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheader.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheader.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheader.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,24 @@ +::xowiki::PageTemplate new -title "Template de Header" -text { + +
    + + + + + + +
    + Unidad 1 + +

    @Facultad@ +
    @Carrera@ +
    @Curso@ +

    +
    +
    + Galileo - GES +
    +
    +
    + +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,3 @@ +::xowiki::PageInstance new -title "Pagina de Header" -text { + Header +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateintroduccion.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateintroduccion.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateintroduccion.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,73 @@ +::xowiki::PageTemplate new -title "Template Introduccion" -text { +
    +{{adp /packages/xowiki/www/admin/order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +
    Unidad 1

    @Facultad@
    + @Carrera@
    + @Curso@

    Galileo - GES
    + + + + + + + + + +
       + + {{adp /packages/content-portlet/www/complete-navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 1}}} + +
    + + + + + +
    Actividades@Unidad@ +
    + + + + + + +
    {{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" template @page_template@}}}{{adp /packages/content-portlet/www/home {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ template @page_template@}}}{{adp /packages/content-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "increasing" template @page_template@}}}
    +
    +
    @contenido@
    +
    +
    +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateintroduccion3.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateintroduccion3.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/prototypes/gestemplate/GesTemplateintroduccion3.page 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,123 @@ +::xowiki::PageTemplate new -title "Ges Template i1" -text { +
    +
    + {{adp /packages/xowiki/www/admin/toggle-page-order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing" action 0 page_name @name@ status @publish_status@}}} +
    {{adp /packages/xowiki/www/admin/toggle-page-order {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "increasing" action 0 page_name @name@ status @publish_status@}}} +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + +
    + Unidad 1 + @Facultad@ +
    @Carrera@ +
    @Curso@ +
    +
    + Galileo - GES +
    +
    +
    + + + + + + + + + + +
      +   + + + + + + + + +
    {{adp /packages/xowiki-portlet/www/navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 1}}}{{adp /packages/xowiki-portlet/www/navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 2}}}{{adp /packages/xowiki-portlet/www/navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 3}}}{{adp /packages/xowiki-portlet/www/navbar {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ template @page_template@ index 4}}}
    +
    + + + +
    +
    + + + + + + + + +
    + Actividades + @Unidad@ +
    + + + + + + +
    {{adp /packages/xowiki-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "decreasing"}}}{{adp /packages/xowiki-portlet/www/home {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ template @page_template@}}}{{adp /packages/xowiki-portlet/www/next {page_pos @page_order@ page_id @revision_id@ content_id @package_id@ type @object_type@ dir "increasing"}}}
    +
    +
    +
    + +
    + + + + + +
    + + @contenido@ + + +
    + + + + + +
    +
    +
    +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/resources/.DS_Store =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/.DS_Store,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/resources/.DS_Store 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1 @@ +Bud1%  @� @� @� @ E%DSDB`� @� @� @ \ No newline at end of file Index: openacs-4/packages/content-portlet/www/resources/calendar-full-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/Attic/calendar-full-portlet.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/resources/calendar-full-portlet.tcl 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,27 @@ +�PNG + + +IHDR,�]� pHYs  �� +OiCCPPhotoshop ICC profilexڝSgTS�=���BK���KoR RB���&*! J�!��Q�EEȠ�����Q, � +��!���������{�kּ������>���� �H3Q5� �B�������.@� +$p�d!s�#�~<<+"��x� �M��0���B�\���t�8K�@z�B�@F���&S�`�cb�P-`'������{[�!�� e�Dh;��V�EX0fK�9�-0IWfH���� � 0Q��){`�##x��F�W<�+��*x��<�$9E�[-qWW.(�I+6aa�@.�y�2�4���������x����6��_-��"bb���ϫp@�t~��,/��;�m��%�h^ �u��f�@����W�p�~<�5�j>{�-�]c�K'Xt����o��(�h���w��?�G�%�fI�q^D$.Tʳ?�D��*�A��,���� �`6�B$��BB +d�r`)��B(�Ͱ*`/�@4�Qh��p.�U�=p�a��(�� A�a!ڈb�X#����!�H�$ ɈQ"K�5H1R�T UH�=r9�\F��;�2����G1���Q=� �C��7�F� �dt1�����r�=�6��Ыhڏ>C�0��3�l0.��B�8, �c˱"� ���V����cϱw�E� 6wB aAHXLXN�H� $4� 7 �Q�'"��K�&���b21�XH,#��/{�C�7$�C2'��I��T��F�nR#�,��4H#���dk�9�, +ȅ����3��!�[ +�b@q��S�(R�jJ��4�e�2AU��Rݨ�T5�ZB���R�Q��4u�9̓IK�����hh�i��t�ݕN��W���G���w +��Ljg(�gw��L�Ӌ�T071���oUX*�*|�� +�J�&�*/T����ު U�U�T��^S}�FU3S� Ԗ�U��P�SSg�;���g�oT?�~Y��Y�L�OC�Q��_�� c�x,!k +��u�5�&���|v*�����=���9C3J3W�R�f?�q��tN �(���~���)�)�4L�1e\k����X�H�Q�G�6����E�Y��A�J'\'Gg����S�Sݧ +�M=:��.�k���Dw�n��^��Lo��y���}/�T�m���G X� $� �<�5qo</���QC]�@C�a�a�ᄑ��<��F�F�i�\�$�m�mƣ&&!&KM�M�RM��)�;L;L���͢�֙5�=1�2��כ߷`ZxZ,����eI��Z�Yn�Z9Y�XUZ]�F���%ֻ�����N�N���gð�ɶ�����ۮ�m�}agbg�Ů��}�}��= +���Z~s�r:V:ޚΜ�?}����/gX���3��)�i�S��Ggg�s�󈋉K��.�>.���Ƚ�Jt�q]�z��������ۯ�6�i�ܟ�4�)�Y3s���C�Q��? ��0k߬~OCO�g��#/c/�W�װ��w��a�>�>r��>�<7�2�Y_�7��ȷ�O�o�_��C#�d�z����%g��A�[��z|!��?:�e����A���AA�������!h�쐭!��Α�i�P~���a�a��~ '���W�?�p�X�1�5w��Cs�D�D�Dޛg1O9�-J5*>�.j<�7�4�?�.fY��X�XIlK9.*�6nl������� �{�/�]py�����.,:�@L�N8��A*��%�w%� +y��g"/�6ш�C\*N�H*Mz�쑼5y$�3�,幄'���L +Lݛ:��v m2=:�1����qB�!M��g�g�fvˬe����n��/��k���Y- +�B��TZ(�*�geWf�͉�9���+��̳�ې7�����ᒶ��KW-X潬j9�������(�x��oʿ�ܔ���Ĺd�f�f���-�[����n +�ڴ +�V����E�/��(ۻ��C���<��e����;?T�T�T�T6��ݵa��n��{��4���[���>ɾ�UUM�f�e�I���?�������m]�Nmq����#�׹���=TR��+�G�����w- +6 +U����#pDy��� �� +:�v�{���vg/jB��F�S��[b[�O�>����z�G��499�?r����C�d�&����ˮ/~�����јѡ�򗓿m|������������x31^�V���w�w��O�| (�h���SЧ��������c3-�gAMA��|�Q� cHRMz%������u0�`:�o�_�FyIDATx�ܗ?HQǿ9�/�A�"G��!�Nql{S���8Y�[܊���U�l�ЩS3e�ԒͩK0P쥘����ɑ3���ޑ����%���{<��������,�:�T*�t]�c�X,��3���:�Y/��� ��*;7��@�g�u�_ތE�k x��H�-��/c����_�=lMS�Ώ�0;6���}��[K،��>������5�.�7�𙒟O�,�z!�O�����AF� �RcdP��"B�x��;�|��%��h�]h-�?|�J�Ł"�7����8�Q��'�>˲^��D����[�kDc�,IEND�B`� \ No newline at end of file Index: openacs-4/packages/content-portlet/www/resources/down.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/down.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/down.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/down.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/down1.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/down1.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/mostrar1.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/mostrar1.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/ocultar1.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/ocultar1.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/op100_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/op100_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/ordenar.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/ordenar.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/pestana.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/pestana.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/pestana1.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/pestana1.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/up.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/up.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/up.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/up.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/up1.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/up1.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/Gestheme.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/Gestheme.css,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/resources/template/Gestheme.css 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,268 @@ +/* CSS Document */ + +.btbody { +background-color: #2763A5; +} + +.style1 { + color: #255F9F; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 9px; + font-weight: bold; + left: 5px; + top: 10px; + right: 5px; + bottom: 3px; + padding-right:5px; +padding-left:5px; +} + +#navcontainer li +{ +list-style-type: none; +padding: 0; +margin: 0; +display: block; +float: left; +height:36px; +background: url("/resources/content-portlet/template/imagenes/op1m.gif") repeat-x 50px; +font: 10px/20px "Lucida Grande", verdana, sans-serif; +text-align: center; +} + +#navcontainer ul +{ +list-style-type: none; +padding: 0; +margin: 0; +float:right; +display: block; +height:36px; +font: 10px/20px "Lucida Grande", verdana, sans-serif; +text-align: center; + +} + +#navcontainer a +{ +color: #000; +text-decoration: none; +display: block; +padding-top:15px; + +} + +#navcontainer li#active { background: url("/resources/content-portlet/template/imagenes/op1m.gif") repeat-x 50px; } +#navcontainer a:hover { background: url("/resources/content-portlet/template/imagenes/xop1_.gif") repeat-x 50px; } + + + +.sobretit{ +background-image:url(imagenes/fsobretit.gif); +background-repeat:repeat-x; +background-position:bottom; +} + +.sideL{ +background-image:url(imagenes/fondoL.gif); +background-repeat:repeat-y; +} + +.sideR{ +background-image:url(imagenes/fondoR.gif); +background-repeat:repeat-y; +} + +.up { +background-image:url(imagenes/fondotit.gif); +background-repeat:repeat-x; +} + +.upID0 { +background-image:url(imagenes/fondoID0.gif); +background-repeat:repeat-x; +} + +.upID1 { +background-image:url(imagenes/fondoID1.gif); +background-repeat:repeat-x; +} + + +.upID2 { +background-image:url(imagenes/fondoID2.gif); +background-repeat:repeat-x; +} + +.upID3 { +background-image:url(imagenes/fondoID3.gif); +background-repeat:repeat-x; +} + +.upID4 { +background-image:url(imagenes/fondoID4.gif); +background-repeat:repeat-x; +} + +.upID5 { +background-image:url(imagenes/fondoID5.gif); +background-repeat:repeat-x; +} + + +.below { +background-image:url(imagenes/fondobelow.gif); +background-repeat:repeat-x; +} + +.down { +background-image:url(imagenes/fondoDown.gif); +background-repeat:repeat-x; +} + +.contenido { +background-color:#FFFFFF; +} + +.contenido h2{ +font-family:"Gill Sans MT", Arial, Helvetica, Sans-serif; +font-size:20px; +color:#2763A5; +font-weight:bold;/* +font-style:italic;*/ +margin:0px; +margin-bottom:15px; +text-align:left; +} + +.contenido p { +font-family:Arial, Helvetica, sans-serif; +font-size:12px; +color:#666666; +line-height:1.5; +text-align:justify; +margin:0px; +margin-bottom:15px; +margin-left:15px; +} + +.contenido ul { +font-family:Arial, Helvetica, sans-serif; +font-size:12px; +color:#666666; +line-height:1.5; +text-align:justify; +margin:0px; +margin-bottom:15px; +list-style-image:url(imagenes/bullet2.gif); +margin-left:35px; +} + +.contenido li { +margin:0px; +margin-bottom:15px; +} + +.titular { +font-family:"Gill Sans MT", Arial, Helvetica, Sans-serif; +font-size:20px; +color:#FFFFFF; +font-weight:bold;/* +font-style:italic;*/ +margin:0px; +margin-bottom:15px; +text-align:left; +} + +.titfac { +font-family:"Gill Sans MT", Arial, Helvetica, Sans-serif; +font-size:16px; +color:#FFFFFF; +font-weight:normal;/* +font-style:italic;*/ +margin:0px; +margin-bottom:5px; +text-align:left; +} + +.titfac p { +font-family:"Gill Sans MT", Arial, Helvetica, Sans-serif; +font-size:16px; +color:#FFFFFF; +font-weight:normal;/* +font-style:italic;*/ +margin:0px; +margin-bottom:5px; +text-align:left; +} + +.titcurso { +font-family:"Gill Sans MT", Arial, Helvetica, Sans-serif; +font-size:18px; +color:#FFFFFF; +font-weight:bold;/* +font-style:italic;*/ +margin:0px; +margin-bottom:5px; +text-align:left; +} + +.titcurso p { +font-family:"Gill Sans MT", Arial, Helvetica, Sans-serif; +font-size:18px; +color:#FFFFFF; +font-weight:bold;/* +font-style:italic;*/ +margin:0px; +margin-bottom:5px; +text-align:left; +} + +.introTable { +background-repeat:repeat-x; +} + +.introTable a { +color:#FFFFFF; +text-decoration:none; +font-size:9px; +font-weight:bold; +font-family:Arial, Helvetica, sans-serif; +text-align:center; +padding-left:10px; +padding-right:10px; +} + + +.introTable a:hover { +color:#FFFFFF; +text-decoration:none; +} + +.introTable a:visited { +color:#FFFFFF; +text-decoration:none; +} + +#msg_div { +width:200px; +height:80px; +background-color:#CFE0F5; +text-align:center; +position:absolute; +vertical-align:middle; +z-index:9001; +top:0%; +left:50%; +} + +#msg_div2 { +width:250px; +height:200px; +background-color:#CFE0F5; +position:absolute; +vertical-align:middle; +z-index:9001; +top:0%; +left:50%; +} \ No newline at end of file Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/0op0_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/0op0_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Ls5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Rs5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/Thumbs.db =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/Thumbs.db,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/content-portlet/www/resources/template/imagenes/Thumbs.db 24 Oct 2007 22:50:26 -0000 1.1 @@ -0,0 +1,1070 @@ +��ࡱ�>��  ���������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������� +����$ +(! ����"#%9&')4*+,-./01235>678:K;<=?G@ABCDEFHRIJL]MNOPQS\TUVWXYZ[^fq_`abcdegmhijklnwopr�stuvx�yz{|}~�����Root Entry�������� +�MR� �|1�������������Catalog������������4 2����D �����JFIF``��C + + + + +  ��C   + +��``"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��Ϗ-�=�0�6�t�}B�ʵ�2�V��|��NL|K��p�������G�Y@�9�}эM�Ԣ�JFYP�Z�H�z u��d��in.�\e�uP2q���o�b�<-^E 8�_�iuZ��~KٍL>*3��U�3�!���I��b_���ƪo�Ot_�)0��f��ƪε�ZBe�m#�,��*x�iC�3�S���ǥU���Ļ�������5���~������? ����F���n�?��t�Y��%��Y�r��D�Ƅtʾ8�6WcI� + �������g�%֮��K����e�O��+�S���ǜq�ֺ�Ky�� �ʠ����8�8���< +6�]4���o�r�a*�����G��Bx�}�������t�Bx�}�������u�p-�E�� ��X�y�O�� M(֧Z6�_�S�;:�<������'� +4��K������'� +4��K��k�.p�)�۷קj����~��[�#�����W����?����7�������I��M3����Ľ'Œ������$� VVQ�Uxd�w�m$V�C-�$N�� ��+���a>8�]ז��剤�Y]��g�㎦������s���nT�mGt�\���c.HY����ɴ����?�摶���c8�ԓ\���N�ljmm����� �����r9�n�:q�����Y�s�!��� ��:��J�]Ʋj8YF�� +�1�ߍ}��}�|l�J�����u�pK���a��b���Ǖn�ػ �y<����H���0O d��ayg�q>����[��4 +%ݏ1�<1^�c�z����]m��{x� +�#s��5��F��f��< 5*��ӳ��f֬�<hM�l��)�_�=�Y��ґ4���*��q����6rH#�d|I����g1������l�����.���> x{�>k�t��G�����b���X�)�g�&*�a�*�C�--��rHS�级���T���Ҥ#ʵ8񏙈;��w�l`:��,���#�/P���y����>�b�-�jv�^��_6�� +��h�?6_;��H��ሞ�X�3LL��Ti��]���Ӊ��`�%C�9��B�[O ��K�8c4��F2HL�w� |�=���6m*g�oXjV�M�%d���A�Ƽ����=��� �!-Ѝ�U9l�pKf���)b+: +��o����:�)*�Ko��{������T�&F�$lN28"��a�����Jo�!����������!�G�x �Rz{���w�<�a)����N�m���N+�*D�,��Qu��+2��q{s�ض�5Ǘ��t�a�W�:�|�;k&y<�q7�1`�q� �w�}u����R����Ek\�7�����I��Iqq=��6�amfҴ��$�A���_Y�����c!SgV_�S<�� +*�`㺊����WŝwO�+Ho��L�G}"��OA�����^������ϩ��(���V�Y�_;�9#t�_��|?{4z��n��H��W���\k�76���gJ�,|�'8鶿c�`)c"��I=���p���Y>t���z��>7j>0�c���>��~gݻo�#w�����V�v�xgh�Z�a�g)�z�}��#�<��T���ɳ���8^:�c��‰��2��{�&sw%��-LGZ `���Z�3��|�:V�OO�Ϲۗa�b� +�_����k^�ƾ �4y�b��3����������^�y��?�$ӵ_�iz�Jќ��`9At8�E~��e�XI�]O����g} ��}�i_L��E�]�1�e\��H�o^�Ҿ��(��4���$��}s�x��C�G�|0�������Q�k��@&�V;6)L���_ּ�U���x�S���zơ3�0ŋ1€�p���^�7�1� �E�60d|��3��-��>~ʺÍL�wr�w�/�.��dLpd$9��}Գ� +�^�朽~�GϬ2��*��+�����U���Ø4ٗi�k�2H˞Of���͟x,�Fo�"��A�,.�#^qr��i��M��W5��ĵ%W5�T��q�R'� +jg���XApm�m���S��=2,�k���wR!S8>�ƹyo��`?�#��ZՏ2�6�?���#Bn)Ԟ��g��B�89����F�|�x�{�o�����o�Рc*�+��G���'��|�I��_�n�S}eu����&I��0�w�4�� �b��_i��I�����s�`��&�E��m!]J����2����J��eZ�ҳw7��>�~�>� EF�[v\�������f]��e����:Ȟ�/|���6�D۷cg�^s��8�S�=���ۅ�|_���o��3��p4����ɺJ2v�[m���O�����z:J�['��������#�v���xN�AK�A �i�e= -v�`㞽�����w{t���ݟ�$�5�^#�-�+���V�b����x��U���(����y��R�A�ύ6� +�$+��Nr�ھ��ԭ����׊� K▖�}[���c�� +��Uwril��yiM⋙�&���I +s�>��;���?���W7�U������Eq_�C_��ʼܚ�7�O��0�N|���&U�/������j�p��ec�u;��;V4����&�g��hrCyi2\C!�.�k�S�!"�J�줩��s��XZ�>�,��sJ�-��{}Ǩy���۾/h����ҙ��M���G�w|[��Bm���z�ç� ����x�6˟��{��p���ڜ�b���2C�<>S���D�z�)?�R��m��W���z�ھ$�n�ܓ�<��j�����������8�|� �(��G�eV�}�;�h������y��l[>=�o�O��w������O�K�� +XڕO���cuBG�<]�_�����[�G��Gi��j��C�V��&��9m� M��(�0�D;�<0Ü� ����П}��v�~�� 3�ڡ6���P�M96�iXxz�}�/R+E�v^dۍ�C�������.�����������.�������S��������� �6�F�P�fx������ ����fx������ ����}O�@�?�\��~և�����̛q��?m#��Z'��m���j�7�3ſ�'��]������.�����,�����?f���� g6�;�����w��_y�U�����R咿���kM[���^��8iFR�v��բ��!�����u�:�������f�pV��Ie���#�'�W�j�o�+�E��5��>`s��==k����^+�a�}+�+��}�J�Ge��<{�gߞ������5��0���RQ^Ʈ���^K-{��kex��z뗖2�o�%+��}���f���������#��fx������ �������ߌtK��m&�N�[����ߺ " +�9�̀�·9�?��0X׌�� ��ۄ�II6�j��׭AQ�j�~��?3�� + +���� !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRS����UVWXYZ[\]^_`abcdefghijklm����opqrstuvwxyz{|}~�C```%���{A42CD7B6-E9B9-4D02-B7A6-288B71AD28BA}*f +t�� 8����JFIF``��C + + + + +  ��C   + +��9/"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6�����N��������G�"w����������v����NO�.����|'|N�|�|���'��$Et�oYXd2ܹ~t���s��C� ��)E~v��'}�AK�� ��;�� +_�K��?�v����C� ��_٫��Pt������HV'�t}{���Y𯅞K] ��k���ع�����1��8 +^Ҧ�V���zt�GdW�4 +c�g�υ�+!�ҡ�&����q���ᜃ��V��O���ͯ���p�ǁn-��X;�9��S�{7����¿������Rh��C,{�Cř��$�ɤ��(� ��H�V�l�����&��]U\0;@�������̱R��k���-����T ��m ��ލ'쫣j��@�����튋��ϗ62F1޼k�5s����Z/�?e+ �{$گ«�՟O����H����=�l�}}\���5tuta�a�"�ˇ�Ƶ*�����k���G���8[�M.�x�ɍ�FG�_x~��<'��H�����ܺ��̍�������6e��;澲���j��RA�I���$l �� ����xzUjF��Z�3�ʰU1�%N�J���N~�����ӓJ����:�n{I�&+�ɐJ��N=����5m^�m�����aZ�]���1��y���ui�k�jr\B����0�0?tq����Z��j��]6���t�bo� '�ӟj��x��1q�F�I~W�~'�� N�XN>տ��3�O�zn�� ɦ�v���2:2ʡ����Q_��Im����C +�,Q# HP8��Ҿ���/J� �%�FO�޽����Ʋk�4��q#���'8��xGK*ӄl�.��^��� +�EQ�{�~��s �B�ԏCP�Z0��⺺+�eQO�g��[3��8!,b��-�vJFidʥ^�wS٥$WYEgj_Ⱦ��]�M"�C�A>�52MjYUGa]5�g|1HN�v�� � +����JFIF``��C + + + + +  ��C   + +��P`"�� + ���}!1A3������������� +4�����5������������T}6����n0Qa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�S��(���u�-?��u�j�iӴ�I/. +B����� 8�$q^9�?�oῈ>��J�i��]>[�Y.n$�U�H�,q��� N3�N���n�#hQ�Q^����@Q_��� +��K �h� ��E F�˸�r;�d�\���YmaO��6���Yt���5��������Gr�1m_��_�~�Q_ +�W� +��[��<+�hH���t�P=["3����+�۾*���B������������� b�X�Un����r=1��m �F�f3�W�Jq�G�QEw!EPEP/�KÓx�ᗋ�p�U��,c��A�ի�SDg�>x��0e�u�]Ko;���o���xz��ӯ�?���ށ�m��ᯍ,m��&��������?�m��`rV%�<��x��\��u��{8 +���Ծ��3�ƾH�i�0� ʵ����7�-��zg���B�2U���g�A�#!1�t�ۏ�? +|4-�� �z�w���v�)�A�L��y���ⶽ����<=)����a���bY�7W%�0*QW,��q^l��T)J��t���sz��*p�W���o�߲���/�W����]���w�U��r��T�>^� �-/4��E�M��e,�*� �pC+��nkF����h���)�О���%�-��V����;\����-b�5���C�l�Av�.�W�0�؃��4�k�V��w��7�����-??���؃���׉~)�������K�-�6�w �kG�7�ɒ]N�H,�#�A��f��TѴ��@<1c�<� +F,�/� k��������p0+���C�>�㏄C�)�-r�%K�>�Mv�L�D���.����̯8����J��w�-\\-%*��=��(��8���g� ��>��-N+M��LO8�(��'�����/���C+[�_Y�xf3���6�u�s8��o��3�����⣅�����4��H�9>;y��oa����.��n���^�q!�6+��.�@l�?&�����G�C⏊{>ۧX�YI�� �j~_��F��bW��!�n��k�63��ҟ�W.K���1A�^O��q��%�������)񆿯O�+�T��n綺P��O������~�>���-�F�V��'LԮ��{5�p���\�c9�=�F +.��9]*��oF�g���oCla ��'��n �"���w�;C�Z���g��M<7�F�{.v������+��_Ց����LdIr�3�O�+"���ܯ���ZP�;Wh@2O�k��Ֆ�kK^W{3ȫ�����~��_�z�줼���a�Z��[ͧܤȯ��%I����_������w��=u&�D"�V�h�� �՗ҿB��|�}U+=��>J�'F|���|0�w�k�Cx�����!����?1�S_&�˿4/��[Oj�k}��{'�$y����9�$�9���n?[�~���� ;O��O�$�� uc8�|��7"���VMZ��#����_!�c*�Z�8�C˫��0�����s�DҼ�-CU�Эv��U�k����;���c<��ׂkʵ���dY�( ;������_:x �Χ�����]�'���"�X[�Ȯg^���&���?-���o��C*.���+�x����~�V����zw=���4�7OI�;��(� ��`u5�>:��u�&��� +�n�s�2�b)��rÁ�W*�����뫉Lt�������V�1���;_�r���/�+`�:W�:�j�X�u��;a�o���5������<��j����f����u���k�ҵ_k��f��6�6���]j��8���h�}x�Xm�\�bD w h�q���q�P*KO�k����XY8� s\���׹NT�9c/4�`�ӽ�vڞ�i4q�� ��@;q���^K� U6ڄZM�7�̻x���8��{Wm�����Q_�s�����O`Nr��W���7�W�3���n�rͷ�2};�ǭyX�w��M�#��g�wk�F�ww���Z��*_�O� �!dF �w�W��OxOH׬O�.�m�.rWp�S�A���Ŀ M4pA{,�v �-���~��� x�Tվ�:%����Y�W�K� G�d�pddM�n�ᘑ���^� +έ*��8����W���rI)E�@��������58�T�ml�qx�l�fD��2��4�����(G���&0B'���U��;W�w�Y�&�����1+�[�������u7V<��~� +���G�5ɴ���׵)`p��K�p� v�A� ��W��x������v��!-gNI$��w��w�ZK%���Z6_����;4�F�o�&*�!xj���5R�)ZZ#���q�����}4�֚�5c��%P��cO_��ַ�t�^%����U.�G����ش8H�(���������?�*�!�`��������}��57�D�*1�P# ����>�~�� +UG�Z�&��SO��1���K�[i�������۴�'�FG���|�R6� [O�H���>���uo7O���q +�_�6�m���r"�y��Lّ�v*B���{��.��Y'�5�����w��jy�&��.`?��G)�Ul|���j��~,_���&������ޑ���Cu�xd���� +���ix۹��۸��y'��+�o�B���bx�� K�o��,��t�b�6m�T@�񲟔�����O�$���;(/muV����We������i� �RN"fIW� +�\")*C�{��<��ڟ�/�"�)�]�m�CsyZW�A��H��h�8� ˖!�uڻ*׊m���g��[m.����֯�0Z3&���ቤ�P��LUY�C�<�M�?|H��wVkmM�[ ������$m�ы�ynN3Аk��Xy%%{����x��k4������Lё�e��PIk��c8,q�?!Y�N�t���49>� +�����]s�Zϋ���5mZ�P���I=��$�zr�r\���v��ܵx��2nѧ���=�$�*�����L�~���}�N�����*��9�RMq�h�� |Mc��x��Cկa[�a��B<�gUvp�T�>b:W�����x��EС�����n �>�����NJ���+�羻�X��K���X�� 9U�����f���~��ǟ_�÷�W���?wh�����D<�}B�M�4xR�f.|�wd�Ҩ;r�s�:��j��2��FA ���R5��x*J[ EV�Q@�@ �A�_���oq��W�%�*ͫ�j�e����%��o�Zmf;T��q���r?d�����������P�[�ƚ���se�[ؙv��&P[�T���<Oa���% �d��秂�J�V���L_�.~#�0�x��z��D�F�_�\��Q3��zץ�?�J��v�����&�uo&Y䶳��(�FY�;I���+� +;�]֣��ok�OxO�rF�R~�'����W5���_,��_�o �x{[��uM>{5��F��h�M���OE%��&��hR�IY%��zo��b��(�{�>G����_ě��x�R��n- �[��{��=��u�wM���T��z}������O(��cx���$�d :\_�4�WY��x�S����+}!�#P0�!�-'�ʲv��A �r3��� �e���6�ú�o���LJ�i� Ӊ��^>�e���t1��W-�-Ʉ�L��}�~F>���zW�^�i�9h��勺<��� ��5ic���ZK����J3�c���*�6����mi5��я�u�������=E^�׭c���r����i'�6� :6 �Oh�?t�׏<[{��gT��� �l��ppY�,!�^F1*��NN�Gn𨦖����Vw�K� p y�G&� y^}��N�� 9z���q>�7�|I�}��WRygym���I���S�1�X��m�FHN���|ɤ�������X�mk�J�� ����l� �-������M{_Ӭ��(��1�l ���i'¿4b+˽���#�C�b���?*l +������Ns$�$o�O#�U��5��t<� Twn��_�@����_xJ�= +��q^���.��$��du����'�%��H�C+��`z{��{�t�[K�-�z�#ߏ�`��ѿ� ��㟃v��^�Es��X�Ȁ���e\�� +}�G���T� +���_�>s��8��ߵ��c��_ؖ�m���kp��pfa�ʧ� �W˟~4���V�y���i�����g�n?Z���J�]��{�E�7{��+(#�QIQ-� N�p���y�8_j�)��+x��ʹ +�*__�ԑ�2g>�f����qnT����f�ocv���>��I����֪��YZ@ +���+�t@��q�x�@8�S^O� ǣH�5$�u��๕7!U@b ӷa_.�_6�?�[N���"{�m�������=�\U�ŭ +��K��6�S�v�e��y}q��>��k��|����ס��S�-$�v=�P���m4�p{���QB|���+P�N�⻔]B��>��o��e����'ۏ�p��n�� �\ �M��˪��n����f���$W�R�.��:a*Q�G��2�?ō+I����º +�� �� �w;q��������T�����ɤ��f����f�k��k�oN�Eo%؍FH#e���Z�� ��C�����)�N� +��Ԕb��o���0�c'~k���嵳�e��tQv�n�n�#����~'jq�Z�,�7cj�pq�ө g��y��틢����m8�.�r���I�y��hH&��XE��[�>i3���2�%~Y�����ǥ}���|+�JM +w+i�<����x��_5~�E|k/� �B�Z�������4��~𵆑hg��N�5+�s$����*�#�3�r��leT+F���۩�"�)�ql�w��m��w�H�����_�rI����+� ����k�����W +~[�S��h������E�~��(˕X��YR�B���[��\uǁ�;�N/<�F)&�6��8��&�~���62�e��>�� ����Thf;h®8���ͅ*���7&i�/}hf/¿"��W�?�M5��m����k��k�۸�E(?����� s1���Ue˘w��l��쌹>�P��K���=Q��c�8�˦�!��Sք�7E�Go���ϟ�q>�{G��*�3����/���5|'��5�ش���y���ݓ��{��kQ�� +9DLl3����E��e��V��s"�\���z��$'� ����Jru[����f�B3\�C���2Hc��_�߱�_�K�-��'����%��r#]���ׯ��؂#���2�qt�[%zYlTj?C:��?��Qa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��'���� +��C����^��V���k�?�j������|���O�?���W� +��� Z��7/��B�:��2�׬B._�h�U������������}�E|�e��o��!�Ə�C/�)}���4������?� +����=C�5}+��|���Mc_G:k�{5b����F +�`��7y���Z���5$1���V���C#���n��_H�L�������o�����ɳ����b�>�@ǰ�{�G�T�B4(;JZ����yy&�J�Uu�����4[Y Ҵ�M6����b�[h>�򿈖:G���R��o$< �`L1�"���8�����|F����x�SO�8ү�m?�"=� v�p��k�0 Œ�y_���N��[đh���O KyI)�.���x�������G�~c����dԻ�S�](�<�+v�}���5~���3堕��1�n��r������������ڣ7Z��F��1�}Sz���Ŀ�G����0�? +�ߊ.�ϳ?6Ͱq�W���-}?I�y���;SP\��Etz������|o�O +�`�iz��m�hw�����Ibq�6!���q_�gS,-���gڎ��v�x[�rJ�4gm���d6�N|�e�`��+�q��� LT#Z�������丸a�*U��~f6�� +7���+�W0i��_oo嶾�D"Q��n��8't�W+���+��w��x������)f�2�b@Y��.�s����������]<�蚵��h�q=��L����8>Ƽk���-��i��5�;)W�[A {������"�9�%)rEj}è�����.��h�fwP�)�8�<�Jv�=�oo�����s����C����i$H��E�$Y�9��=d�8p3�n;�P�z�T�0��a�y������fب���� t1>����Hn!a��kz�����q{��+F9ʃ�ic[X�Wnz�IEO�Iߔ~��s �1|~t}�/�ηh����/b���� $����JFIF``��C + + + + +  ��C   + +������������������������������������������������������������������������������������������������������������������������������������������������������9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��������!�Ə�Ww_���������/�����%�߇��+�7���v�v�雗�iW��èe�/OB.�Z��O��fK���'�tW�����'{���4»������?���؇��?��2_���=�%}+��?Û]X-�������C> 1��1�z�7q�ׇQ���I ou����i�/�ii�5�U�b�:�`9$ +��p��'V��]<μ�*IS������k +2�H�� k���m +ǻ��d��k��tt�f�U������y��c�A��8������D��|�����?�Ɨ%�i�c�K�.�|�� (�'����dj��G��o?C�q$�����|����V��������p��+Z8���z�_�^M>�"1� h�ln㪶;��zr1ʭo���u>(@4��r������~i������ޯ��� +[��^��`q�?{tp6�-m2���2]�'�� ��0���<�_��m+_ӭ���hY��e%��(� ��q�|8ڹe�n>���h�O�����um�|;�����\�%+A.�1���gt�o��d>�Ms�V�76��q�>���4Q�f��]@���_���4�X�T�խ]�ne�t%I��5���U�O4�γki($��p���k�?\cԊ��(�v�>y)7d�9��zO��9�7�?�d8l}{�kLJ�|~u�x��Ϗ5d�D�zM�E������q��p8Q��%�?�H�/���_�׎&������ +P��n��C�=�k�`���Z�W/��:}��5���$&M>$���v[�S�{\\뱓��������u�E/g�?h�� 1����JFIF``��C + 7�������������=8�����V9�������������601 +�����" + + + +  ��C   + +��9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��7������!�Ə�W�_���������'����������*+���c~�v������_��.��T�e=���������?����}iE|�� +����w����I� +����w����K�j�����h/��������<���V��+��$En�����U; `�� +�|7��][Y�!�K���G�28@߁l��_�*�K���?��G|�n��6����\2��(S��$�\F���WK����acZN�����a�m���o$Zu���{Iam +ǻ�����<טx�5������Bq�PLH0�{g���~���o�����ujI���U��-����A.�.�|���(�'����d���I��o?C�q$�����|������9?�{WظAǕ��t�\�h}��x},nB#apZ'ln㪶?�dr8 �1ʬ�#���x�@��% m��?�ْ���o�r���־3¬-os�z��ì=_sfpv�,:m���k���_�������T�խ]Y\$���J���k�~*���~��McY���|�j$p��Ĺc��=H��r�\��}+�K��K�.���mFFa���1��!���7��ג� r��k���˟j�0��4�|�[Va�������Žy-���ަ�#2�G[��h|�:��S��l��z +F���ԏzҢ�}�����0���F$���O�;(S`5�E?f���s;퐏�h(�d?��V��������� J����JFIF``��C + + + + +  ��C   + +��9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��C���� +^��C����^�R���k�?������>w�f����>o])�׃=3r��B�2��2귤�\����W�?��?�!����� ++��B�?�){���4�y�AK���������l��?���e��kӾ|�סM_]G:s�Y�7r9T�0An� +�i�Hu�[O�RC���j�v&��v +�+�g�O���|E{��B� KH��*�,P�Ո{� W��㧇�h�vr��~W��i:����z��,4��H4�6�M�),��,A���@��<ו�C���Ǩ5�߅�m�_�/�-��G��x?�ƕ%�i�i���%�%�����$���l�[ⷉ"Ѽ-��~��$�Rv]_/�>�q�'��j�ԔeΛ�s�5%�և��*�@���L��M� �>a����p��Ñ�Uq������?�[� jl@ +j����_-��o_�x�����Ҳ�d�t?y�GO_3�2�U�6z�n���j�v���Y]Etuc��ۊ�G���� +6��i����x�4,�xIbq�6!���q_�'R��=k��g�ڂ����x_�RH�4gm���d6�N|�|�3�0�L��/9��զ�㿡ە�cFN�ݓ0���l�>���uo��|<�����\�%+A( p��Rp�3��q\�Ǐت ^&��+k��kk��H�,Q�f��]@�x�u���j�?�4�{�j�:ţ�{��y Rp}�5����YH2V�H��݉r���W����R���5�އ�s^�@�.�3���_�� ��S���{}���]I�j��ߋ�_���H��E�$Y�9��z�&8.} +8�!��}E~��a�����R����E_wdb}�/�贍<,0]H������G/��9��юIZtkkʕ����h���s�1}h�L_��k~��l� ����� *����JFIF``��C + + + + +  ��C   + +��9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6�����N���w����G�"w����������v����NO�.����|+z�Ϋz3�r��B�R��F�zA�._�h�W�?��>���tW�o�"w�������O�D���'}��/�4��?����X]�L���_>�������Lc�kc�໰�T���r7y.��^�t�-d1���6�ג�c���n��_W�K�����]W�7��zt* ����r��� �@�I�|�<4cF�����ʌ�����t���2�L�!%,�H���v���y�(����+��-SI��s��� 2�%\8�g�����5o�����uSO�8ү�m?�>^��d�a���@ �@Q�O+����վ*��¦�D𴗑�����|����V�����G�~����w���侇���������T�s�\d�3��c�>8�29 9r��f�J� �v��� +� u��b>�,�}Sz���|���=E~���e����⎏ϳ<��z��������6p݄^��|~;q_{x������&�5�>�^ЯcY�v�.RX�r��e=��+��d�������f�����VV��&��a�� +����Uc$�%s���+;�Oզ�㿡Tf����g�4~~�>��L>*�y}-��J V�P�1���8�>���S���W��S\���͵��rO�e�Ā�G�]@�x�]G�o��gF�>�o�-^�Y�t8�O�I��Е'��^3��>�n��k�����,��`{��X�.~���E|4a)K�-N�kjp�|C�>k���u��˴�)�&��)������G�ߍ����'�Ь�v�~rOY$��:p3�7 ������FXJ��-O:���������) ��e"�Z+�۾�r��Kl�)=piQm�9s�k���ڤ�`����/�>���t�U{w�9O�� ����JFIF``��C + + + + +  ��C   + +��"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?���U|�a{o�+�F�;��U�g����`���%�<=?S�2���(� +�S�KR�O�����H�Kq��+���?��?�_&�����H�}R?;��U�g����`��(���_����>o!� �N����o��f���{-W�O�~��C�G��113 �����021 ������31!"�����"41���� +� $����JFIF``��C + + + + +  ��C   + +��"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6�?� ����������uGK�P_[jiwv��DB\lVI��_.�L�ml�ῶ����_� ���Wȶ���_]~��G��/o��I_"��O�~����6|>w���?p+�u��|K�_����QE~s�����%���;���G��/o��I_"��O�W��=���g���#�� �����JFIF``��C + + + + +  ��C   + +��"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�2��"Ѯ�2���{4�+��H,I#�se�uŲG)��n 4[Q�봃��͏C^�o�K�ߍ7��0O>�*�?@ABCDEFGHIJKL����NOPQRSTUVWXYZ[\]^����`abcdefghijklmnop����rstuvwxyz{|}~� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�g�����O�^�Z�@�I4w�kP�I%J�S�� �Տ<���u�A��ڭݢq� �[��� ��f��ڏ�z-�Ľ*kk!n���ʑ�L��I��q��z��������v���mg@G\�<���I$�I�&���L%*0�����N���U��ѥ�u%;[����3�� �����JFIF``��C + + + + +  ��C   + +��""�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?���U|�a{o�+�F�;��U�g����`���%�<=?S�2�����"��qA�����3^�_;h:�ς|I&�IuavT\��x���X` ���L����1�RhU�W��� +��H8 �`��E|������s�%�������ύ<=�]+����7��j�' ~��9iu +��76Ҥ��"����u#!��9���H�OC]����~4�_ZX���m";-Cs$D��H ��8�Ĝ��9�'��I���|� %�Sf}�F+���moз���o�.��moз���o�.�K����ka{�7EW��a�1E�� �����JFIF``��C + + + + +  ��C   + +��""�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz����������������������������������������������������51#$�����61����)N71%&����;W81����Mw����������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�S���yRo�����ۂ�NyD�"��|c���Xt&�ؿo� J�����n�s�c��H�͔�4�<��T.�v,���+[8Eߩ�Ԛ�C�m��#ֿ����$��m��'Ҿ�����Z��^��@��E��P�J����~l������~�Q_�kx�����#�u +�����I��DѬ�t*���ђ8`�8�Wʬ��#迵���A��|Qc�4o +�7�w��v���ha��K` ��-��TJMF�V�N�.��_˨��rd���@=�}�P0+�r��PT����~)b�9��b�+�<Т�(�� B����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��;L���;-6�<��ɒ��v8H���� ~h? 4����Iu6�-΢���[�?��8��O5�/���*� +�������#_oĕ�)B�v�W~g�dT`�*�k{�w�?���|K}��޽��h� �۰���#�?P@�A'���7�u[����Ƽ�>KV�۵��J�iN��R���.������ ���_�5����J��?�/m��~��o���ǐ�~��^ +ґ�57�ɺ�����S������GQO�)<���3]/������of���~vx����*� �������#_�� ���3�����0W�|o������g�|���=KV���d��������� ++R�}��72�|֧���U�4�h$|�Ey����U|�a{o�+�F�;��U�g����`���n%�<=?S�2�������#��0�u�|�����=��z5yU�x����� K����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��;L���K-6�<��ɒ��v �����e��A�a�E��K���j2/�en�����G`2I�%�]�%S�����т�Dk����E(QN�j���,��eU�o`��J���s_�ω��;���4���3On�u���۟b���]�A�V��_����&�k�)������x���F7��� ���3�����0W�~w|.������ ���_�5�����C����?KG���hɺ�����Q��=+��"�ԗ=.������Tz�N�[�D�j������U|�a{o�+�F�;��U�g����`���lj�O�����3�>�u/Sհ�}�n?�f���ϭy���}�s��C������>��C�;SH����l���J��?�/m��~���w���*� �������#_�q/�����i��~�嵄����?h���Ư��/�违n�_g +�1����.g{��� k����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��_F�����I��a�L�fea���zc�������Ᏼܢé[?�u#�vn:g�g8���rj�|I;��Y�,d��<���vO���խ��d?�W�v���_]~��G��/o��I_"��O�}O���������S�0zW�~ϖ����*34�j�_�A�^��=O���P���`��Z��#��t�W� ���??������Z��^��@��E��P�J������=k�a{�J���B}+����_�;������^��{o�w���Vs�'��Aj�c�U�k������xǜ�kS����ߟ��|�_�92eld~�4�m��#ֿ����$��m��'Ҿ�����Z��^��@��E��P�J����_�:����}�/�违}9�:�� +�G�i��-x}�����n��Z�9�灚�o��S���߿��߶����_� ���Wȶ���_]~��G��/o��I_"��O�O���y������ I����JFIF``��C + 91'(����_U02������������qy12�������������Q22�������������m + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��;L���;-6�<��ɒ��v8H������-ᆗv�.�х��]y+w��W����%�]�%S�����т�Dk����E(QN�j���,��eU�o`��l��� ]�ψ����4�W1M< 39��?P@錞Q>^�o��_�?���ճJt���Щe�f�yg���*� �������#_�� ���3�����0W�~�ĿLJ��|C���9xIG�S��]Js�5��e/�k��&�"�RR܋�x�������ֿ�~v~�O�G�� ���3�����0W�~w|.������ ���_�5�������C���x_[_j�v�����t_��גhz�K�L����������?ޯª+͟�A����U�g����`�����]�%W�����т�Dk�^%�<=?S���3�?:4���ԃ8�2��|֧�����Z�W�r�3������ m����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + �������������������������������������������������������������������������������������������������������������������������������������������������������w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��?N�޹ᛵ������S��ά3�OC�}3_B�7���A2ܠ�P�o*�1�ٿ��q^fO�V���`�\�Tyo�3��nS��U�V�0���_![�O�}u�m���������%|�m��>��������w���>���_���Wj-5(̐��Z�����w�M��u6zI��Z��2��j??���0�w/��m��#ֿ����$��m��'Ҿ�����Z��^��@��E��P�J�����_�?���>G����ף����F�&��Aj���\�׶��wj���礶�� ��_��ؘ��#�\{�_/̯�m���������%|�m��>�����$z��������-����W��=���g�Y���������_ν��Hu�? �6ۧ�J�j��{�fo�v�ڵ�F���_���+В��ʿ�����_� ���Wȶ���_]~��G��/o��I_"��O�~����6~?���|��� E����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��;L���;-6�<��ɒ��v8H������-ᆗv�.�х��]y+w��W����%�]�%S�����т�Dk����E(QN�j���,��eU�o`��p���]�Lj��-��t�V1M< 7Nq�����2yt�qzgV�'��?����Zt����V�eN��R�� ���3�����0W�~w|.������ ���_�5�g������~���Q����2�R��f�/�����"}Hn����3]w�����*ߝ�_��$�.������ ���_�5����J��?�/m��~����K�xz~����~��^�DWڨ�������t��^K��/53����C5����_��W�<�����|.������ ���_�5����J��?�/m��~���\K�xz~����~�玏qw��g��N����\?��:Т��>gs��7s�� a����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��WN�ֹ᫡}��qܧg��Xg8 ����>���_�y�("��o*�1�ٿ��q^^0��|�Y�v K�Z3�?my�/�p��,�����Q�?� +� +��B}+��o�H������� +�[o� ���x{���ϕ���>Gܿ�C�V���ak���@�2B�֬?�q�[ n>Өx����B?�֯笧��??��,�y���<�����=k�a{�J���B}+��o�H������� +�[o� ���^�u�� ����}A����z��϶I�6�q4?� WϿ���^��0�}�����[��¿�r�lT~�ٗ+b#���_�����_� ���Wȶ���_]~��G��/o��I_"��O�Ap���͜y������C�=�y���YŅHa�[r>�W�׺~�?�2�۷�կ�r�|���_ɞ� +���"���$z��������-����W�_�����_� ���Wȶ���_�p���͞fw���?�� B����JFIF``��C + 32�������������N42�������������x52�������������J62�������������e + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��;L���;-6�<��ɒ��v8H���� ~h? 4����Iu6�-΢���[�?��8��O5�/���*� +�������#_oĕ�)B�v�W~g�dT`�*�k{�w�?���|K}��޽��h� �۰���#�?P@�A'���7�u[����Ƽ�>KV�۵��J�iN��R���.������ ���_�5����J��?�/m��~��o���ǐ�~��^ +ґ�57�ɺ�����S������GQO�)<���3]/������of���~vx����*� �������#_�� ���3�����0W�|o������g�|���=KV���d��������� ++R�}��72�|֧���U�4�h$|�Ey����U|�a{o�+�F�;��U�g����`���n%�<=?S�2�������#��0�u�|�����=��z5yU�x����� l����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��wGӼA�[��4�j���ޕ�Xg8 ��>��տ ||�>���.Qaԭ�ɹ���73�3��W���������aq��R�J���^g���*� &�n�1�a���B��P�J������=k�a{�J���B}+�8{���ϗ���>G���k�]��+aku�����y�����C�q����9��� U����_�+*�֣���{����=k�a{�J���B}+��o�H������� +�[o� �����_�';�x������״���kO����5|�������?����c񇴶����+<�W�����L�[��_����Z��^��@��E��P�J������=k�a{�J���B}+N�u��<����M������?�K���̩��mz}%����d/��?���kWiS� 5nߚ:��r�b�&Z����Z��^��@��E��P�J������=k�a{�J���B}+����~l����>G�� >����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?��;L���;-6�<��ɒ��v8H������-ᆗv�.�х��]y+w��W����%�]�%S�����т�Dk����E(QN�j���,��eU�o`��:����9�=��<;}&���H�M=���'�v�� t#'˗��ѝV�?����^f#�^ +nV�������/���*� �������#_�� ���3�����0W�vq/�����C��� +x[MW���hɺ���k���_J�|3���%�Ⱥ��C5�j�Z���h���.������ ���_�5����J��?�/m��~����/�����~C�����f��꺰�?�&���j�m��^mc���������?�ϯ�__FV��A�u� ���3�����0W�~w|.������ ���_�5�K�xz~����~��ͬȗ����"N��������KE}j��X����� Y����JFIF``��C + + + + +  ��C   + +��9"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6���������t}n���1��gV���L�����#��W(��v��]�1���q�?�L�{X쮮 +*m�ª���������UNMV�Xc�ß�|�m��>�����$z��������-����W�����͟���|�s������5���Ŋ������_ڃֽs�e�������[��u�l��Q���G�Q��C����=k�a{�J���B}+��o�H������� +�[o� ��x{���ϕ���>Gg���_@��wb���������/��z�����ɸ���9�֟� �gN�)|�4}U���$z��������-����W�_�����_� ���Wȶ���G�������������Z���p��8*r<�>�I��j�o�-��������rf�9�V�����+M_�����_� ���Wȶ���_]~��G��/o��I_"��O�u����͟)���|��� Z����JFIF``��C + 72�������������f82������������ +�92�������������03 ����$�  +  �������� !"#����%&'()*+,-./����123456789:;����=>?@ABCDEFG����IJKLMNOPQRS����UVWXYZ[\]^_����abcdefghijk����mnopqrstuvw����yz{|}~� + + + +  ��C   + +��NP"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�z(��s?" ++�� �Ϛ��(&�o�KW��Ԥ]�+��_�l~�״%������M'�:~�:��[j�C�^��&�cN������t�{� �C�M��ϯ�><�����^��{���� ��kT���h�H?�q�,���X\�.%��2����!^�C�[��y5̢��A��F���̩`%kҒ����{�;QO����9�da�� +2��� +(��t�#7���>H�W���}�U��vS���uDR��Td�]��fW�Ԗ6Pw��ap�ɭ+o�� > \$�v�-�"���G�k�G\����I�/}�Z�A ,�^��]އ��в'�<1��<�:��������������U����O|@Ѯ�]��h�!��8t�������ǥ|�a>�w%��f9�8*�����8�\�~�կ_ӡř�jѩ�%��_�R�Q^��Q@I̶ͺ)&�8�� ��@�i5f4�wE�����)-�Ĩx*�*�9G � A�y���G���*��IXnRn��G�������^���Vŭ�1���ò�V�����)����������V=��VE�Au �(Y#q�V�E`�+�-����'�]Z#�X�Z�<�.������~���c��i�W����nm�����v����G�1oi�rj7QYX�FI���6Ȕuf$t�=�8�<Gb;��噌s +W�����|�a�� +��x���(�d��7���|��+9�3�F���1��P��-N�p޸� +'��޺#�?*o��������#���sƆ��#h�#$n0�GW@ ��T��:(�M��{D�H硵��[D�H����܍���c�����* ?�� �����JFIF``��C + + + + +  ��C   + +��""�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�S��5���&���N[��_�Z����N�����I�dsǹ䘣�w�6����[���7�G�6����[���7�^��&3�O'�[ ��Q�(��O���� �����JFIF``��C + + + + +  ��C   + +��9 "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��������!�Ə�WW_���������/�����%�߇��?�G�'�H�?�C��=h������Fy����to��μ��]�i?�����M��C�=����E��Z���~g7�?��134����0235����<�336����H�437����T� �����JFIF``��C + + + + +  ��C   + +��9 "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��7������!�Ɠ����/�!�ƾo�j����<�h/������I��?�P�k�Z?������>P�?��ۥ���5�����G��z��:9L�C�=����E��B���^g_�G�� �����JFIF``��C + + + + +  ��C   + +��9 "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��G���� +^��C��'�!W����������~����O��ه�~?�S��_J?��������j����������j�����ָO�Oz?�ڮ^sKi��z-i��z-o�\��:����� �����JFIF``��C + + + + +  ��C   + +��9 "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6�����N��������I����/��%�ƾ��^������� ��كҏ����T?ڃ֏�Q�+�#����j��k���� +��޴j��r�����������KEy���/��� �����JFIF``��C + + + + +  ��C   + +�� "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?���U|�a{o�+�F�;��U�g����`���%�<=?S�2����~������o� ײ׍|�_�������e�����O����538����`�639����l�73:����x�831������ �����JFIF``��C + + + + +  ��C   + +�� "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�S����q�/�~/���^�^�����_��_�'��;K��DKu�t>w����Z��^��@��E��P�J������=k�a{�J���B}+�n�u��������� �����JFIF``��C + + + + +  ��C   + +��9 "�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��'���� +_�K����^��R���k�?�j������|���O�?��fJ?��EC��=h����~��jp���Q����� ��}h��>���m�b}�/�违j��z/�[�W������+������������������������������������������������������������������������������������������������������������������������������������������������� �����JFIF``��C + + + + +  ��C   + +��"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�"��}���_�Ⱥ��f����h��c��?.�Q?�� �����JFIF``��C + + + + +  ��C   + +��9/"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��'���� +^��C��/�!�����������Z����?��'��S�O�����O�!����z?���ƒ?]ʊ�^:0�e�r����ooi����?����}�E|�e��/�!�Ə�C/�){���4��j������/����~?�O�����ʠ��$��� �KL���h/I� �%�� �յ��A�Ow=�A����smkWW�uo���>S������W�"����|t�S�K��= z��z$c�Q1๫�8��~˾#[ +Ny5���rm�nI�����b;��?���<)�8�~G��N�.�)�!�b���ǒI�����(� ��H�^�j�����&��]Q\0;@�������sͱ��}s���-�ݿ��?F�_���ܾ��~���ǍI��o٧F�`��� � ?����.>ld�c�yo�h��}'��tM� �%�~�^ ������v��6����CՑk1�I��pYNA���1��z5����ݻ&��|~{AѫN�*W�k�֣��0-�2��G�_j��>��!��M��� �3���&dl�'ֿ=W(����������Ӆ��$0,��$`9�?:��4���a�V��kik���{\'����T�NV�o��Gҿ���}?���ү.,�����v���rd�qӊ��e�WW�Ś��z���؇���O*��@�pq^o{�MCŚc[jڜ�ē��0�0�?��}jo +k�ớ�t�� ��D�tOQ���*�L\q����_��_���0���%����[���>��Ǧ��:�̚f�k�3#�YT2�#����[Sk�#X���[B�R0��&��_���9�X��&�a8ڨ�=03���_*7��I'���1lg8�8���+K:�l�.���������5�1��MK�k���s�B�ԏCU����JF��Q_{*����g�F���G+��Y��x��d�R����U�%u=CJH���������oW����g���P���YI��B�"��+~��#� ���&��� ?����JFIF``��C + + + + +  ��C   + +93<�����K04�������������p14�������������w24������������� +��9/"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��������!�Ə�W�X�����?����l������/��?��]Q_"��*��N��&���i!� �$�j�r��r�\�z��?�!����fK���'הWȿ���'{���4��G�bw����h�ه��?���/��?�����=)JU\�;����PI`�OJ�{�[��g���G�����и�Yס�ްB{��{w�?5��T�ϒ'�Z�(G�E]Z�X���ɼ�y����^��5�w�&�X�J~��g�J�:F�q6�����-ub�I4��Y�W���8��_h�S�q�~�)�������G�T�,�,y$�O�O��������*��� h-����\"�m�GO�cӷL������m��|���u}��<�AѮ� +hڭ�Kyq�͋��It�60�d�1�ҹ���y狭|Q��'��9g�~]� l.��ˣ�r<�=LGw��������A�L�C"�I�V��g3�*u"��I}Ƿ���%���j����� �������}=�*�g@�g��%��`�D̑Ƹ �?�����[(���@�I��W�|,���[�b�[�RE�EO�`bV�c���!�nuk�譂�:Ц�k��1�W�?��O�m54�˛+��&紝�b�\��t������]bk��j���bZ�ݼ��1��y�ߍu�Z����$�"�8��8���jo +�ị���ւi�+���t1'��5��S���20��K���Zt��Jq���v��I�c�4oxe��N��fWB��e`GB;���K�:v�����HU�U��O���^#�K��FN6�lu��ǡ��^��1���x�#��R�>ֿd�G�kwS�� +�$ m�3 e�eo���I�lr+�� +��:o�߅1�@ӣ[����nU9 f<�O&� ��P�ƿ�x�J�k}B� ayn������0;q��k�〤�{ i��e%���_Sϭ�=��Ə��A���sm��).��� �F;�5������,��G�~��%�U�Kuy��]I��F��ylz���ӡ��[x��x�e�2H�*�� ��f��9�[D�����i:s���J���j������8��Q��9]��#�}/�+�_@�_�-eӬ`�F̉�&dl�'׭|`��E,ʹ���� � kV��jREIB� \�`~5�/������Ժm�C,�ȉ��$��N}��x��1q�F�I~W��� N�X)N>տ����J�c�txfM7S����іU ��z���I[ Zgi����,BB��W�I�㠮�_���I���bY�!�_A��O��g����g�y�F7 j���K��~y�x +�J5$���[ӹ��P0 ��{�6���K<n=HP ����T�>Z1q�]�dh�R���y��b���0��=�+����J�̻����Ǥh�-�o��5��� TdE�V���d�._��� k����JFIF``��C + + + + +  ��C   + +��9/"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz���������������������������������������������������ف������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������ + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��C���� +^��C����^�R���k�?������>w�b����>> �'T����i��:�TWMZ�цC-ːG�G��Sn��lC�?��4W���^�R���h��*��������G��S���!�����������LU��P�]@$�\�a��Bx���)e���p������{��z���q��X^Ҧ�VϞ�a*b�� +���8l���-�����h�8Mc���w�"x.z����<�~�~"�O�.%���8[}`��[ �'+� �p�"������=�S�� +:5���)eS�ř��$�֓�_��<3� +#�ZM�[��[���uuEp����cӱ�5���L�Z��� v���>�8*��9}����Oh�~��6��6�'�b*�t�e��H�;י�e��S������KF���,گ‹��6�s.Z]RO�����p}q���r+��X�^7����_c��U�T�����k���ދ�Rە+�\���m� �h�a�1�}��"�sB���t��l��3B�*"�26_�M��RY�S_I����k��o�I T������޼.,���ЧZ���m-}��p��:�JT�k+�{n�O�?i�v��ɥ]��\J=�i;D�|�2 R8��q��������q�=B����C�[˧�Cy��f88�7����1��mNI�I�D +p��t>�7������̺e�k��"o� '��s_��R�.8��^�/��/��JZt��Jq���v��I�c�txbM7S��� �іU ��z���k?��1�-�vT�9!F{d�=��5��^$�e��bi6������?�^������G�呋�9#<�O�,m,d�N�\�ۭ�{��6�R�I'~m��ޝ�q .�ƫIka!$�y=�����IN3���������%��$�r�y�B)^��E*���z���]e��".�?���v:|}3��5i&�5 +������W� R&Q��)\�� � ����JFIF``��C + + + + +  ��C   + +��G`"�� + ���}!1A  +   +���� !"#$%&'()*+,-./0123456789:;<=����?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`����bcdefghijklmnopqrstuvwxyz{����}~�Qa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�P��(���~2j�G�}�M%���X�{I���'�}�q�h ���kZT�Z����֪�ӕG�W7�S��'�zr�k7�el���Ks�'�'�k+�_�-�[��-Z(.c�^_]�I�pX�8�zs_��Z�M%��ڧ�y29$��ݜg��Uki�� �\4j��w����������Ӳs�}��U8���T���~�K�������)�F��)�D���ރ�ظ�<8�ޤ��=� ��9���S�я+�#��� �Fs�;����җ��h\�U�G����T�)���4�����݌62�ZA����C�r:�dWV#/�a��S����<&i���9]��_���Rh寉t{]N���-�o��F#8�=�B��<�+��ejZ�(�v���~s��QN��f�M���S �.`�h�1ȡԐFA}x���QEQEygů���ÝJ8�Ҡ������yU�1� �� es���S�G��k�7����� 4W0DT1?�lq��{�=*��%�-w�)���� 2J�y ���f�x�~S��t�j����R�ya��Ya[���Wɓz�h�)��߂;Wе�Yw3K�?�G�h|��6Y�"r�K��_�ݏQ�o�_�B��� ����6),`����#ںJ+���NJPvg�T� +�p��O�>|����-�~y�%���#7���� �@9���wC��ψ�4���~�l�˺`�d;YHe�A9��}�X^,�^��-6��S��c$- +ܴje���pA�@���gU)>Z����������Y9��v��k�������߈גMm��x��b��O��q�xn9��׼#�uMr- �Z=φu��0E>Y'�q��NQ�1��^9����>�����h�h�V�đ��ăH���I�YC�I�W` �U$rz~�5��x��|��[j֣17�q� W28#��+3� |7��bmKI�xn$CHd� ���GOZ����t��IF}4M~;=���U��]ʚz�����>|/��i���M��]p�ʮ2p����cE�ԩ:�s����T�ӡN��AEVf�EPP�G4����� �F�ɼ#c�+�py�P3��_(��!��Wd�H�3&����y c���]��9f�[k�ci����7��]?��PϤ��H���H�FǖF��W�`r +�?1F�m ��54������������a�64������������|] + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�P��(��(�u��:Ŗ�����oi# �H�p�X��ރ�����)��w���J����7�n�*��a�g��R�K���E�8/�Tw��U��� +.kU ���݋�;p'wW=:�iF2��I_g���J��h�"�(��O� +(��< ���pþ0k�<�jr����K�)�.�� +Kg-`UYVB0�˸�ȪZ��i�-�q�G �w����Y�AwĵВ,s�?*�L������x�u5oCԥ���' +R���1K1E\�eO��5w ��>�¹�#���&�|0�|G��0>�O��M<����E'�!�%t��z��+� ��(��r;;�@��%�5$��ӤX7[+s��­�S����Q:n��*r *�k�2@Ǹ��qR'��ɦU�kY4�-�o0��n�p@3��A�+����k��GN�� �/�@�ym�9]���T�zJć�DŽᶺ�? ��d]>$��ny���������[kpF���N(�����,���������k�]'O?v����%� +�,��:�(�>�� ��M6´{F�_��㎕�� ���6����L�a�H|�g���n=}O���X�:M��eo�~��)SJ�����u9 �( �Uj�R��� �����JFIF``��C + + + + +  ��C   + +��+`"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�z(���uׇ,� �R����6.@���(A� � �����+^�䑏4�ok����o�������L�� .m�o� ѡ��pܐ8��{Z�/�<;���KG���k�-�H���BC�~�����k�G��5_h��m��� �sjZ(����Mj�Z^G2��꩓�#�Mx���?��� ~��O������ј�^���4�0,pY���8� +�aR�KK�-���_�/�=��*t�uv��oM>�Ϛ讓�7�u/�3Լ3��b�dkg�eC��3\�{��g(��x�q��QVH��i]Q��ª��}\�ҍ��P[L.�-ۈ�Q�Y�GLy���_h6�d^+�Bi!k���B�=�9f�1�r8�9T~�_m��3J���"���)��o.�W,0���k�\�x-)B��>�.�a���+=���E��c�Os��Mqm���dt�X��}8�2*�q���->$x��?d��R���Ό��'A��`pA�I'"��#Q]gEӵE��p J&v��3�2 �sֽ,;�z5�����93,�a�M��������H_�~ ��T����֌�Ζ���X�� +݀�c\��Z�x�����^����L��x�x�b���!�;��`x��k� mF����{{���ٷA$rh�s�#���,̨Ӣ�VVk���hV~?�ƿ�]x��G�#k�$��5��� G�ʎ0G<�W{��>��i��76���B>X��b�����U<%�O\���u���)�-ʋ|�X��� ��q����Mg;���ϡ)�|�H%�l̊�-�A��W9��H^��z�j){����k�_����'��o��\����x�����(�&ϑU�A�O}�pr.��#����O�b����L�Xm'������0��e?������/����ľ𮗧�ɦx��K��Z8M�Ŕ�6�㏗��{u�.�+hE�Y��I�;�c��]�m��uo��cs Q�P�?�fs \��� �T�v��n|W�IG�S�9�� �����JFIF``��C + + + + +  ��C   + +��9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��'���� +^��C����_�R���k�?�j������|���O�?���W���jpu{�} +���(�u� �V�Qr��K�W��??�#�߇�~?��诂� ������?���e��o�!�Ɵ��W�~~�E��S�O����NP 8w�n�U�GN[x5��dH4�$"/PҎ��g@>�$��c���/x�Eӧ��c$�y ��HT��m>��[�rx�W�o����=F�Jխ5�!��}��{~`� �G^�fu(8�h;]]��K��� +�ת�gd�S�O}�N���� #BRX�$_��~U��t��w.���q+q��P� �@��\����������B�7�_ x�X�=�9ݤ���aI�?t��^Y�>��3ۥ���&��"���H,������s��z��P�:s焚}��m*Q�yd����7���:�P^�b0YGPG��#?P{�?�j� +����V�D�������wo<2GRB�pAFc�Ҽ��Tz�a�����y��Qv~~g湮 +a1���_�V�7��t�����ˁ�M�18΍�����[���3����_�&�cq��w�݄P�[F^F%۰��O@95񼺉�2���Z�#�{���oX��0Ԣ��~�w?�� Q����JFIF``��C + + + + +  ��C   + +��9,"�� + ���}!1A�������������������������������������������������������������������������������������������������������������������������������������������Qa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��������!�Ə�W�_���������/�����%�߇��+�'�ќ>�v���0����}r�uK�����b�����d�����}wE|�� +����w����G�+˯� ���C����_����%�߇��Θ� 8u&� �� +l�8� +j��\�ɉ +�i������J��f�]�>��ˆ�i�:�C*#HT��m>Ʃ~�~)���!��Q�ҵkMf�Hn�k��ߘ=9pEre88TN�E{h��m��e�A���Z�}�촙�����Е��5�G�T+Ǽj4�r�_��C4���B�=1 ���}A���~�Z_�?��6�f�Þ3��g�� |�۰��S�/B~������؞���ċ�� �!a�N0�������־��2\�WG��������P�����y +�9,3Ǩ��z�ij;V��u��F�gx�?���LBnL,I�y��}���+����3����Q�4��GS�֬!���2�3n�ө'�޾r�T�dc������3J�%����B-+^�����C|�.xYB�ǐrv�g)�F ѓ�Tyٍ I��W�yo�`_����M���o��ih�����Cm`�C�A� ��6���˥����+iĮ�2hN�6a��?����ϩ+� J�^=6r��;Xw�W��H�t�$��ޡ�$���y�/�s젚�Gd�� ]�8?�Zxc��[�C +� b����q�� UQ�Ds��^U� ���\���(��af�7��mw%�~c�̏�7:�{�g=����[��h}V��K���`���违G,�Ӯ���mQ\������+�.�|=nm�j�U�� +������f��v���0����}r�uK��/�4��a�����և��?��(��?�^]��N���h��yw�A;����������?����z���H������,�8� +f9p+&$(^��I<|���'j�h��iz|�tSLK�2�4�O�`�O���ۓ�:��~>���7V�i��� +ݳ�t;����8 ���0p��z���#�,�ƥ��_�>�����i3Eeo +�1�+�k���W�x�i����l��iI �*��zb@3ǡ���_3|.������bi3�:��a6�ї��v��Rz2k���/:&F<E}1�G����Emo�x��=/]�DQ��8HoW�%� 'b� ���Q���7k�W-�'J^�������/���6�۾+���춖�K��M�>���`��'���?�Qe.��k����]Vd�ٌl�~9Q�L�>�t��+Mx���S���a��^�P���_kW��J���H}~�e�Ӷ��>�����|ssi�Iom 6p�����F�J��+��y���߮w��f�ΰ�G��V�����笏�7:�/�������*����6Z%�����vF�!�����sIk:�vVֵ(�_e�a�������6�O�u]*�����XP� +�Vt�Ewv�WW/wr�zk� �}I�֭n2j�E�&�ٜ.����d?��:Т��y����� q����JFIF``��C + + + + +  ��C   + +��9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��G���� +^��C�������R���k�?������>w�f����>>�S��^����U�m�WU� �/�4��*?����O���}���!w�������?� ������?���W�?��_�0�O���'LU��;״|.�+� x5o��$H4� �y +(�X�s�xH_4�u ^%�֋�L�$�I�cF���l�}�t߷'�u�}oC�n4�Z�Y���g��w��pr����1�������L� +��Q^�#�O}�O���� #BRX�$_��~��4��7.���q3pn�\B%w�+�J�������D�9�o ��h�;�9�T�8��]��oj"�u�����1�Gb2��޲��ҽG�-o��-� Y���/.� �2:�� +3���?��ֿK�q����-���a�Z=QO�����(�j��M�5ɷf�2�Ђ}����T���5����W�&�cq��w�݄0��F^Gb��zu'��M|.��!]ǚ� �~��4�Z�>0Ԣ�/��'\�Hb{M�r�ۿ�l�2>8�p8�`g�y�z�_��XyahZ{�S� +�[��ha}�/���$��p̤WEEu{o#����t_x��v��G�V����X�B��ʰ�uw��x�w�r^�?/=ĆGo�I����8E�E\��՜��|\��/�b���[�V���#����� O����JFIF``��C + + + + +  ��C   + +��9,"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6�����N���w����G�"w����������v����NO�.����|+z?�os�_/�4 +^���/H�/�4�������.��������/��%�Ə�D���)}��/�4��ڟ����.ǥ�5Tx���?�M[K}g�V��i@��L�����4��c��x�IU�o�0���.��Nۼ�4�pC,hҕ#�m�O��oۗ����>���W:V�i��� +ݫ�t;���9��gل赇��uv�B(�KV}i᥵�4im��K{ x����%���x��]C�󮭥��Lr>�%��bP7q�+ꦾq�a�}i� +����5�?��O��g1�j��!�'��'�p�忳��< i���7qpx���v��?��������IB\�v}���Ҽg� <%�w�����NF ��A�r3��`f�Oҽ��Z[k��-f��8<��{�d +��C(�~�zW��S+���,f��Ĵ~~g�V��O��2�C���{��|�y.ZՉ<4m +�{�~����u?� :&�cq��w�ՄP��F^F%۠�I�ɯ���K!�_o~�?�~��>���2����M +���@�j 2Sу�'h��� :�X�+�Y��� ��8�~����/x��P�{�V�����I{k9��*������zpk��~�R�Zv�� +�q3�Κ�Bè��ʏ�'�����zl�)��v���+�>(kz/��y�/��M�%L퇓����A5�ы��;�4�ɩYx?�U���0Y�(�����2��U�����������O����z�oo�z +�峷��8�,���p8�(I<���B�G�p��a�=��U�4�1~���Zl�A(�2�]=���ЎR���Ğ�6�/�u�"պ�a�M +� +��y~ڝ���^�}t�z{�ZGo�I����J|�*��s_i���G�b���]-��}���� �����JFIF``��C + + + + +  ��C   + +��`"�� + ���}!1A����  +   + !"#e%&'()*+,-./0123456789:;<=>?@AB����DEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcd�����ghijklmnopqrstuvwxyz{|}~�Qa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�zEm� ���Mz�������"ү�U��^� 8i�G՘~��x[O�� ����; t-�p&UMۇT��9$�~��g��ڑ���&|_�T�AԽ�?6b����'�c��}:X���͜ +��F��~��� �X�!q�]YA-��ZuH�)c�@���h��ѵC��f���-ez`@.��}��;�� +h�o���F��~����6���/�Q�N��@�O���]�7�:���������~>��ѿ#G�=�5��N��@�O���G�!:W�m?�����2��_��������������<��ߑ��/�B4���߅� +?� ��� �O���G���N�����O?�'��=�4y�ѿ#_�_���� +��� �OV�ޑ�� ���]L�C� +uy�ض +?�o�u�����y��>%���#����6o�������\�J���:L��־#Ф[_���o�71���A������]h��yfh���[�T�����z�8����^�#��'*Xh�����_���糲����J�\�W +�9��z�o����м ��mk2�Lj�Rc�a����@�������7����[6G�D(LO��ObG8���b�д�,4�h�,�]���UJ�8��T�+�ʺ�߯o����Jtai�O��e�fG�~+j���ei�Ɨ�agi���ErKs*�N�@Q�sX~Ӟ,�S�A�������H��$Wy��'�fS��t%�<�z��vwVz}��W�:u���[|��`V�6�W FF $zk6��������ÚT�V�e�g���nd2n6�_=wz��֡ʔ�vx��V��D�� � +�k����isi� +�v7�i{'�%gۆ�<O���͂03���s���7.�oh�g�t�D��N�nI;�@gB�Ϸ==ׇt;�j=b�E��U�/d�F�H��g#'�MRoxI������膝��%iH;�b$��Ozq�A+8j���?�N�f���}���g�-�k��{��t� �2_ �ϸT�E�9n $v�7_���Oj���K�d�ף+d�����6s_8���������� $ֲ��t���>IK(���n��ğ��Zl𝵴���cHX%^?�G�:|��aG�ç�i�y���u��k�y[��?������D����ŋ���K�K"�*2��c�v +����ֽ{W�j���AU����!<���p�>�t�f��д�x^&��;X�h����'�S֮����P�-墪(�O�iӟ�R�����homeID4.gif.2� �6�actividad.gif.� =�6�actividad.png$UJ���back.gif*|�St��backID1.gif*��Ft��backID2.gif*��Mt��backID3.gif* ]�Yt��backID4.gif, +�pv���bcornerL.gif, � ����bcornerR.gif* ]b���bullet1.gif* +������bullet2.gif,YOƪ��cornerDL.gif,��ժ��cornerDR.gif. ]s��cornerID3.gif*��t���cornerL.gif*�Si���cornerR.gif*@�t��cornID1.gif,�B�t��cornID1R.gif*���t��cornID2.gif,Y��t��cornID2R.gif*��fs��cornID3.gif,�l�s��cornID3R.gif*-�lt��cornID4.gif,��t��cornID4R.gif._�Or��cursoicon.gif0��}���fondobelow.gif.�����fondoDown.gif,�8�t��fondoID1.gif,Kq�t��fondoID2.gif, _�s��fondoID3.gif,!�Ät��fondoID4.gif("􁨪��fondoL.gif(#/ڰ���fondoR.gif,$+l���fondotit.gif.%Ҏ����fsobretit.gif$&�JP���home.gif*'t4$t��homeID1.gif*(%==t��homeID2.gif*)cQ1t��homeID3.gif4*�5�6�ilustracion1.gif4+q���6�ilustracion2.gif&,(���logos.gif$-�@V���next.gif*.�\ t��nextID1.gif*/gt��nextID2.gif*0��s��nextID3.gif*1��t��nextID4.gif"2R�yo��op1.gif"3�ߟo��op2.gi �����JFIF``��C + + + + +  ��C   + +��!`"�� + ���}!1A15*>����$�25+?����Cu35,@����f�45-A�����iQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�?�G�����D�_οQ�ς�4-9���N� *��fc�+����o�A��abB}�4��8������Y�Ϸ�����j:?=~������}:�-ּ1��6�Ρ�+��a[�$9�tc�"�<#�����t+}A|�Fd, + �0�w^���\�x� +Y��腒JNѨ��� ��}:>�����o�g��Й����M�����/C���º��Z_����`��t~T��?��G�#���u��� ����?���(��~�� z�G��������o���Ώʟ�G�����D�_οU�៼�Bf����������3C��������z��Ώʟ�G�����D�_οU�៼�B^�����5��χz|+,���X�i��"���Q�����o���Ύ�V�Փ��.�8e#�؊��>M^�Q��e���G���;"��Q�,����Gp:���ꭨ\ê[4��NAH���#ֿ;�R٫f�Տ�/íW⮋ss�K�G@���6�1�(Q��E?{8���v�����f�gi�m�9��r�(�c۩��u�su����sj������2�J;y���܀sU!��]�{��\��0 ��W��h�\�L,i�l�}]�� +q����<�o�� xV��A�O����Q���D��-��d���=�_�����4�]K�kP�ח2�\����eY�Uݰ|�u�08��J�����M\�@֌�������%C�� ��zʸ�{�=���^0�]CR�[ +N�#?h�ZFM��D��^��2II�~7뭙���m���oK����A�H&��3�G$��{�3A$�HaGۆr��c��g��'>�N����{��ŕ�ѵ��W��!�1D6�Wvv�� ���� +��ȎlR迯��r~����������]�ois�鳬7(eX��� �3�g<�k3S��t�N��l\�<Փ���qǭU�������&�zl�DB�7Z��ɗ�=�Z���UE`����OB[�v]?��X�3� <6� +\j�\s��2Qv�'�XǏ��#9�2A��N��M�c��n���> �Aq�a{q�36�}$m=����5�^Nct����9�'S�1e�@di6� ��-���>��YQI{7��Y4�Fߴ^�j(������(��(��(��(����ӿ�%e��1QE�� i����JFIF``��C + + + + +  ��C   + +��$`"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�]��(޾��I�>С�\�������ᅝ�����k ��d��C�9��!� +���>���s�5�K��~[(�B<����?z��7����������ӯ�++�THUW˚8�&�YЫ�S���8�����G� +�e����gt��u�����h�>USiJJ�3�kz��7����_�c���(E���?�r����G� +�e���_�� +���?�����2����޾����+�����O� +��e������O� +��e����d�$���G�/���͝��(޾��I���У�\���O�c��(E���?�r��� +���?�?�q̿�?6����z���&��7�Q�B�_�s��*9�c����/�`�Y�0^����Ts/R�;��&�%��`�?�~?�{�����/4�G H74�6�Q�I�_(x�Q�tQ�Zر�tw�smr�!Y p +�8]�g��n�����_u�x +�kv!���@��wlnT��^?�|A�񖞚]��q�H�(�'��Q�H��'-'��\��M�kY��;�9�Xh��׺M�uc���1�wKs���Ū��G�\;���\�nk�y|c�~�x�ŲX�m�r�)�-�q���W��‹_�ڮ�om7�f��Y>qj� F��#�8���ѣ�?��'�˧�W��>���bf�yk��/*�*Wj�n&s��c�/��������ܫ_JUj|R����~ǣ|3��c����$6�h����loX ,f��K��*y8��^������6w����6�z�7Q4� ����de� ��0H�w� �_��:������Ե /j6׆�ݮ灄s[�h#����$P���s��x���k���o��On�"��6 �i�Im|>� �~��Y��,Bq���j��՟ᶚ���ǫ���Y�U�t���>�� G +CF�'�e���a*��\�~?���x�H�N�PMFͬ#$=НLJA��g����cE�5�K�CU�Ҡ��%��ќ���nv"�Qм����=֐�6:�χ#����V�hX��c-�d [��ݐ�˳�=�-�6��mk�Y[�����&I�Ֆ��p�L^8��,$<.6�@1�P����u���[�^��f�i�>����� ״����Xn�湷ǝ r�x��r���z���I��(�N����l���=T���u��v�O�&�y��Y�^��':Gq �2�0� �ּI�4��j�}4���֧s勺;iM�7���6.bh�E�6࣌���2!�U��QE`l;�Z<����<�����QE/���y��E�s���?�P�?�R�%b�H'��};�K!����f"4�եo��op3.gif$5��1r��xop4 �����JFIF``��C + + + + +  ��C   + +������������������������������������������������������������������������������������������������������������������������������������������������$_"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�]��(޾�����_�~�n�]GñCej��qs9��?秩�����)�,�>Ժn�瓋���˖��}��?A��߀5���X��[���z��@a�N0}���~|l�> +����> Z<�'����A��r��C�G�������l/�U�,xbOxn��1Ӣ��~_�����?27c�~?%�^xz��M٣����Z���2n�#ɬA�3��+�2����rzW����z��y-��`��(%=�>��&���J�#w8���x� Fib0�bP�G� +�=H��^G�o�z���������.� +-R�@�)��\[��_�"ȑ|��� +�gx��G��D�Ei਴�����-3����[\#Z@Ϻ^�(]�`�J�����_v��_����Ç��?N(�����H�� ���o pFX�X�($���ܚ��(��(��(��(��[��u��\�Ƣ��.�%O��|�}�8|�C�� ]����JFIF``��C + + + + +  ��C   + +��$_"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�]��(޾��C�[�1|�G�� +{V�pi�1f�]ܒ�O3Ԋ� �����V%���,�O���,�S���G#p=����?�R�˒�%����W�j���9+|���[z��7�����a�/�>:�D��4+k�eX$�I��$�l���󏠮����-�I,^�H�C#��� B�ȫ�����Ӓ���4*\�)�SZz�����}E��W�7�1��"��˟�9G�1��"��˟�9\_�&�%�������e������}E��W�/�1��"��˟�9K� o�����2���Q��a��_����#����G����o_Q_���� +?�P��.����� +?�P��.���&�%��`�?�~?�~m��-}����(�4��^#�*�g-�-<�KJ^7E\�Fs�p��=����[[�sq޽�>�:������˖�����s�S�O�o +Xj �^ꖆ��7�6Cú�m>����>.x��O����ln-��-ͤ��l�:���G}H��/����C����#���V�G��T��I�jƄ)������}NZ6�r:7�P�<=Xզ�%��]Zq�Nj�w�.]j%���-�Qn`%���($����_P~�^6յ�^�u{�k���ER��xr��W��h;3�݃�>���������� +�2��}4l�..��@�-�s���<}����6_ �lm'Ie�ey|���0�k�Ts�bI%�~����L�+��*���[5��/��٭wG���M\*U\�Z���t~%��y��|+� +O��_M�9�9 +�Y�Yy��8�W���`���H�ih����]#A�� �R��n�Ia��'�8���V1�) +�+��G8< �#�{�_X�Z��|;�֎���.a��O�[u��%�)TFVVʜ��כ_|4���&�w�iך�V�_ �;U�!�{�Vխ."��]�Y���a)����� +2J�%����ׯG�j{r�V-�6�[M�:�_C�����=/��,~��n�ОS186pO�jQ�],�On/�L��$�!2�OFa���k�xT���SĚ7��t[R :v��XL�^G�$�6�/���� ���v��3Y~x�ʼnq���t���jv" Z�o �� +�;HM�v*�v�A�bGJM^�_v�����I���� +V-b���n\Z*��!�����'����zM�r6�o�٪}�䀯! +���� g>�����+�i��\jO,��7�A���1_8x�}���$����_o~�˽}�=|h_Y���^�5�.�[�<̣��`���Q^SV�,SU���}==_�z��:�('Oe����{&���h6i�V�Wޟ"p_>[|A� F��n��)�w�'����,�WsY]�`����n0s�_pW��c�e�,d�lBê[&�<2��ϧ�|�i�{[�h�yn���_�ݏo�����ޏ�������Q˩�%x��zu������m[Fy��$�~� +��N��-�r2E�t�_ތ��E�=��ׯ����ԟ�'�ռ�Fk�D�n.���'�v�ie}2 +fp<\�g^��g��]�牴� +F�Une8 �o�Ol��ׅ�y7�����v���nU�X���O�㼗Ğ*K�55�Ʒ?9v��#�?ֽ�>u,<,Jm�����<��Z�/iA�>�����޹c��>K�B�m�ӫ7R}�}��/������<1�@�hR]��l�����0x�N|'ƿi{�����n?����}w<�k���-#���0������+��=c���E���d?��:֢�=�9����6�)Vu*F5槨_i�k +���?f^�����f�(�����*�lbA%��KE`*�K����u�E?f����d���违�E��?�� M����JFIF``��C + + + + +  ��C   + +��95"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6��5>��ꉨ�31�U��'�������L��kw�l�N�3�p��.}�xts7^\�����y�Yڜ/�z@�䞔2�b� +���g�߁|5��(氶cq��l����� d�� (ڴ�2|9�~/xl��\�z�����fG�q���O�L�W�*�������%�^�0����_��扸�K�ZƯ�͕�T$���ɪ?�.��'{���5�<� �����y2��� ^��tW�1xR�JǬ��9��8��Q��O���j��S���`�Z�����PjIfe������v���}3[�}:��p�9T�W�_�K,�זWri��������M�Qv{�o��?�*��ĩyi�X�=��e ��������<��#�a�Z?�����x5(�tE8�%���|k��ڷ��>��ў�n�Uݍڮř��a�����83|O�<ex�Q-w0ͧ�t��IbG�� �ט�_����f�~����enu����7LD�bV��}я��>c���7:���ڎ�t��/n\��7�?��+l^e +�=e���v��������+�+`"Vc�8�{z��IbhsD�b����ǽ����#9�[ W�x�9-n +���OJй���A&a��x�^?����Yi����S�����~Eg�ü#��"�w��(�K���[�4�t�Đ�O��Xvw�ؙ<�%b�!�Ƹ��WbZIL�yg=I�h��?ީ���G�ӱ�R�’VZ�;�����֊�?������΋kx!�%���2���~|�jk�v��t�M^a" /��@9�޶h�X�EZ-���冧'y$ߡ��z�������3��JJ�å�0@�tVn�n�EEYh`}�/��}�/�赿E����0>���Z+~�=������  ����JFIF``��C + + + + +  ��C   + +��95"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdef  +   +���� !"#$%&'()*+����-./0123456789:;<=>?@����BCDEFGHIJKLMNOPQRST����VWXYZ[\]^_`abcdefghijkl����nopqrstuvwxyz{|}~�ghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�6���_j p���g <��@���������:���޹7���X�ӛt=~q���<{���reE�Ϊ�kk��3�(G���-:}BM��}X�h�^V~lr�dN]q���Vc�-�m� tH`@c��;`U+�o��UK.�\�_��*�>m�; �Q_6~���~�'Ю.m�������I���A���������_��N��_�ke�󒺞���OF�65�t��:+�����VoR�I���$Q�����^������o����<,�.��Ӌ{�p�N<����������Ƨ�.��͋iX}��mn����s�k����ټq�3me?��Z�.�[8Ea��b?������9d6���xT3j�k�Ms_u�7�f��o� ���̠��j+�]���bwW8�����y�O�qp�,��W���A�1��G�2=+�:�?�3Cj;��bMy8�0�Rt�lˌ�]��7����\Ӄ�*��w���m!�Hr=��} ��l/��7�fki�u��$��d����||��#�RxOU�]����@���PT�N1���5���g���.�->i�e��=��w�g��`�4��P�� +e�Iڟ)RN~ W�c�*o�Nݔ��},� +�c0���iR��z}���ށk�-5��2�gO�n��R0����"?���8�w��g�z��|i��T��4����2���ڔ��$���21�>Q�H�rڮ��_�:��^%��p|I��W�ɦ[?��y��0���\�|i��Z�z���9/L��>[kU� c����|ksS��kUud���㞽b����X��'���]´�fu�k\1�pB�������G�M��\b��/��}�/����^�}��9k�kw�6�"q���W%�xsX�����c�� �]-��e��Fy�c��q“�y�y>�Erօ,C��F�lR�vg'k���"�OS���i��z-t�WW�{؅�G5�����]-{w�|���952�����06������������,16������������A�26������������U� �����JFIF``��C + + + + +  ��C   + +�� `"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�W��7���n����L�\�D��c���0����j�1��u+��7���0�E��O,�be9(Nl=N��U�񞳤۴ץbu(VH�O������q�<�5Tk��d�5ԏ$����K6s�k�ǖ��4���'m���|1��e�7e����Uɫx�H|y2���H�C�O-yفٹ?q��A�mS�i"��8�=ʹ� �U>}���*��g�v���O�5�ܹ�?\�� ����s�y=k?�Bڨ��:~�.�����,>"׮4�&��7�J�8ފ�TGQ�BAg�T�������st"���Gr�DZ"fd�?�h�����Q]v�T����q������J~����ϧ�u�� �:v�r����MΧ�;ftoJ]i\DO�2c�������k�Ǟ ����ϙ �mX��$|�����ērĞ���Uw��vf��1�淣���ӌ��Ԍj�*��r����>��������w�|���Q� ]�������������n��th���g����/����Y���}��G�&��C�����G�,Mw�����/�"�n�ѹ�������s�=���l���܃�8���/����  ����JFIF``��C + + + + +  ��C   + +�� `"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�/ �:��k4�����cmf���R�����wA|o=��w +���,bB�� �s�f����{�z|�V��S+4�ʼn d0��������ϛ�ĦfD�T��A�_s��#�U��ϗ�Z���G��G��3',�o�����ڭt�>�:LjZv�|{(�D��H�B 1مC������uޫ�H��E�;։#��0��3�(fw�u ɯ�����6z~�����R +Ԝ��5�P�֑��"x_^�y�L��j~$���!2y^k����������#����օnǓElg���,���ԑ������A�~d���P�~���i��߼+ ]H�+oX�eC`@� }p*����(��ۨ�cf�����ϭ-�M{PXU�Q��� ����"'';���R��|�/s#���l��`~C��6�T��J�yl�QVJ������.�s�派�J�˙k)JN���V�����h}a5��cWd�����B� +9*��� +�u��N�R׍Ū?�&13��h���O̭�HV<3|�|E����H3���E��_��v�����֏������� �WCq⦶7�n$VފcX�.3�Lx�cr���w +��$�b�VQE����v%�$h���`-�@�9㜏��έ*���*���}��(H(+]����ly��#����̓G��i +�<�DlP ���Qֺ�O�=o��f���4V�!���v����0q�x��>(��]&-|E�,�A$r�%�b����?�=;zUϊ�=^d���R�}5��yv�$cv�`5�'NO�rX�bw�RRi�mŭӏ���S��ji]>���#�<#ogNJ��RM�4mDZ��S�� ���������q�Y$��� ��"��,B�H9.3��y�zX+��4�Q&��Q�͟�?e)�@��{�8�c����7��[���ªyp��$`���c��W�1��\S��d�<�e)��L�O$��������x�p~ +N�wq���D�I�sG�&<��� +Oƞ���N�J�Gu��*�C�#!�oq�}<-��uy<��$��c�? +��-�׭�K������4QEj@�ȸ��\�H����QR�cM�SÚ�煯���n� +����0*�Q�H �k����m����H����Sg�� +�H �5 +�����]�7��$:�?����֐x�P���{����Yg�ִ�_ץ�_�>���޻ir�\�V�T7�=�P���׿�r���b��+��n�l��ON��������z��R���q��m�RIz���X���W��_�E�5���������F��{?�G�����ί��/�����W������� �����JFIF``��C + + + + +  ��C   + +��"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�zj�I'��|n�N?(���'��� ����"��}���_�Ⱥ��f����h����ίe�� ^����JFIF``��C + + + + +  ��C   + +��`"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�zEm� +�� ��/����獄:���l�3��'8U�d��+�x~�ͤxsKӭ��|�P�[p \d�NO��陞{K.����I���1�uy���:E��EƩ������r#;�8�G�������[��������K[�M�GE,{�1ڼG]��� Z��F�c�6Z����n��Î�Z��5!6��VoK?�ﯞ���חBQN�Gu��⼼�����F��h�o��诛�ϕ���_���?�����/�W_���N��7��<�?���^h�o���F��~���g��Z�ߥ� +<�3�|������7�:����<�?���^h�o���F��~���g��Z�ߥ� +<�3�|������7�:����<�?���^h�o���F��~���g��Z�ߥ� +c��%���ԙ�����$����[4�������������|��,[��kя��d����s��}4�[@�-�A��b��:�gN�x���˭���]4���Q�E�=k�o)?�+縂���{4�.����Tp�kus���i������q�Z��"��s����=�+����^�1I��Er�k��0�0�M���w�G���k�H���}�aP �z7�Ďq��a���Z-�6V6���»R(� +�X��T�:�r��w����+G)х�I>o=�����gU���[[+D[��Z�A�R5y'�w��(�X�|N� ��J4��ՠ�D�[�4�^�jJ��ctD���_E\�K�����N���=�'�ii%p�d`�G�&��>xb�� ��=��u�"���,�\ɸpw��븓���B�T� �ŕ*�n3������ +�X���l�Ѯ���m�_Α�n5)������2�e�ނ.�l��(�A;0�;9 �-�����> �/u��k��mN��v�R\��v*K{c(S��5�Yx'��m�Ak����m $v�#��9�A�jΡo��k%�����\G�aZt��F�ԡ8|N��� s����JFIF``��C + + + + +  ��C   + +��!`"�� + ���}!1AQa"q2���#B��R��$3br� +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz��������������������������������������������������������������������������� + ���w!1AQaq"2�B���� #3R�br� +$4�%�&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz�������������������������������������������������������������������������� ?�?�G�����D�_ξ���/��J�GI�GaF�Q�f=��< �y��Y|)�� 8Ch��G�<������j_������� +�Ώ��������}:�$�7�����X��4;;��g�E�|ю���Eq�G�<��,��=6��@�NĀy3��-/�V|���%d���j/��3��}:>������^���]��� +_�W���WG��8�º��Z_���`T�t~��?��G�#���u�� +����*����Q� +����*����Q�����o�� +�Ώ���G�����D�_ο@?�^���]��� +O�W���WG��8�������`T�t|������h��������| +�B����q��5��TxT�[Gi��أ���(�ݘQ�����o�� +�Ί�6s]F�) ] �:{Z�G'��=CK�l�lb�gq�d:��H=�\u������b� +ޅmy�C+��#�b=k�U �-���m]Y�q�_����]���w���qɷ��T�F^$i�����W�|U�4-+�P][J`�t�UGx�l�TC�1��ږ^���c�iSj��qo{*$����H�@9��:}n�;�^U�x��m�`������G���`�`�Mkd���܈S�5dxΡ���_�\���99��v��+��խ/'6�Z��zTR�cT7�lu5�.���D��_3 +�.�W6��oq=�����]�J�Φ@���pN3�ER���m������;���_m�)E_'��K��#��~��m���9�)��"?-[�\�<�����Z�w�<�v4ț�?e��L�[��o�Yr�Ƿb��ҜV�}�t�%�k���nf7�m1&�٣�F������hRy%1�o9�l�]p���;N�`y����Y�6��S�k�n�y"�~ƣb��?(��r�0?�s�z֙�i ��5-)޾����+�A�ϋ�^���l�mѝ��yr�,N6�L���d +_�go��,E��S��ux��~ε6���8|��*Ҕվg����Q�}E}�� ��������*�.��go��,E��S��u���a��_���?�8��_��o_QF����3���"������?᝾б�O�����a��_����#����G����Q�}E}�� ��������*�.��go��,E��S���?�L7�K��0���2���{z��7����᝾б�O������r��0�7s���T~�I�G�Ɇ�I~��8��_����s�G%�� +�WT����6���|�[yI����w)�O��8�3K/��3g}�-�bC��]�A=��/^��F��E����,�.5 Xaa�"��=��$ +��p���2R\��M�kY��6��u1w���uc�Ե�=0K6�"Z]��|j|����^�?�[E�j��c���M�0�Щ���������#{�N�զr�'� C���#�L�4���5���{-6��K�j1��CCz G����B6��\L���ׅ_ /y=�� +4�v�x:�:R�S╽���{�)�/����<�4��͵���H�VD~��ӌ�7���)���7���[ki�2H�8ۖ��H��\&��[�ZN� ^�4;ۻ]b��m�K� +��8� +L ��4�Y��V��M���hN������c�x>� ���&�<0$��8�ύ�z���~�m��>�q��zэ�u_�K��s�o|L�Z\���*Xbt�!��Y����Xz�����vr2�u}v���C���y^�~_ּ��߳��o��&�il�:*�7�U�����w1yr&Y�q3�x���-k? uԙ-W�CZ�O\��R\[o-�LR'-'��+�P�@N G +CF���M:�L%^��Bߏ�zj���{���ڡ!���#���exs�%�����Y��Ō^d���V���v�c��6Ѿx��Nu��Kq���w�"-��s�-�����҄�� ��ݐ��k�C\��T�W�γ���-�v�v�t�'���\J�D��7���?��������u��k�ԟ��m5׿߱��k�=İEv���titInt.gif,<�����titintro.gif*=&�C��titmeto.gif(>" ���titmod.gif&?��Ȳ��titU1.gif.@:j���upcornerL.gif$A�sr��xop1.gif$Bޚ#r��xop2.gif$C��*r��xop3.gif \ No newline at end of file Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/back.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/back.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backID0.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backID0.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backID1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backID1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backID2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backID2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backID4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backID4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backID5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backID5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs1_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs1_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs2_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs2_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs3_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs3_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs4_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs4_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/backs5_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/backs5_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/bcornerL.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/bcornerL.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/bcornerR.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/bcornerR.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/bullet1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/bullet1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/bullet2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/bullet2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID0.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID0.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID0R.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID0R.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID1R.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID1R.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID2R.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID2R.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID3R.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID3R.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID4R.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID4R.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID5R.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornID5R.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerDL.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerDL.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerDR.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerDR.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerL.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerL.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerR.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cornerR.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/cursoicon.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/cursoicon.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoDown.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoDown.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID0.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID0.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoID5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoL.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoL.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoR.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondoR.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondobelow.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondobelow.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fondotit.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fondotit.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/fsobretit.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/fsobretit.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/home.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/home.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID0.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID0.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/homeID5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/ico1_16.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/ico1_16.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/ico2_16.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/ico2_16.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/ico3_16.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/ico3_16.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/ico4_16.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/ico4_16.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/ico5_16.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/ico5_16.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/imgblue.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/imgblue.png,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/logos.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/logos.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/next.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/next.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID0.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID0.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/nextID5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op005.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op005.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op0_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op0_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op100_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op100_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op1_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op1_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op1m.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op1m.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op2_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op2_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op3_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op3_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op4_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op4_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/op5_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/op5_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/picID1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/picID1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/picID2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/picID2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/picID3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/picID3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/picID4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/picID4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/picID5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/picID5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/separa1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/separa1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/separa2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/separa2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/separa3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/separa3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/separa4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/separa4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/separa5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/separa5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/titInt.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/titInt.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/titU1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/titU1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/titintro.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/titintro.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/titmeto.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/titmeto.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/titmod.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/titmod.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/upcornerL.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/upcornerL.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop005.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop005.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop0_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop0_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop1.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop1_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop1_.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop2.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop3.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop4.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop4.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop5.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop5.gif,v diff -u Binary files differ Index: openacs-4/packages/content-portlet/www/resources/template/imagenes/xop_.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/www/resources/template/imagenes/xop_.gif,v diff -u Binary files differ