Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.123.2.1 -r1.123.2.2 --- openacs-4/packages/dotlrn/dotlrn.info 31 May 2005 23:13:03 -0000 1.123.2.1 +++ openacs-4/packages/dotlrn/dotlrn.info 26 Sep 2005 09:07:00 -0000 1.123.2.2 @@ -7,14 +7,14 @@ f f - + OpenACS A Course Management System - 2004-03-10 + 2005-09-03 OpenACS Course Management - + @@ -69,6 +69,7 @@ + Index: openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml,v diff -u -r1.22.2.3 -r1.22.2.4 --- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 8 Sep 2005 10:00:18 -0000 1.22.2.3 +++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 26 Sep 2005 09:07:00 -0000 1.22.2.4 @@ -286,8 +286,7 @@ Community hinzuf�gen Obige Suchkriterien verkn�pfen mit Obige Suchkriterien verkn�pfen mit - Zu einem Kundenportal -hinzuf�gen/entfernen + Zu einem Kundenportalhinzuf�gen/entfernen Kurse oder Communities hinzuf�gen/entfernen Schl�ssel (kurze Bezeichnung, keine Leerzeichen) Der User hat das System noch nicht besucht @@ -505,8 +504,7 @@ Der Benutzer ist Teilnehmer folgender %subcommunities_pretty_name% Betreff #dotlrn.Subject# Code - Dozent/Lehrbeauftragter - + Dozent/Lehrbeauftragter Dozenten und Lehrbeauftragte Dunkelt�rkis Vorlage Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v diff -u -r1.43.2.3 -r1.43.2.4 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 8 Sep 2005 10:00:18 -0000 1.43.2.3 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 26 Sep 2005 09:07:00 -0000 1.43.2.4 @@ -1,5 +1,5 @@ - + A copy of Access @@ -596,7 +596,7 @@ User Management My Calendar My Files - My Space + Home User User Search User Type Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.191.2.16 -r1.191.2.17 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 22 Sep 2005 02:17:27 -0000 1.191.2.16 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 26 Sep 2005 09:07:00 -0000 1.191.2.17 @@ -198,7 +198,7 @@ ns_set put $extra_vars pretty_name $pretty_name ns_set put $extra_vars pretty_plural $pretty_name ns_set put $extra_vars description $description - ns_set put $extra_vars context_id $package_id + ns_set put $extra_vars context_id $dotlrn_package_id db_transaction { set user_id [ad_conn user_id] Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v diff -u -r1.25.2.1 -r1.25.2.2 --- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 31 May 2005 23:13:05 -0000 1.25.2.1 +++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 26 Sep 2005 09:07:00 -0000 1.25.2.2 @@ -225,8 +225,10 @@ set link [dotlrn_community::get_community_url $community_id] set control_panel_url "$link/$control_panel_name" - # add the my space tab, which isn't part of the class portal but is super useful for the end user - append navbar "
  • #dotlrn.user_portal_page_home_title#
    • " + if { ![parameter::get -parameter hide_personal_portal_p -package_id [dotlrn::get_package_id] -default 0] } { + # add the my space tab, which isn't part of the class portal but is super useful for the end user + append navbar "
  • #dotlrn.user_portal_page_home_title#
    • " + } # figure out what this privs this user has on the community set admin_p [dotlrn::user_can_admin_community_p \ Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/class-term-change.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/class-term-change.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/class-term-change.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/community-types-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-types-chunk-postgresql.xql,v diff -u -r1.1.12.1 -r1.1.12.2 --- openacs-4/packages/dotlrn/www/community-types-chunk-postgresql.xql 13 Jun 2005 07:10:04 -0000 1.1.12.1 +++ openacs-4/packages/dotlrn/www/community-types-chunk-postgresql.xql 26 Sep 2005 09:07:00 -0000 1.1.12.2 @@ -13,7 +13,7 @@ where site_nodes.object_id = dotlrn_community_types.package_id) as url from dotlrn_community_types where dotlrn_community_types.supertype = :community_type - order by dotlrn_community_types.pretty_name + order by dotlrn_community_types.pretty_name, dotlrn_community_types.description Index: openacs-4/packages/dotlrn/www/control-panel.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v diff -u -r1.15.2.1 -r1.15.2.2 --- openacs-4/packages/dotlrn/www/control-panel.adp 31 May 2005 23:13:06 -0000 1.15.2.1 +++ openacs-4/packages/dotlrn/www/control-panel.adp 26 Sep 2005 09:07:00 -0000 1.15.2.2 @@ -24,25 +24,23 @@ <% set dotlrn_url [dotlrn::get_url] %> - - -
    - - - - - - - -
    #dotlrn.lt_Help_and_Personal_Con#
    - - - - - -
    -

    #dotlrn.General_Site_Help#

    + +
    +
    +
    +

    #dotlrn.General_Site_Help#

     +
    +
    -

    #dotlrn.Personal_Options#

    +
    +
    +
    +

    #dotlrn.Personal_Options#

     +
    +
    -
    -
    + +     		- - - - - - - - - - - + +
    #dotlrn.lt_JoinDrop_Classes_or_C#
    +
    +
    +

    #dotlrn.lt_JoinDrop_Classes_or_C#

     +
    +
    -
    -
    Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v diff -u -r1.35.2.1 -r1.35.2.2 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 31 May 2005 23:13:06 -0000 1.35.2.1 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 26 Sep 2005 09:07:00 -0000 1.35.2.2 @@ -83,6 +83,16 @@ set show_navbar_p 0 } +if { [empty_string_p $community_id] && \ + [parameter::get \ + -parameter hide_personal_portal_p \ + -package_id [dotlrn::get_package_id] \ + -default 0] } { + #We're not in a community portal, and we've been asked to + #hide the personal portal. + set show_navbar_p 0 +} + if {![info exists link_all]} { set link_all 0 } @@ -370,7 +380,7 @@ set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { { return_url [ad_return_url] } }] # Curriculum bar -set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $community_id]] +#set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $community_id]] ################################# # CLASS/COMMUNITY-SPECIFIC COLORS Index: openacs-4/packages/dotlrn/www/spam-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v diff -u -r1.16.2.2 -r1.16.2.3 --- openacs-4/packages/dotlrn/www/spam-2.adp 4 Aug 2005 02:26:08 -0000 1.16.2.2 +++ openacs-4/packages/dotlrn/www/spam-2.adp 26 Sep 2005 09:07:00 -0000 1.16.2.3 @@ -18,7 +18,7 @@ @spam_name@ -@context_bar@ +@context;noquote@

    #dotlrn.lt_Are_you_sure_you_want_to_send#? Index: openacs-4/packages/dotlrn/www/spam-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/dotlrn/www/spam-2.tcl 31 May 2005 23:13:06 -0000 1.8.2.1 +++ openacs-4/packages/dotlrn/www/spam-2.tcl 26 Sep 2005 09:07:00 -0000 1.8.2.2 @@ -41,6 +41,6 @@ set preview_message [ad_quotehtml $message] } -set context_bar [list [list $referer Admin] "[_ dotlrn.Spam_Community]"] +set context [list [list $referer Admin] "[_ dotlrn.Spam_Community]"] set community_id [dotlrn_community::get_community_id] set portal_id [dotlrn_community::get_portal_id -community_id $community_id] Index: openacs-4/packages/dotlrn/www/spam-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-oracle.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/dotlrn/www/spam-oracle.xql 13 Jan 2005 13:57:21 -0000 1.5 +++ openacs-4/packages/dotlrn/www/spam-oracle.xql 26 Sep 2005 09:07:00 -0000 1.5.2.1 @@ -9,45 +9,65 @@ '[db_quote $sender_first_names]' as sender_first_names, '[db_quote $sender_last_name]' as sender_last_name, parties.email, - decode(acs_objects.object_type, - 'user', + CASE + WHEN + acs_objects.object_type = 'user' + THEN (select first_names from persons - where person_id = parties.party_id), - 'group', + where person_id = parties.party_id) + WHEN + acs_objects.object_type = 'group' + THEN (select group_name from groups - where group_id = parties.party_id), - 'rel_segment', + where group_id = parties.party_id) + WHEN + acs_objects.object_type = 'rel_segment' + THEN (select segment_name from rel_segments - where segment_id = parties.party_id), - '') as first_names, - decode(acs_objects.object_type, - 'user', + where segment_id = parties.party_id) + ELSE + '' + END as first_names, + CASE + WHEN + acs_objects.object_type = 'user' + THEN (select last_name from persons - where person_id = parties.party_id), - '') as last_name, + where person_id = parties.party_id) + ELSE + '' + END as last_name, '$safe_community_name' as community_name, '$community_url' as community_url from acs_rels, parties, acs_objects where (acs_rels.object_id_one = $community_id and acs_rels.object_id_two = parties.party_id - and (acs_rels.rel_type in ($rel_types_str) - or acs_rels.object_id_two in ($recipients_str)) - and parties.party_id = acs_objects.object_id + and parties.party_id = acs_objects.object_id and parties.party_id in (select acs_rels.object_id_two from acs_rels, membership_rels - where acs_rels.object_id_one = - acs.magic_object_id('registered_users') - and acs_rels.rel_id = - membership_rels.rel_id - and membership_rels.member_state - = 'approved')) + where acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'approved' )) + $who_will_receive_this_clause + + + and parties.party_id in ($recipients_str) + + + + + + and acs_rels.rel_type in ($rel_types_str) + + + Index: openacs-4/packages/dotlrn/www/spam.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.adp,v diff -u -r1.21.2.1 -r1.21.2.2 --- openacs-4/packages/dotlrn/www/spam.adp 4 Aug 2005 02:26:08 -0000 1.21.2.1 +++ openacs-4/packages/dotlrn/www/spam.adp 26 Sep 2005 09:07:00 -0000 1.21.2.2 @@ -20,7 +20,7 @@ @spam_name@ -@context_bar@ +@context;noquote@ Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -r1.24.2.1 -r1.24.2.2 --- openacs-4/packages/dotlrn/www/spam.tcl 31 May 2005 23:13:06 -0000 1.24.2.1 +++ openacs-4/packages/dotlrn/www/spam.tcl 26 Sep 2005 09:07:00 -0000 1.24.2.2 @@ -73,13 +73,13 @@ } } } -properties { - context_bar:onevalue + context:onevalue portal_id:onevalue } set spam_name [bulk_mail::parameter -parameter PrettyName -default [_ dotlrn.Spam_]] -set context_bar [list [list $referer [_ dotlrn.Admin]] "$spam_name [_ dotlrn.Community]"] +set context [list [list $referer [_ dotlrn.Admin]] "$spam_name [_ dotlrn.Community]"] if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/admin/class-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.tcl,v diff -u -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/dotlrn/www/admin/class-new.tcl 31 May 2005 23:13:07 -0000 1.17.2.1 +++ openacs-4/packages/dotlrn/www/admin/class-new.tcl 26 Sep 2005 09:07:00 -0000 1.17.2.2 @@ -76,6 +76,11 @@ form get_values add_class \ department_key pretty_name description referer subject_key + # If we do not provide a special subject_key make use of the pretty_name instead + if {[empty_string_p $subject_key]} { + set subject_key $department_key.[dotlrn::generate_key -name $pretty_name] + } + set class_key [dotlrn_class::new \ -class_key $subject_key \ -department_key $department_key \ Index: openacs-4/packages/dotlrn/www/admin/department.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v diff -u -r1.13 -r1.13.8.1 --- openacs-4/packages/dotlrn/www/admin/department.adp 11 Dec 2002 13:53:51 -0000 1.13 +++ openacs-4/packages/dotlrn/www/admin/department.adp 26 Sep 2005 09:07:00 -0000 1.13.8.1 @@ -55,4 +55,4 @@
    - + Index: openacs-4/packages/dotlrn/www/admin/department.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/dotlrn/www/admin/department.tcl 31 May 2005 23:13:07 -0000 1.14.2.1 +++ openacs-4/packages/dotlrn/www/admin/department.tcl 26 Sep 2005 09:07:00 -0000 1.14.2.2 @@ -23,6 +23,7 @@ @version $Id$ } -query { {department_key ""} + {page ""} } -properties { pretty_name:onevalue external_url:onevalue Index: openacs-4/packages/dotlrn/www/admin/password-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/password-update.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/dotlrn/www/admin/password-update.tcl 31 May 2005 23:13:07 -0000 1.3.2.1 +++ openacs-4/packages/dotlrn/www/admin/password-update.tcl 26 Sep 2005 09:07:00 -0000 1.3.2.2 @@ -7,7 +7,13 @@ {user_id:integer} {return_url ""} {password_old ""} -} +} -validate { + dotlrn_cannot_become_wide_admin { + if { [acs_user::site_wide_admin_p -user_id $user_id] && ![acs_user::site_wide_admin_p] } { + ad_complain "[_ acs-admin.lt_You_dont_have_permiss]" + } + } +} #Pages in this directory are only runnable by dotlrn-wide admins. dotlrn::require_admin Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 31 May 2005 23:13:07 -0000 1.10.2.1 +++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 26 Sep 2005 09:07:00 -0000 1.10.2.2 @@ -34,8 +34,9 @@ ad_return_forbidden \ "Permission Denied" \ "

    - You don't have permission to see this page. + [_ acs-admin.lt_You_dont_have_permiss]
    " + return } if {[string equal $value "grant"] == 1} { Index: openacs-4/packages/dotlrn/www/admin/user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v diff -u -r1.29 -r1.29.2.1 --- openacs-4/packages/dotlrn/www/admin/user.adp 13 Jan 2005 13:57:22 -0000 1.29 +++ openacs-4/packages/dotlrn/www/admin/user.adp 26 Sep 2005 09:07:00 -0000 1.29.2.1 @@ -187,14 +187,16 @@

    +

    #dotlrn.lt_Administrative_Action#

    +     Index: openacs-4/packages/dotlrn/www/admin/user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v diff -u -r1.19.2.1 -r1.19.2.2 --- openacs-4/packages/dotlrn/www/admin/user.tcl 31 May 2005 23:13:07 -0000 1.19.2.1 +++ openacs-4/packages/dotlrn/www/admin/user.tcl 26 Sep 2005 09:07:00 -0000 1.19.2.2 @@ -95,6 +95,11 @@ set dotlrn_admin_p [dotlrn::admin_p] +set administrative_action_p 0 +if { ($oacs_site_wide_admin_p && $site_wide_admin_p) || (!$site_wide_admin_p && ($oacs_site_wide_admin_p || $dotlrn_admin_p))} { + set administrative_action_p 1 +} + set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"] set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url] Index: openacs-4/packages/dotlrn/www/resources/dotlrn-master.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/resources/dotlrn-master.css,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/dotlrn/www/resources/dotlrn-master.css 31 May 2005 23:13:08 -0000 1.4.2.1 +++ openacs-4/packages/dotlrn/www/resources/dotlrn-master.css 26 Sep 2005 09:07:00 -0000 1.4.2.2 @@ -485,12 +485,15 @@ .system-name { display: none; -} #site-header { background-color: white; } +#site-header .user-greeting { + color: #036; +} + #site-header .action-list a { color: #036; border: 0; Index: openacs-4/packages/file-storage/file-storage.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v diff -u -r1.38.2.4 -r1.38.2.5 --- openacs-4/packages/file-storage/file-storage.info 25 Aug 2005 18:44:46 -0000 1.38.2.4 +++ openacs-4/packages/file-storage/file-storage.info 26 Sep 2005 09:00:18 -0000 1.38.2.5 @@ -45,6 +45,5 @@ - Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/catalog/file-storage.en_AU.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/catalog/file-storage.es_CO.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml 13 Jan 2005 13:58:09 -0000 1.16 +++ openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml 26 Sep 2005 09:00:18 -0000 1.16.2.1 @@ -1,6 +1,11 @@ - + + Archivo + Archivo + Archivo + Archivo + Revisi�n Opciones Opciones: Opciones @@ -10,7 +15,11 @@ <a href="%folder_view_url%">Volver</a> a la vista por carpetas bytes Renombrar + Cambiar l�mite de carga de archivos + Seleccionar folder destino + Configurar L�mite de carga de archivos Copiar + Copiar Archivo Crear Crear una carpeta Crear un enlace @@ -19,6 +28,7 @@ d�as. Borrar borrar + Borrar Archivo Esto eliminara %folder_name% y %child_count% archivos y carpetas. Desea continuar? Borrar esta carpeta Borrar versi�n @@ -29,13 +39,16 @@ Editar URL Archivo Eliminar %title% + Archivo borrado Renombrar %title% Modificar %pretty_name% T�tulo: %title% Due�o: %owner% + Folder Carpeta Esta carpeta esta disponible v�a WebDAV en %webdav_url% Eliminar %folder_name% + Folder borrado Identificador de carpeta Nombre de carpeta: carpeta @@ -59,15 +72,21 @@ �Desea borrar los archivos listados? Descargar un archivo con los contenidos de esta carpeta O ya existe una carpeta con el nombre "%folder_name%", o ha pulsado el bot�n m�s de una vez. Utilice el bot�n Atr�s de su navegador y elija otro nombre, o <a href="%directory_url%">vuelva al listado</a> para comprobar la carpeta. + Folder de File-Storage: %folder_name% + Notificaci�n de File Storage La carpeta %folder_name% est� vac�a. Parece que ya existe un archivo con este nombre en esta carpeta (tambi�n es posible que haya pulsado varias veces el bot�n). Dejar el t�tulo en blanco cuando subas al servidor m�ltiples documentos referenciados entre s�. Versi�n actual de "%title%" Modificar permisos de este archivo Modificar permisos de esta carpeta Moviendo %allowed_count% archivos. + Nombre de %%action_type: %file_name% + Nueva versi�n del archivo cargada + Nueva Versi�n cargada para el archivo: %file_name% No existen archivos v�lidos para mover. %not_allowed_count% archivos no pueden ser movidos + Notificaci�n para: File-Storage: %action_type% Por favor, introduzca el nuevo nombre del archivo: Seleccione la carpeta que quiere copiar en "%file_name% Seleccione la carpeta donde quiere mover poner "%file_name%" @@ -84,6 +103,8 @@ Esto es un fichero ZIP que contiene m�ltiples ficheros. Pulse "Examinar..." para seleccionar el archivo La versi�n especificada no es v�lida. + Notas de Versi�n: %description% + Ver contenidos del folder: %url_version% Ha ocurrido un error. Por favor, informe al administrador del sistema. Ha ocurrido un error en la base de datos. Es probable que la carpeta seleccionada ya contiene un archivo con este nombre. Lo sentimos, pero no puede borrar carpetas al menos que esten vac�as. @@ -95,15 +116,20 @@ La b�squeda de "%query%" devolvi� los siguientes ficheros: Modificado Mover + Mover Archivo M�ltiples ficheros Nombre nuevo + Nuevo Archivo Cargado Nueva Carpeta + Nuevo URL Cargado Tipo no encontrado URL no encontrada + PDF Permisos propiedades Renombrar + Renombrar Archivo Renombrar esta carpeta Salvar Buscar @@ -123,9 +149,15 @@ Subir Archivo Subir un archivo Subir una nueva versi�n + L�mite de Carga (bytes) + L�mite de carga debe ser mayor a + bytes. Incremente el l�mite de carga en su archivo de configuraci�n de AOLServer. Subir un archivo nuevo Subir una nueva versi�n + Cargar una Revisi�n + Cargado por: %owner% URL: + URL borrado Subir una nueva versi�n de %title% Eliminar %version_name% T�tulo Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/catalog/file-storage.ms_my.utf-8.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v diff -u -r1.48.2.7 -r1.48.2.8 --- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 22 Sep 2005 12:37:34 -0000 1.48.2.7 +++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 26 Sep 2005 09:00:19 -0000 1.48.2.8 @@ -481,7 +481,7 @@ } db_1row select_object_info {} - + if {[string equal folder $type]} { set result [publish_folder_to_file_system -folder_id $object_id -path $path -folder_name $name -user_id $user_id] } elseif {[string equal url $type]} { @@ -509,8 +509,9 @@ set folder_name [get_object_name -object_id $folder_id] } set folder_name [remove_special_file_system_characters -string $folder_name] - - set dir [file join ${path} ${folder_name}] + + set dir "[file join ${path} "${folder_name}"]" + # set dir "[file join ${path} "download"]" file mkdir $dir foreach object [get_folder_contents -folder_id $folder_id -user_id $user_id] { @@ -567,6 +568,8 @@ db_1row select_object_metadata {} + # After upgrade change title and filename... + set file_name $title if {[empty_string_p $file_name]} { if {![info exists upload_file_name]} { set file_name "unnamedfile" Index: openacs-4/packages/file-storage/www/file-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v diff -u -r1.12.2.4 -r1.12.2.5 --- openacs-4/packages/file-storage/www/file-add.tcl 29 Aug 2005 18:40:17 -0000 1.12.2.4 +++ openacs-4/packages/file-storage/www/file-add.tcl 26 Sep 2005 09:00:19 -0000 1.12.2.5 @@ -226,7 +226,7 @@ fs::add_version \ -name $filename \ -tmp_filename [template::util::file::get_property tmp_filename $upload_file] \ - -item_id $file_id \ + -item_id $file_id \ -creation_user $user_id \ -creation_ip [ad_conn peeraddr] \ -title $this_title \ Index: openacs-4/packages/file-storage/www/folder-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v diff -u -r1.31.2.9 -r1.31.2.10 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 17 Sep 2005 13:17:13 -0000 1.31.2.9 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 26 Sep 2005 09:00:19 -0000 1.31.2.10 @@ -50,12 +50,12 @@ set content_size_total 0 -if {![exists_and_not_null format]} { - set format table -} - +#AG: We're an include file, and we may be included from outside file-storage. +#So we need to query for the package_id rather than getting it from ad_conn. +set package_and_root [fs::get_folder_package_and_root $folder_id] +set package_id [lindex $package_and_root 0] if {![exists_and_not_null root_folder_id]} { - set root_folder_id [fs::get_root_folder] + set root_folder_id [lindex $package_and_root 1] } if {![string equal $root_folder_id $folder_id]} { @@ -69,14 +69,12 @@ # for now, invite users to upload, and then they will be asked to # login if they are not. -if {$write_p} { - lappend actions "\#file-storage.Add_File\#" ${fs_url}file-add?[export_vars folder_id] "Upload a file in this folder" "\#file-storage.Create_a_URL\#" ${fs_url}simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" ${fs_url}folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#" -} +lappend actions "\#file-storage.Add_File\#" ${fs_url}file-add?[export_vars folder_id] "Upload a file in this folder" "\#file-storage.Create_a_URL\#" ${fs_url}simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" ${fs_url}folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#" -set expose_rss_p [parameter::get -parameter ExposeRssP -default 0] +set expose_rss_p [parameter::get -parameter ExposeRssP -package_id $package_id -default 0] set like_filesystem_p [parameter::get -parameter BehaveLikeFilesystemP -default 1] -set target_window_name [parameter::get -parameter DownloadTargetWindowName -default ""] +set target_window_name [parameter::get -parameter DownloadTargetWindowName -package_id $package_id -default ""] if { [string equal $target_window_name ""] } { set target_attr "" } else { @@ -145,7 +143,6 @@ set actions {} } - template::list::create \ -name contents \ -multirow contents \ @@ -182,7 +179,7 @@ db_multirow -extend {label icon last_modified_pretty content_size_pretty properties_link properties_url download_url new_version_link new_version_url} contents select_folder_contents {} { set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi] - set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x "] + set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"] if {[string equal $type "folder"]} { set content_size_pretty [lc_numeric $content_size] append content_size_pretty " [_ file-storage.items]" @@ -254,4 +251,8 @@ set content_size_total 0 } +if { $expose_rss_p } { + db_multirow feeds select_subscrs {} +} + ad_return_template Index: openacs-4/packages/file-storage/www/view/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/view/index-oracle.xql,v diff -u -r1.1 -r1.1.8.1 --- openacs-4/packages/file-storage/www/view/index-oracle.xql 7 Jul 2003 12:37:39 -0000 1.1 +++ openacs-4/packages/file-storage/www/view/index-oracle.xql 26 Sep 2005 09:00:19 -0000 1.1.8.1 @@ -11,5 +11,24 @@ + + + + select i.item_id + from cr_revisions r, cr_items i + where r.item_id = i.item_id + and r.title = :item_url_title + and i.parent_id in (select item_id + from cr_items + where name = :item_url_folder + and parent_id in (select item_id + from cr_items + where name = :item_url_parent_folder)) + and rownum = 1 + order by revision_id desc + + + + Index: openacs-4/packages/file-storage/www/view/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/view/index-postgresql.xql,v diff -u -r1.1 -r1.1.8.1 --- openacs-4/packages/file-storage/www/view/index-postgresql.xql 7 Jul 2003 12:37:39 -0000 1.1 +++ openacs-4/packages/file-storage/www/view/index-postgresql.xql 26 Sep 2005 09:00:19 -0000 1.1.8.1 @@ -11,5 +11,24 @@ + + + +select i.item_id + from cr_revisions r, cr_items i + where r.item_id = i.item_id + and r.title = :item_url_title + and i.parent_id in (select item_id + from cr_items + where name = :item_url_folder + and parent_id in (select item_id + from cr_items + where name = :item_url_parent_folder)) + order by revision_id desc + limit 1 + + + + Index: openacs-4/packages/file-storage/www/view/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/view/index.vuh,v diff -u -r1.1 -r1.1.8.1 --- openacs-4/packages/file-storage/www/view/index.vuh 7 Jul 2003 12:37:39 -0000 1.1 +++ openacs-4/packages/file-storage/www/view/index.vuh 26 Sep 2005 09:00:19 -0000 1.1.8.1 @@ -19,6 +19,9 @@ # Get the IDs set content_root [fs::get_root_folder] set template_root [db_string template_root ""] +set file_id [::content::item::get_id -item_path $the_url \ + -root_folder_id $content_root \ + -resolve_index "f"] # Serve the page @@ -27,17 +30,53 @@ # as though it's been passed by reference. This requires that the redirect treat the # path as an absolute path within the filesystem. -if { [content::init the_url the_root $content_root $template_root public $revision_id $content_type] } { - set file "$the_root/$the_url" - rp_internal_redirect -absolute_path $file +if {[parameter::get -parameter BehaveLikeFilesystemP -default 0]} { + + # Make sure we are not dealing with an upgraded file and there exists a file with the title + if { [string equal "" $file_id] } { + set splitted_url [split $the_url "/"] + set item_url_title [lindex $splitted_url end] + + # THIS CODE ONLY TAKES TWO FOLDERS INTO ACCOUNT. THIS NEEDS TO BE FIXED LATER + set item_url_folder [lindex $splitted_url end-1] + set item_url_parent_folder [lindex $splitted_url end-2] + set file_id [db_string upgraded_item_id {} -default 0] + } + + if {$file_id == 0} { + # ns_returnnotfound + set page "[ad_header {Content Item Not Found}]" + append page "

    Content Item Not Found

    " + append page "The requested item is not available for viewing. " + append page "The item is either not available on this server or it is not in a publishable state " + append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.
    " + append page "[ad_footer]" + doc_return 404 text/html $page + } else { + if {![exists_and_not_null version_id]} { + set version_id [item::get_live_revision $file_id] + } + + set user_id [ad_conn user_id] + + ad_require_permission $version_id "read" + + cr_write_content -revision_id $version_id + } + } else { - # ns_returnnotfound - set page "[ad_header {Content Item Not Found}]" - append page "

    Content Item Not Found

    " - append page "The requested item is not available for viewing. " - append page "The item is either not available on this server or it is not in a publishable state " - append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.
    " - append page "[ad_footer]" - doc_return 200 text/html $page + + if { [content::init the_url the_root $content_root $template_root public $revision_id $content_type] } { + set file "$the_root/$the_url" + rp_internal_redirect -absolute_path $file + } else { + # ns_returnnotfound + set page "[ad_header {Content Item Not Found}]" + append page "

    Content Item Not Found

    " + append page "The requested item is not available for viewing. " + append page "The item is either not available on this server or it is not in a publishable state " + append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.
    " + append page "[ad_footer]" + doc_return 404 text/html $page + } } - Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/catalog/forums.en_AU.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v diff -u -r1.30 -r1.30.2.1 --- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 26 Apr 2005 14:34:37 -0000 1.30 +++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 26 Sep 2005 09:03:13 -0000 1.30.2.1 @@ -1,5 +1,5 @@ - + Administrative options for all forums. Administer @@ -42,6 +42,7 @@ enable enable it enabled + Enter a list of email addresses, optionally with first and last names. They will be subscribed to this forum. As an example: Entire Thread First Post Flat @@ -63,6 +64,7 @@ <b>Open</b> allows any users to post and have posts appear immediately, <b>moderated</b> means posts must be approved by a moderator before others can see them, and <b>closed</b> means only administrators may post. If <b>No</b>, users may only reply to existing posts not create new threads. HTML + If checked, create users that don't exist: Last Post Last post in subject List of users that wrote in the forum: @@ -149,6 +151,8 @@ Statistics Subject Subscribe? + Subscribe others + Number of subscriptions to this forum: Summary Summary of posting history Plain text Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/catalog/forums.es_CO.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 8 Apr 2005 08:28:08 -0000 1.14 +++ openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 26 Sep 2005 09:03:13 -0000 1.14.2.1 @@ -1,5 +1,5 @@ - + Administrar Administraci�n @@ -41,6 +41,7 @@ habilitar habilitar habilitado + Ingrese una lista de correos electr�nicos, si desea agregue nombres y apellidos. Ellos ser�n suscritos autom�ticamente a este foro. Por ejemplo: Hilo completo Primer Mensaje Sin hilos @@ -59,6 +60,7 @@ Reenviar Re-enviar: html + Si se selecciona, se crear�n usuarios que no existen. �ltimo Mensaje �ltimos mensajes del hilo Usuarios que escribieron en el foro: @@ -143,6 +145,8 @@ Estad�sticas T�tulo �Suscribir? + Suscribir a otros + N�mero de suscripciones para este foro: Resumen de mensajes enviados Resumen de mensajes enviados texto Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/catalog/forums.ms_my.utf-8.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_forum_move.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_forum_move.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_message_move-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_message_move-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_message_move.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_message_move.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_thread_move.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/lib/message/choose_thread_move.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/forums/lib/message/threads-chunk.tcl 13 Jan 2005 13:58:15 -0000 1.3 +++ openacs-4/packages/forums/lib/message/threads-chunk.tcl 26 Sep 2005 09:03:13 -0000 1.3.2.1 @@ -30,6 +30,7 @@ if { [template::util::is_true $permissions(admin_p)] } { lappend actions [_ forums.Administer] [export_vars -base "admin/forum-edit" { forum_id {return_url [ad_return_url]}}] {} + lappend actions [_ forums.Subscribe_others] [export_vars -base "admin/subscribe-others" { forum_id {return_url [ad_return_url]}}] {} } if { [template::util::is_true $permissions(moderate_p)] } { @@ -136,3 +137,4 @@ if {[exists_and_not_null alt_template]} { ad_return_template $alt_template } + Index: openacs-4/packages/forums/sql/oracle/forums-forums-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-create.sql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/forums/sql/oracle/forums-forums-create.sql 13 Jan 2005 13:58:15 -0000 1.5 +++ openacs-4/packages/forums/sql/oracle/forums-forums-create.sql 26 Sep 2005 09:03:13 -0000 1.5.2.1 @@ -12,29 +12,21 @@ -- privileges declare begin - -- moderate and post are new privileges - -- the rest are obvious inheritance - -- forum creation on a package allows a user to create forums - -- forum creation on a forum allows a user to create new threads - acs_privilege.create_privilege('forum_create',null,null); - acs_privilege.create_privilege('forum_write',null,null); - acs_privilege.create_privilege('forum_delete',null,null); - acs_privilege.create_privilege('forum_read',null,null); - acs_privilege.create_privilege('forum_post',null,null); - acs_privilege.create_privilege('forum_moderate',null,null); + -- The standard privilege 'admin' on a package allows a user to + -- create forums (enforced by URL). + -- The standard privilege 'create' on a forum allows a user to + -- create new threads. + -- The standard privilege 'write' on a message allows a user to + -- post a follow up message. - -- add children - acs_privilege.add_child('create','forum_create'); - acs_privilege.add_child('write','forum_write'); - acs_privilege.add_child('delete','forum_delete'); + -- forum_moderate lets us grant moderation without granting full admin + acs_privilege.create_privilege('forum_moderate',null,null); acs_privilege.add_child('admin','forum_moderate'); - acs_privilege.add_child('forum_moderate','forum_read'); - acs_privilege.add_child('forum_moderate','forum_post'); - acs_privilege.add_child('forum_write','forum_read'); - acs_privilege.add_child('forum_write','forum_post'); - - -- the last one that will cause all the updates - acs_privilege.add_child('read','forum_read'); + acs_privilege.add_child('forum_moderate','create'); + acs_privilege.add_child('forum_moderate','delete'); + acs_privilege.add_child('forum_moderate','read'); + acs_privilege.add_child('forum_moderate','write'); + end; / show errors Index: openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql 30 Sep 2003 12:10:07 -0000 1.3 +++ openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql 26 Sep 2005 09:03:13 -0000 1.3.8.1 @@ -13,25 +13,16 @@ declare begin - delete from acs_permissions where privilege in ('forum_moderate','forum_post','forum_read','forum_create','forum_write','forum_delete'); + delete from acs_permissions where privilege in ('forum_moderate'); -- remove children - acs_privilege.remove_child('read','forum_read'); - acs_privilege.remove_child('create','forum_create'); - acs_privilege.remove_child('write','forum_write'); - acs_privilege.remove_child('delete','forum_delete'); acs_privilege.remove_child('admin','forum_moderate'); - acs_privilege.remove_child('forum_moderate','forum_read'); - acs_privilege.remove_child('forum_moderate','forum_post'); - acs_privilege.remove_child('forum_write','forum_read'); - acs_privilege.remove_child('forum_write','forum_post'); + acs_privilege.remove_child('forum_moderate','create'); + acs_privilege.remove_child('forum_moderate','delete'); + acs_privilege.remove_child('forum_moderate','read'); + acs_privilege.remove_child('forum_moderate','write'); acs_privilege.drop_privilege('forum_moderate'); - acs_privilege.drop_privilege('forum_post'); - acs_privilege.drop_privilege('forum_read'); - acs_privilege.drop_privilege('forum_create'); - acs_privilege.drop_privilege('forum_write'); - acs_privilege.drop_privilege('forum_delete'); end; / show errors Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/sql/oracle/upgrade/upgrade-1.1.2d4-1.1.2d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql 13 Jan 2005 13:58:15 -0000 1.7 +++ openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql 26 Sep 2005 09:03:14 -0000 1.7.2.1 @@ -11,29 +11,20 @@ -- privileges begin; - -- moderate and post are new privileges - -- the rest are obvious inheritance - -- forum creation on a package allows a user to create forums - -- forum creation on a forum allows a user to create new threads - select acs_privilege__create_privilege('forum_create',null,null); - select acs_privilege__create_privilege('forum_write',null,null); - select acs_privilege__create_privilege('forum_delete',null,null); - select acs_privilege__create_privilege('forum_read',null,null); - select acs_privilege__create_privilege('forum_post',null,null); - select acs_privilege__create_privilege('forum_moderate',null,null); + -- The standard privilege 'admin' on a package allows a user to + -- create forums (enforced by URL). + -- The standard privilege 'create' on a forum allows a user to + -- create new threads. + -- The standard privilege 'write' on a message allows a user to + -- post a follow up message. - -- add children - select acs_privilege__add_child('create','forum_create'); - select acs_privilege__add_child('write','forum_write'); - select acs_privilege__add_child('delete','forum_delete'); + -- forum_moderate lets us grant moderation without granting full admin + select acs_privilege__create_privilege('forum_moderate',null,null); select acs_privilege__add_child('admin','forum_moderate'); - select acs_privilege__add_child('forum_moderate','forum_read'); - select acs_privilege__add_child('forum_moderate','forum_post'); - select acs_privilege__add_child('forum_write','forum_read'); - select acs_privilege__add_child('forum_write','forum_post'); - - -- the last one that will cause all the updates - select acs_privilege__add_child('read','forum_read'); + select acs_privilege__add_child('forum_moderate','create'); + select acs_privilege__add_child('forum_moderate','delete'); + select acs_privilege__add_child('forum_moderate','read'); + select acs_privilege__add_child('forum_moderate','write'); --return null; end; Index: openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql 23 Feb 2003 18:20:31 -0000 1.3 +++ openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql 26 Sep 2005 09:03:14 -0000 1.3.8.1 @@ -13,24 +13,17 @@ create function inline_0 () returns integer as ' begin + + delete from acs_permissions where privilege in (''forum_moderate''); + -- remove children - perform acs_privilege__remove_child(''read'',''forum_read''); - perform acs_privilege__remove_child(''create'',''forum_create''); - perform acs_privilege__remove_child(''write'',''forum_write''); - perform acs_privilege__remove_child(''delete'',''forum_delete''); perform acs_privilege__remove_child(''admin'',''forum_moderate''); - perform acs_privilege__remove_child(''forum_moderate'',''forum_read''); - perform acs_privilege__remove_child(''forum_moderate'',''forum_post''); - perform acs_privilege__remove_child(''forum_write'',''forum_read''); + perform acs_privilege__remove_child(''forum_moderate'',''create''); + perform acs_privilege__remove_child(''forum_moderate'',''delete''); + perform acs_privilege__remove_child(''forum_moderate'',''read''); + perform acs_privilege__remove_child(''forum_moderate'',''write''); - perform acs_privilege__remove_child(''forum_write'',''forum_post''); - perform acs_privilege__drop_privilege(''forum_moderate''); - perform acs_privilege__drop_privilege(''forum_post''); - perform acs_privilege__drop_privilege(''forum_read''); - perform acs_privilege__drop_privilege(''forum_create''); - perform acs_privilege__drop_privilege(''forum_write''); - perform acs_privilege__drop_privilege(''forum_delete''); return null; end;' language 'plpgsql'; Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.1.2d4-1.1.2d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/tcl/forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.tcl,v diff -u -r1.17.2.3 -r1.17.2.4 --- openacs-4/packages/forums/tcl/forums-procs.tcl 19 Jul 2005 21:43:13 -0000 1.17.2.3 +++ openacs-4/packages/forums/tcl/forums-procs.tcl 26 Sep 2005 09:03:14 -0000 1.17.2.4 @@ -84,16 +84,16 @@ } { # JCD: this is potentially bad since we are # just assuming registered_users is the - # right group to be granting forum_write to. + # right group to be granting write to. if {![string equal closed $posting_policy]} { permission::grant -object_id $forum_id \ -party_id [acs_magic_object registered_users] \ - -privilege forum_write + -privilege write } else { permission::revoke -object_id $forum_id \ -party_id [acs_magic_object registered_users] \ - -privilege forum_write + -privilege write } } @@ -108,7 +108,7 @@ # Give the public the right to ask new questions permission::grant -object_id $forum_id \ -party_id $party_id \ - -privilege forum_create + -privilege create util_memoize_flush_regexp $forum_id } @@ -122,7 +122,7 @@ # Revoke the right from the public to ask new questions permission::revoke -object_id $forum_id \ -party_id $party_id \ - -privilege forum_create + -privilege create util_memoize_flush_regexp $forum_id } @@ -135,7 +135,7 @@ } permission::permission_p -object_id $forum_id \ -party_id $party_id \ - -privilege forum_create + -privilege create } ad_proc -public forum::enable { Index: openacs-4/packages/forums/tcl/test/forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/test/forums-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/forums/tcl/test/forums-procs.tcl 13 Jan 2005 13:58:16 -0000 1.2 +++ openacs-4/packages/forums/tcl/test/forums-procs.tcl 26 Sep 2005 09:03:14 -0000 1.2.2.1 @@ -144,3 +144,120 @@ aa_equals "After deletion moderated forum has zero threads" $forum(thread_count) 0 } } + + +aa_register_case -cats {web smoke} web_forum_new { + Testing the creation of a forum via web +} { + +aa_run_with_teardown -test_code { + + tclwebtest::cookies clear + # Login user + array set user_info [twt::user::create -admin] + twt::user::login $user_info(email) $user_info(password) + # Create a new forum + set name [ad_generate_random_string] + set response [forums::twt::new "$name"] + aa_display_result -response $response -explanation {Webtest for the creation of a new Forum} + } + +} + +aa_register_case -cats {web smoke} web_forum_edit { + Testing the edition of an existing forum +} { + + aa_run_with_teardown -test_code { + tclwebtest::cookies clear + # Login user + array set user_info [twt::user::create -admin] + twt::user::login $user_info(email) $user_info(password) + # Create a forum + set name [ad_generate_random_string] + forums::twt::new "$name" + # Edit the created forum + set response [forums::twt::edit "$name"] + aa_display_result -response $response -explanation {Webtest for the edition of a forum} + twt::user::logout + } +} + +aa_register_case -cats {web smoke} web_message_new { + Posting a new message to an existing forum +} { + tclwebtest::cookies clear + # Login user + array set user_info [twt::user::create -admin] + twt::user::login $user_info(email) $user_info(password) + + # Create a forum + set name [ad_generate_random_string] + set subject [ad_generate_random_string] + forums::twt::new "$name" + # Post a message in the created forum + set response [forums::twt::new_post "$name" "$subject"] + aa_display_result -response $response -explanation {Webtest for posting a message in a forum} + twt::user::logout +} + +aa_register_case -cats {web smoke} web_message_edit { + Editing a message of a forum +} { + tclwebtest::cookies clear + # Login user + array set user_info [twt::user::create -admin] + twt::user::login $user_info(email) $user_info(password) + + # Create a forum + set subject [ad_generate_random_string] + set name [ad_generate_random_string] + forums::twt::new "$name" + # Post a message in the created forum + forums::twt::new_post "$name" "$subject" + # Edit the posted message + set response [forums::twt::edit_post "$name" "$subject"] + aa_display_result -response $response -explanation {Webtest for editing the message of a forum} + + twt::user::logout +} + +aa_register_case -cats {web smoke} web_message_reply { + Post a reply a message in the forum +} { + tclwebtest::cookies clear + # Login user + array set user_info [twt::user::create -admin] + twt::user::login $user_info(email) $user_info(password) + + # Create a forum + set subject [ad_generate_random_string] + set name [ad_generate_random_string] + forums::twt::new "$name" + # Post a message in the created forum + forums::twt::new_post "$name" "$subject" + # Edit the posted message + set response [forums::twt::reply_msg "$name" "$subject"] + aa_display_result -response $response -explanation {Webtest for posting a reply to a msg in the forum} + twt::user::logout +} + +aa_register_case -cats {web smoke} web_message_delete { + Delete a message in the forum +} { + tclwebtest::cookies clear + # Login user + array set user_info [twt::user::create -admin] + twt::user::login $user_info(email) $user_info(password) + + # Create a forum + set subject [ad_generate_random_string] + set name [ad_generate_random_string] + forums::twt::new "$name" + # Post a message in the created forum + forums::twt::new_post "$name" "$subject" + # Edit the posted message + set response [forums::twt::delete_post "$name" "$subject"] + aa_display_result -response $response -explanation {Webtest for deleting a message posted in the forum} + twt::user::logout +} Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/tcl/test/tclwebtest-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/www/forum-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v diff -u -r1.29 -r1.29.2.1 --- openacs-4/packages/forums/www/forum-view.adp 29 Mar 2005 15:32:13 -0000 1.29 +++ openacs-4/packages/forums/www/forum-view.adp 26 Sep 2005 09:03:14 -0000 1.29.2.1 @@ -17,4 +17,4 @@

    @notification_chunk;noquote@ -

    \ No newline at end of file +

    Index: openacs-4/packages/forums/www/forum-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v diff -u -r1.26 -r1.26.2.1 --- openacs-4/packages/forums/www/forum-view.tcl 28 Apr 2005 13:32:34 -0000 1.26 +++ openacs-4/packages/forums/www/forum-view.tcl 26 Sep 2005 09:03:14 -0000 1.26.2.1 @@ -66,3 +66,8 @@ set page_title "[_ forums.Forum_1] $forum(name)" set context [list [ad_quotehtml $forum(name)]] + +set type_id [notification::type::get_type_id -short_name forums_forum_notif] +set notification_count [notification::request::request_count \ + -type_id $type_id \ + -object_id $forum_id] \ No newline at end of file Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/admin/subscribe-others-2.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/admin/subscribe-others.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/admin/subscribe-others.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/www/moderate/move-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-oracle.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-oracle.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-oracle.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -18,8 +18,7 @@ select message_id, substr(tree_sortkey, 7, length(tree_sortkey)) as child_tree_sortkey from forums_messages - where forum_id = $message(forum_id) - and tree_sortkey between tree.left('$message(tree_sortkey)') and tree.right ('$message(tree_sortkey)') + where forum_id = $message(forum_id) and tree_sortkey between tree.left('$message(tree_sortkey)') and tree.right ('$message(tree_sortkey)') order by tree_sortkey desc @@ -41,6 +40,6 @@ set forum_id = :forum_id, tree_sortkey = '000000' where message_id = $message(message_id) - + Index: openacs-4/packages/forums/www/moderate/move-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-postgresql.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-postgresql.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-postgresql.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -31,7 +31,7 @@ where forum_id = :forum_id) where forum_id = :forum_id - + Index: openacs-4/packages/forums/www/moderate/move-thread-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-oracle.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread-oracle.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-oracle.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -29,8 +29,7 @@ where message_id = $message(message_id) - - + update forums_messages @@ -52,7 +51,5 @@ where message_id = :message_id - - Index: openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-postgresql.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -28,7 +28,7 @@ from forums_messages where message_id = $message(message_id) - + @@ -50,6 +50,6 @@ ) where message_id = :message_id - + Index: openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-thread-oracle.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -21,7 +21,6 @@ - update forums_messages @@ -31,5 +30,6 @@ where message_id = :message_id + Index: openacs-4/packages/forums/www/moderate/move-thread-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread.tcl 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-thread.tcl 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -54,8 +54,8 @@ db_dml forums::move_thread_thread::update_child_thread_father {} #update the final message: increase reply_count and approved_reply_count db_dml forums::move_thread_thread::update_final_reply_count {} - } - + } + #update the initial message set join_tree_sortkey $father_tree_sortkey append join_tree_sortkey $father_max_child_sortkey Index: openacs-4/packages/forums/www/moderate/move-thread-thread.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread-thread.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -54,13 +54,13 @@ - + update forums_forums - set thread_count = :thread_count - 1, approved_thread_count = :approved_thread_count - 1, last_post = (select max(fm.last_child_post) - from forums_messages fm - where fm.forum_id = $message(forum_id)) + set thread_count = :thread_count - 1, approved_thread_count = :approved_thread_count - 1, last_post = (select max(fm.last_child_post) + from forums_messages fm + where fm.forum_id = $message(forum_id)) where forum_id = $message(forum_id) @@ -69,7 +69,7 @@ update forums_forums - set last_post = (select max(last_child_post) + set last_post = (select max(last_child_post) from forums_messages where forum_id = :forum_id) where forum_id = :forum_id Index: openacs-4/packages/forums/www/moderate/move-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread.tcl 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread.tcl 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -50,7 +50,7 @@ db_0or1row forums::move_thread::get_final_tree_sortkey {} #update the initial father message: decreasing reply_count and approved_reply_count - db_0or1row forums::move_thread::get_father_message_id {} + db_0or1row forums::move_thread::get_father_message_id {} db_dml forums::move_thread::update_father_reply_count {} #get all descendents Index: openacs-4/packages/forums/www/moderate/move-thread.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move-thread.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move-thread.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -12,7 +12,7 @@ - select tree_sortkey as father_tree_sortkey, max_child_sortkey as father_max_child_sortkey + select tree_sortkey as father_tree_sortkey, max_child_sortkey as father_max_child_sortkey from forums_messages where message_id= :message_id Index: openacs-4/packages/forums/www/moderate/move.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/www/moderate/move.xql 8 Apr 2005 08:28:09 -0000 1.1 +++ openacs-4/packages/forums/www/moderate/move.xql 26 Sep 2005 09:03:15 -0000 1.1.4.1 @@ -51,7 +51,6 @@ - update forums_forums @@ -62,5 +61,4 @@ - Index: openacs-4/packages/new-portal/new-portal.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v diff -u -r1.27 -r1.27.2.1 --- openacs-4/packages/new-portal/new-portal.info 24 Feb 2005 13:33:23 -0000 1.27 +++ openacs-4/packages/new-portal/new-portal.info 26 Sep 2005 08:57:37 -0000 1.27.2.1 @@ -8,14 +8,14 @@ t portal - + OpenACS Portals. 2004-03-10 OpenACS New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page. Props to Ian Baker for "Portal". - + Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/catalog/new-portal.en_AU.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/catalog/new-portal.es_CO.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml 13 Jan 2005 13:58:24 -0000 1.10 +++ openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml 26 Sep 2005 08:57:37 -0000 1.10.2.1 @@ -1,5 +1,5 @@ - + A�adir p�gina Direcci�n err�nea: @@ -9,11 +9,14 @@ Cambiar tema: Cambiar tema Crear una p�gina nueva + Customizar Portlets Art deco deco Volver + - Note que los portlets customizados para los templates de portales es algo muy delicado y no muy flexible, de todas formas usted puede agregar portlets customizados en cualquier momento al template, y ser�n agregados a todos los portales relacionados (usuarios, clases, etc.), usted puede editarlos y los cambios tambien ser�n reflejados en los portales. Los portlets customizados para clases y comunidades pueden ser modificados manualmente por el administrador de la clase, pero usted siempre puede sobreescribirlos cuando edita los portlets customizados a trav�s de los templates principales (aqu�). A�adir el portlet aqui Error, �par�metros err�neos! \n Por favor, informe al administrador del sistema de este error. Gracias. + Manejar Portlets Customizados No hay portlets en esta p�gina Ninguno. No puede a�adir portlets a esta p�gina ya que est�n siendo todos utilizados. Volver a la configuraci�n por defecto Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/catalog/new-portal.ms_my.utf-8.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v diff -u -r1.41 -r1.41.2.1 --- openacs-4/packages/new-portal/sql/oracle/api-create.sql 29 Jun 2004 10:18:36 -0000 1.41 +++ openacs-4/packages/new-portal/sql/oracle/api-create.sql 26 Sep 2005 08:57:37 -0000 1.41.2.1 @@ -31,6 +31,7 @@ pretty_name in portal_pages.pretty_name%TYPE default 'Untitled Page', portal_id in portal_pages.portal_id%TYPE, layout_id in portal_pages.layout_id%TYPE default null, + hidden_p in portal_pages.hidden_p%TYPE default 'f', object_type in acs_object_types.object_type%TYPE default 'portal_page', creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, @@ -54,6 +55,7 @@ pretty_name in portal_pages.pretty_name%TYPE default 'Untitled Page', portal_id in portal_pages.portal_id%TYPE, layout_id in portal_pages.layout_id%TYPE default null, + hidden_p in portal_pages.hidden_p%TYPE default 'f', object_type in acs_object_types.object_type%TYPE default 'portal_page', creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, @@ -88,9 +90,9 @@ where portal_id = portal_page.new.portal_id; insert into portal_pages - (page_id, pretty_name, portal_id, layout_id, sort_key) + (page_id, pretty_name, portal_id, layout_id, sort_key, hidden_p) values - (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key); + (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key, hidden_p); return v_page_id; Index: openacs-4/packages/new-portal/sql/oracle/defaults.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/defaults.sql,v diff -u -r1.23 -r1.23.8.1 --- openacs-4/packages/new-portal/sql/oracle/defaults.sql 23 Jun 2003 01:33:24 -0000 1.23 +++ openacs-4/packages/new-portal/sql/oracle/defaults.sql 26 Sep 2005 08:57:37 -0000 1.23.8.1 @@ -92,6 +92,12 @@ filename => 'themes/sloan-theme', resource_dir => 'themes/sloan-theme'); + theme_id := portal_element_theme.new ( + name => 'KELP', + description => 'Knowledge E-Learning Portal', + filename => 'themes/kelp-theme', + resource_dir => 'themes/kelp-theme'); + end; / show errors Index: openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql,v diff -u -r1.45 -r1.45.12.1 --- openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql 9 Aug 2002 20:56:27 -0000 1.45 +++ openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql 26 Sep 2005 08:57:37 -0000 1.45.12.1 @@ -179,6 +179,11 @@ sort_key integer constraint portal_pages_sort_key_nn not null, + hidden_p char(1) default 'f' + constraint portal_pages_hidden_p_nn + not null + constraint portal_pages_hidden_p_ck + check (hidden_p in ('t','f')), -- Two pages on one portal canot have the same sort key constraint portal_pages_sort_key_un unique (portal_id, sort_key) Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/oracle/upgrade/upgrade-2.1.2d1-2.1.2d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/sql/postgresql/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/api-create.sql,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/new-portal/sql/postgresql/api-create.sql 24 Jul 2004 15:24:34 -0000 1.13 +++ openacs-4/packages/new-portal/sql/postgresql/api-create.sql 26 Sep 2005 08:57:37 -0000 1.13.2.1 @@ -23,20 +23,21 @@ -- @version $Id$ -- -select define_function_args('portal_page__new','page_id,pretty_name,portal_id,layout_id,object_type;portal_page,creation_date,creation_user,creation_ip,context_id'); +select define_function_args('portal_page__new','page_id,pretty_name,portal_id,layout_id,hidden_p,object_type;portal_page,creation_date,creation_user,creation_ip,context_id'); -create function portal_page__new (integer,varchar,integer,integer,varchar,timestamptz,integer,varchar,integer) +create function portal_page__new (integer,varchar,integer,integer,char,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_page_id alias for $1; p_pretty_name alias for $2; p_portal_id alias for $3; p_layout_id alias for $4; - p_object_type alias for $5; - p_creation_date alias for $6; - p_creation_user alias for $7; - p_creation_ip alias for $8; - p_context_id alias for $9; + p_hidden_p alias for $5; + p_object_type alias for $6; + p_creation_date alias for $7; + p_creation_user alias for $8; + p_creation_ip alias for $9; + p_context_id alias for $10; v_page_id portal_pages.page_id%TYPE; v_layout_id portal_pages.layout_id%TYPE; v_sort_key portal_pages.sort_key%TYPE; @@ -66,9 +67,9 @@ where portal_id = p_portal_id; insert into portal_pages - (page_id, pretty_name, portal_id, layout_id, sort_key) + (page_id, pretty_name, portal_id, layout_id, sort_key, hidden_p) values - (v_page_id, p_pretty_name, p_portal_id, v_layout_id, v_sort_key); + (v_page_id, p_pretty_name, p_portal_id, v_layout_id, v_sort_key, p_hidden_p); return v_page_id; @@ -195,6 +196,7 @@ p_default_page_name, v_portal_id, v_layout_id, + ''f'', ''portal_page'', p_creation_date, p_creation_user, @@ -228,6 +230,7 @@ v_page.pretty_name, v_portal_id, v_page.layout_id, + ''f'', ''portal_page'', p_creation_date, p_creation_user, Index: openacs-4/packages/new-portal/sql/postgresql/portal-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/portal-core-create.sql,v diff -u -r1.4 -r1.4.12.1 --- openacs-4/packages/new-portal/sql/postgresql/portal-core-create.sql 9 Aug 2002 20:56:28 -0000 1.4 +++ openacs-4/packages/new-portal/sql/postgresql/portal-core-create.sql 26 Sep 2005 08:57:37 -0000 1.4.12.1 @@ -185,6 +185,11 @@ sort_key integer constraint portal_pages_sort_key_nn not null, + hidden_p char(1) + default 'f' + constraint portal_pages_hidden_p_nn + not null + check (hidden_p in ('t','f')), constraint portal_pages_srt_key_un unique (portal_id, sort_key) ); Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/postgresql/upgrade/upgrade-2.1.2d1-2.1.2d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql,v diff -u -r1.9 -r1.9.12.1 --- openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql 21 Aug 2002 15:22:39 -0000 1.9 +++ openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql 26 Sep 2005 08:57:38 -0000 1.9.12.1 @@ -125,6 +125,7 @@ :pretty_name, :portal_id, :layout_id, + 'f', 'portal_page', now(), null, Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.178 -r1.178.2.1 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 11 May 2005 13:59:44 -0000 1.178 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 26 Sep 2005 08:57:38 -0000 1.178.2.1 @@ -446,9 +446,14 @@ set first_page_p [portal::first_page_p -portal_id $portal_id -page_id $page_id] # We allow portal page names to have embedded message keys that we localize on the fly - set page_name [lang::util::localize [portal::get_page_pretty_name -page_id $page_id]] + db_1row get_page_info {} + set page_name [lang::util::localize $pretty_name_unlocalized] set page_layout_id [portal::get_layout_id -page_id $page_id] - + if { [string equal $hidden_p t] } { + set tab_toggle_label [lang::util::localize "\#new-portal.Show_in_main_navigation\#"] + } else { + set tab_toggle_label [lang::util::localize "\#new-portal.Hide_in_main_navigation\#"] + } append template "" # @@ -464,8 +469,15 @@ - - + + + + + + + + + " append template "$page_name_chunk" @@ -819,6 +831,9 @@ ad_return_complaint 1 "[_ new-portal.lt_You_must_enter_new_na]" } set_page_pretty_name -pretty_name $pretty_name -page_id $page_id + } elseif { ![empty_string_p [ns_set get $form "op_toggle_tab_visibility"]] } { + set page_id [ns_set get $form page_id] + db_dml toggle_tab_visibility {} } elseif { ![empty_string_p [ns_set get $form "op_toggle_pinned"]] } { set element_id [ns_set get $form element_id] Index: openacs-4/packages/new-portal/tcl/portal-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v diff -u -r1.44 -r1.44.2.1 --- openacs-4/packages/new-portal/tcl/portal-procs.xql 13 Jan 2005 13:58:25 -0000 1.44 +++ openacs-4/packages/new-portal/tcl/portal-procs.xql 26 Sep 2005 08:57:38 -0000 1.44.2.1 @@ -80,6 +80,15 @@ + + + select pretty_name as pretty_name_unlocalized, + hidden_p + from portal_pages + where page_id = :page_id + + + select portals.name, @@ -254,6 +263,14 @@ + + + update portal_pages + set hidden_p = case when hidden_p = 't' then 'f' else 't' end + where page_id = :page_id + + + update portal_element_map Index: openacs-4/packages/new-portal/www/layouts/simple2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple2.adp,v diff -u -r1.11 -r1.11.12.1 --- openacs-4/packages/new-portal/www/layouts/simple2.adp 9 Aug 2002 20:56:30 -0000 1.11 +++ openacs-4/packages/new-portal/www/layouts/simple2.adp 26 Sep 2005 08:57:38 -0000 1.11.12.1 @@ -22,7 +22,7 @@
    \"\"
    - - Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/www/themes/kelp-theme/install-kelp.sh'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/www/themes/kelp-theme/resources/folder.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/resources/folder.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ
    + + @name;noquote@ - @name@ + @name;noquote@