Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml,v diff -u -r1.2.2.4 -r1.2.2.5 --- openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:10 -0000 1.2.2.4 +++ openacs-4/packages/acs-authentication/catalog/acs-authentication.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:08 -0000 1.2.2.5 @@ -1,5 +1,5 @@ - + Benutzeridentifikation oder Passwort ist falsch Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml,v diff -u -r1.5.2.4 -r1.5.2.5 --- openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:10 -0000 1.5.2.4 +++ openacs-4/packages/acs-authentication/catalog/acs-authentication.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:08 -0000 1.5.2.5 @@ -1,5 +1,5 @@ - + Invalid username or password Index: openacs-4/packages/acs-content-repository/acs-content-repository.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v diff -u -r1.56.2.27 -r1.56.2.28 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 20 Nov 2006 20:00:10 -0000 1.56.2.27 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 22 Nov 2006 10:03:08 -0000 1.56.2.28 @@ -6,18 +6,20 @@ Content Repository Services t t - + OpenACS + The canonical repository for OpenACS content. 2006-05-25 + 3 OpenACS + GPL + 3 Provides the API for creating and managing user generated content including full support for versioning, rendering content to the filesystem, folders and composite content items, and other CMS backing functionality. Utilized by Bug Tracker, File Storage, and other packages. - GPL - 3 @@ -27,9 +29,8 @@ - - + Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.4d4-5.1.4d5.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.4d4-5.1.4d5.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.4d4-5.1.4d5.sql 20 Nov 2006 20:00:11 -0000 1.3.2.1 +++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.4d4-5.1.4d5.sql 22 Nov 2006 10:03:08 -0000 1.3.2.2 @@ -101,7 +101,7 @@ -- procedure delete select define_function_args('content_revision__del','revision_id'); -create or replace function content_revision__del (integer) +create or replace function content_revision__delete (integer) returns integer as ' declare delete__revision_id alias for $1; Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v diff -u -r1.21.2.6 -r1.21.2.7 --- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 20 Nov 2006 20:00:11 -0000 1.21.2.6 +++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 22 Nov 2006 10:03:08 -0000 1.21.2.7 @@ -89,12 +89,7 @@ ns_set put [ns_conn outputheaders] "Content-Length" 0 ns_return 200 text/plain {} } else { - set backgroundDelivery_p [ad_parameter -package_id [apm_package_id_from_key acs-content-repository] UseBackgroundDeliveryP files 0] - if {$backgroundDelivery_p} { - ad_returnfile_background 200 $mime_type $filename - } else { - ns_returnfile 200 $mime_type $filename - } + ns_returnfile 200 $mime_type $filename } } } Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v diff -u -r1.21.2.2 -r1.21.2.3 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 20 Nov 2006 20:00:11 -0000 1.21.2.2 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 22 Nov 2006 10:03:09 -0000 1.21.2.3 @@ -846,7 +846,7 @@ is [dt_ansi_to_pretty]
-
Date as YYYYMMDD +
Date as YYYYMMDD " Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml,v diff -u -r1.14.2.10 -r1.14.2.11 --- openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:11 -0000 1.14.2.10 +++ openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:09 -0000 1.14.2.11 @@ -1,5 +1,5 @@ - + Administrator Administratoren Index: openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml,v diff -u -r1.19.2.5 -r1.19.2.6 --- openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:12 -0000 1.19.2.5 +++ openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:09 -0000 1.19.2.6 @@ -1,5 +1,5 @@ - + Deutsche Version verf�gbar Sprache wechseln Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v diff -u -r1.22.2.5 -r1.22.2.6 --- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:12 -0000 1.22.2.5 +++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:09 -0000 1.22.2.6 @@ -1,5 +1,5 @@ - + Available in English The language referred to in the message body should be the language of the locale, not a localized version of "English". Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v diff -u -r1.45.2.2 -r1.45.2.3 --- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 20 Nov 2006 20:00:12 -0000 1.45.2.2 +++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 22 Nov 2006 10:03:09 -0000 1.45.2.3 @@ -764,7 +764,7 @@ if { [message_exists_p $locale $key] } { set message [nsv_get lang_message_$locale $key] } else { - ns_log Error "lang::message::lookup: Key '$key' does not exist in en_US\nUser_id [ad_conn user_id]\n[ad_url][util_get_current_url]" + ns_log Error "lang::message::lookup: Key '$key' does not exist in en_US" set message "MESSAGE KEY MISSING: '$key'" } } Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 20 Nov 2006 20:00:12 -0000 1.7.2.2 +++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 22 Nov 2006 10:03:09 -0000 1.7.2.3 @@ -58,8 +58,6 @@ # processing of the form element create message_new locale -label "locale" -datatype text -widget hidden -set focus "" - if { [form is_request message_new] } { element set_value message_new package_key $package_key Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml,v diff -u -r1.23.2.8 -r1.23.2.9 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:12 -0000 1.23.2.8 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:09 -0000 1.23.2.9 @@ -1,5 +1,5 @@ - + oder Die Allgemeinen Informationen aktualisieren @@ -196,7 +196,7 @@ H�here Rechte schlie�en niedrigere Rechte mit ein. Wenn Sie etwa Verwaltungsrechte erteilen, werden automatisch auch Lese- und Schreibrechte gew�hrt. Es ist ein Authentifizierungsproblem aufgetreten. Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet. - Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet. + Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet. Ihr Registrierungsantrag wurde an den Administrator von %system_name% �bermittelt. Sie wurden noch nicht freigeschaltet. E-Mail-Adresse und Passwort werden gespeichert. Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v diff -u -r1.67.2.15 -r1.67.2.16 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:12 -0000 1.67.2.15 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:09 -0000 1.67.2.16 @@ -1,5 +1,5 @@ - + , or Update Basic Information @@ -275,14 +275,14 @@ This user doesn't have a portrait yet. You can This user is deleted and banned from the community. To confirm your registration, please go to %confirmation_url% - Upload your favorite file, a scanned JPEG or GIF, from your desktop -computer system (note that you can't refer to an image elsewhere on + Upload your favorite file, a scanned JPEG or GIF, from your desktop +computer system (note that you can't refer to an image elsewhere on the Internet; this image must be on your computer's hard drive). Uploaded: %pretty_date% Uploaded: %publish_date% Use the "Browse..." button to locate your file, then click "Open". This user has a entered a biography or uploaded a portrait - We can't find you (user %user_id%) in the users table. Probably your + We can't find you (user %user_id%) in the users table. Probably your account was deleted for some reason. We had a problem processing your entry. We were not awaiting your email. There must be some mistake. @@ -422,7 +422,7 @@ This group is closed. New members can only get access by invitation. this subsite This user has left the community. - Please check your inbox. Within the next few minutes, you should find a message from %system_owner% with instructions on + Please check your inbox. Within the next few minutes, you should find a message from %system_owner% with instructions on Topic type-specific info Index: openacs-4/packages/acs-subsite/lib/login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v diff -u -r1.24.2.5 -r1.24.2.6 --- openacs-4/packages/acs-subsite/lib/login.tcl 20 Nov 2006 20:00:12 -0000 1.24.2.5 +++ openacs-4/packages/acs-subsite/lib/login.tcl 22 Nov 2006 10:03:10 -0000 1.24.2.6 @@ -14,8 +14,6 @@ security::require_secure_conn } -set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]" - set self_registration [parameter::get_from_package_key \ -package_key acs-authentication \ -parameter AllowSelfRegister \ Index: openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql 20 Nov 2006 20:00:12 -0000 1.4.2.1 +++ openacs-4/packages/acs-subsite/www/permissions/perm-include-postgresql.xql 22 Nov 2006 10:03:10 -0000 1.4.2.2 @@ -57,11 +57,7 @@ ) ptab, acs_objects o where o.object_id = ptab.grantee_id - and not exists (select 1 - from acs_object_party_privilege_map m - where m.object_id = acs__magic_object_id('security_context_root') - and m.party_id = ptab.grantee_id - and m.privilege = 'admin') + and not exists (select 1 from acs_object_party_privilege_map p where p.object_id = acs__magic_object_id('security_context_root') and p.party_id = ptab.grantee_id and p.privilege = 'admin') group by ptab.grantee_id, grantee_name, object_type order by object_type desc, grantee_name Index: openacs-4/packages/acs-subsite/www/shared/whos-online.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.tcl,v diff -u -r1.8.6.1 -r1.8.6.2 --- openacs-4/packages/acs-subsite/www/shared/whos-online.tcl 20 Nov 2006 20:00:13 -0000 1.8.6.1 +++ openacs-4/packages/acs-subsite/www/shared/whos-online.tcl 22 Nov 2006 10:03:10 -0000 1.8.6.2 @@ -9,23 +9,22 @@ context:onevalue } -#unima2-kk "Who's online" - acs-subsite.shared_whos_online -set title [_ acs-subsite.shared_whos_online] +set title "Who's Online?" set context [list "Who's Online"] set whos_online_interval [whos_online::interval] template::list::create \ -name online_users \ -multirow online_users \ - -no_data [_ acs-subsite.shared_no_user_online] \ + -no_data "No registered users online" \ -elements { name { - label "#acs-subsite.shared_user_name#" + label "User name" link_url_col url } online_time_pretty { - label "#acs-subsite.shared_online_time#" + label "Online Time" html { align right } } } @@ -40,7 +39,7 @@ lappend users [list \ "$user(first_names) $user(last_name)" \ [acs_community_member_url -user_id $user_id] \ - "$first_request_minutes #acs-subsite.shared_minutes#"] + "$first_request_minutes minutes"] } Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 20 Nov 2006 20:00:13 -0000 1.8.2.1 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 22 Nov 2006 10:03:10 -0000 1.8.2.2 @@ -64,7 +64,7 @@ from acs_rels a, cr_items c where a.object_id_two = c.item_id and a.object_id_one = :user_id -and a.rel_type = 'user_portrait_rel' limit 1"] || [empty_string_p $revision_id]} { +and a.rel_type = 'user_portrait_rel'"] || [empty_string_p $revision_id]} { # The user doesn't have a portrait yet set portrait_p 0 } else { Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml,v diff -u -r1.13.2.10 -r1.13.2.11 --- openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:13 -0000 1.13.2.10 +++ openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:10 -0000 1.13.2.11 @@ -1,5 +1,5 @@ - + Ein Problem Freischalten Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml,v diff -u -r1.17.2.10 -r1.17.2.11 --- openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:13 -0000 1.17.2.10 +++ openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:10 -0000 1.17.2.11 @@ -1,5 +1,5 @@ - + a problem approve Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.74.2.1 -r1.74.2.2 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 20 Nov 2006 20:00:13 -0000 1.74.2.1 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 22 Nov 2006 10:03:10 -0000 1.74.2.2 @@ -1004,11 +1004,10 @@ unmemoized version of apm_package_id_from_key } { return [db_string apm_package_id_from_key { - select package_id from apm_packages where package_key = :package_key + select package_id from apm_packages where package_key = :package_key } -default 0] } - # # package_id -> package_url # Index: openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml,v diff -u -r1.6.2.5 -r1.6.2.6 --- openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:13 -0000 1.6.2.5 +++ openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:10 -0000 1.6.2.6 @@ -1,5 +1,5 @@ - + 12-st�ndig 24-st�ndig Index: openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml,v diff -u -r1.12.2.8 -r1.12.2.9 --- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:13 -0000 1.12.2.8 +++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:11 -0000 1.12.2.9 @@ -1,5 +1,5 @@ - + 12-Hour 24-Hour Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/resources/lists/groups.adp'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/catalog/assessment.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.de_DE.ISO-8859-1.xml,v diff -u -r1.4.2.4 -r1.4.2.5 --- openacs-4/packages/assessment/catalog/assessment.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:14 -0000 1.4.2.4 +++ openacs-4/packages/assessment/catalog/assessment.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:11 -0000 1.4.2.5 @@ -32,7 +32,6 @@ Alle Erlaube Randomisierung Anonyme Antworten - Assessment Genehmigen Aktionen genehmigen Genehmigt @@ -60,10 +59,8 @@ Wieviele Minuten darf der User f�r die Beantwortung des gesamten Assessments ben�tigen. leeres Feld f�r unbefristet. Hilfetext f�r den Titel des Assessments Assessment - Assessment Administration Dies erlaubt es Ihnen, Ihrem Assessment einen speziellen einzigartigen Indentifikator zuzuweisen z.B. einen Code. Titel - Assessments Nach User Zeitliche Verf�gbarkeit �ndern (alle) Zeitliche Verf�gbarkeit �ndern @@ -104,7 +101,6 @@ Ein Assessment/Test: %assessment_data.title% Nur bei korrekten Antworten Nur bei falschen Antworten - Assessment �ffnen Beschreibung ausgef�hrt Zugriffsberechtigungen @@ -118,7 +114,6 @@ Navigation ausw�hlen Abschnitte Secure Access ben�tigt - Sessions Feedback anzeigen Namen der Frage anzeigen Spezifisches Datum Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/assessment-portlet/catalog/assessment-portlet.de_DE.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:14 -0000 1.1.2.4 +++ openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:11 -0000 1.1.2.5 @@ -1,5 +1,5 @@ - + assessment admin There should be only one instance of assessment for admin purpose Index: openacs-4/packages/bm-portlet/catalog/bm-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/catalog/bm-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.13.2.3 -r1.13.2.4 --- openacs-4/packages/bm-portlet/catalog/bm-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:14 -0000 1.13.2.3 +++ openacs-4/packages/bm-portlet/catalog/bm-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:11 -0000 1.13.2.4 @@ -1,5 +1,5 @@ - + Neue %spam_name% verfassen Gruppen-E-Mails Index: openacs-4/packages/bm-portlet/catalog/bm-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/catalog/bm-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.14.2.3 -r1.14.2.4 --- openacs-4/packages/bm-portlet/catalog/bm-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:14 -0000 1.14.2.3 +++ openacs-4/packages/bm-portlet/catalog/bm-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:11 -0000 1.14.2.4 @@ -1,5 +1,5 @@ - + New %spam_name% The text in the link for creating a new bulk mailing. Index: openacs-4/packages/bm-portlet/www/bm-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/www/bm-portlet.adp,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/bm-portlet/www/bm-portlet.adp 20 Nov 2006 20:00:14 -0000 1.4.2.1 +++ openacs-4/packages/bm-portlet/www/bm-portlet.adp 22 Nov 2006 10:03:11 -0000 1.4.2.2 @@ -18,14 +18,7 @@ %> - - - - - #new-portal.when_portlet_shaded# - - Index: openacs-4/packages/calendar/calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v diff -u -r1.31.2.5 -r1.31.2.6 --- openacs-4/packages/calendar/calendar.info 20 Nov 2006 20:00:14 -0000 1.31.2.5 +++ openacs-4/packages/calendar/calendar.info 22 Nov 2006 10:03:12 -0000 1.31.2.6 @@ -13,7 +13,6 @@ 2004-03-04 OpenACS Manage group and shared calendars with download. - 0 @@ -22,15 +21,14 @@ - + + - Index: openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.8 -r1.12.2.9 --- openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:14 -0000 1.12.2.8 +++ openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:12 -0000 1.12.2.9 @@ -5,7 +5,6 @@ Hinzuf�gen Hinzuf�gen Neue Zielgruppe hinzuf�gen - Ganzt�giges Ereignis hinzuf�gen Neuen Eintrag hinzuf�gen Einen Eintrag hinzuf�gen Eintrag hinzuf�gen @@ -46,8 +45,6 @@ Ereignisse innerhalb eines Zeitraums von Freitag von - /resources/acs-subsite/go_de_DE.gif - Gehe zum Datum Gehe zu %months.name% Gehe zum Jahr %next_year% Gehe zum Jahr %prev_year% @@ -88,7 +85,6 @@ You have no party wide calendars Montag Neue Eintragskategorie: - n�chster Tag Next Month Next Year Nein @@ -98,7 +94,6 @@ Hinweis des Monats   - Vortag Previous Month Previous Year Privat: Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v diff -u -r1.26.2.10 -r1.26.2.11 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:14 -0000 1.26.2.10 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:12 -0000 1.26.2.11 @@ -56,7 +56,6 @@ Events over a Friday from - /resources/acs-subsite/go.gif Go to date Go to %months.name% Go to year %next_year% Index: openacs-4/packages/calendar/www/cal-options.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v diff -u -r1.8.6.1 -r1.8.6.2 --- openacs-4/packages/calendar/www/cal-options.adp 20 Nov 2006 20:00:15 -0000 1.8.6.1 +++ openacs-4/packages/calendar/www/cal-options.adp 22 Nov 2006 10:03:12 -0000 1.8.6.2 @@ -1,12 +1,12 @@

+#calendar.Calendars#:

  • @calendars.calendar_name@
    - [ - #calendar-portlet.Manage_Item_Types#] + [Manage Types]
Index: openacs-4/packages/calendar/www/calendar-item-types.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.tcl,v diff -u -r1.3.12.1 -r1.3.12.2 --- openacs-4/packages/calendar/www/calendar-item-types.tcl 20 Nov 2006 20:00:15 -0000 1.3.12.1 +++ openacs-4/packages/calendar/www/calendar-item-types.tcl 22 Nov 2006 10:03:12 -0000 1.3.12.2 @@ -16,3 +16,6 @@ # List the item types and allow addition of a new one set item_types [calendar::get_item_types -calendar_id $calendar_id] set context [list "Item Types"] + + + Index: openacs-4/packages/calendar/www/mini-calendar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v diff -u -r1.16.2.5 -r1.16.2.6 --- openacs-4/packages/calendar/www/mini-calendar.adp 20 Nov 2006 20:00:15 -0000 1.16.2.5 +++ openacs-4/packages/calendar/www/mini-calendar.adp 22 Nov 2006 10:03:12 -0000 1.16.2.6 @@ -115,7 +115,7 @@ - +
#acs-datetime.Date_as_YYYYMMDD# @form_vars;noquote@ Index: openacs-4/packages/calendar/www/mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v diff -u -r1.15.2.2 -r1.15.2.3 --- openacs-4/packages/calendar/www/mini-calendar.tcl 20 Nov 2006 20:00:15 -0000 1.15.2.2 +++ openacs-4/packages/calendar/www/mini-calendar.tcl 22 Nov 2006 10:03:12 -0000 1.15.2.3 @@ -16,7 +16,7 @@ # Determine whether we need to pass on the period_days variable from the list view if {[string equal $view list]} { - if {![exists_and_not_null period_days] || [string equal $period_days [parameter::get -parameter DefaultPeriodDays -default 31]]} { + if {![exists_and_not_null period_days] || [string equal $period_days [parameter::get -parameter ListView_DefaultPeriodDays -default 31]]} { set url_stub_period_days "" } else { set url_stub_period_days "&period_days=${period_days}" Index: openacs-4/packages/calendar/www/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v diff -u -r1.25.2.3 -r1.25.2.4 --- openacs-4/packages/calendar/www/view-list-display.tcl 20 Nov 2006 20:00:15 -0000 1.25.2.3 +++ openacs-4/packages/calendar/www/view-list-display.tcl 22 Nov 2006 10:03:12 -0000 1.25.2.4 @@ -1,13 +1,3 @@ -if { ![info exists period_days] } { - ad_page_contract { - Some documentation. - @author Sven Schmitt (s.lrn@gmx.net) - @cvs-id $Id$ - } { - {period_days:integer {[parameter::get -parameter DefaultPeriodDays -default 31]}} - } -} - if {[info exists url_stub_callback]} { # This parameter is only set if this file is called from .LRN. # This way I make sure that for the time being this adp/tcl @@ -57,7 +47,11 @@ set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] } -set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] +if { ![info exists period_days] } { + set period_days [parameter::get -parameter ListView_DefaultPeriodDays -default 31] +} else { + set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] +} set package_id [ad_conn package_id] set user_id [ad_conn user_id] Index: openacs-4/packages/calendar/www/view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v diff -u -r1.28.6.2 -r1.28.6.3 --- openacs-4/packages/calendar/www/view.adp 20 Nov 2006 20:00:15 -0000 1.28.6.2 +++ openacs-4/packages/calendar/www/view.adp 22 Nov 2006 10:03:12 -0000 1.28.6.3 @@ -37,6 +37,7 @@ show_calendar_name_p=@show_calendar_name_p@> + Index: openacs-4/packages/calendar/www/view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v diff -u -r1.22.2.2 -r1.22.2.3 --- openacs-4/packages/calendar/www/view.tcl 20 Nov 2006 20:00:15 -0000 1.22.2.2 +++ openacs-4/packages/calendar/www/view.tcl 22 Nov 2006 10:03:12 -0000 1.22.2.3 @@ -11,7 +11,7 @@ {date ""} {sort_by ""} {start_date ""} - {period_days:integer {[parameter::get -parameter DefaultPeriodDays -default 31]}} + {period_days:integer {[parameter::get -parameter ListView_DefaultPeriodDays -default 31]}} } -validate { valid_date -requires { date } { if {![string equal $date ""]} { Index: openacs-4/packages/calendar-portlet/catalog/calendar-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/catalog/calendar-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.5 -r1.12.2.6 --- openacs-4/packages/calendar-portlet/catalog/calendar-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:15 -0000 1.12.2.5 +++ openacs-4/packages/calendar-portlet/catalog/calendar-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:12 -0000 1.12.2.6 @@ -1,13 +1,12 @@ - + Eintrag hinzuf�gen Kalender verwalten Neuen Eintrag hinzuf�gen Kalender Eintragskategorien �ndern Eintragskategorien �ndern - Angezeigter Zeitraum (in Tagen): Kalender Tagesplan Index: openacs-4/packages/calendar-portlet/catalog/calendar-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/catalog/calendar-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.14.2.5 -r1.14.2.6 --- openacs-4/packages/calendar-portlet/catalog/calendar-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:15 -0000 1.14.2.5 +++ openacs-4/packages/calendar-portlet/catalog/calendar-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:12 -0000 1.14.2.6 @@ -1,13 +1,12 @@ - + Add an item Calendar Administration Create a new Event Full Calendar Manage Calendar Event Types Manage Item Types - Default period shown (in days): Calendar Schedule Index: openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp,v diff -u -r1.6.8.3 -r1.6.8.4 --- openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp 20 Nov 2006 20:00:15 -0000 1.6.8.3 +++ openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp 22 Nov 2006 10:03:12 -0000 1.6.8.4 @@ -20,11 +20,7 @@ + Index: openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl,v diff -u -r1.3.12.2 -r1.3.12.3 --- openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl 20 Nov 2006 20:00:15 -0000 1.3.12.2 +++ openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl 22 Nov 2006 10:03:12 -0000 1.3.12.3 @@ -21,8 +21,6 @@ @author Arjun Sanyal (arjun@openforce.net) @author Ben Adida (ben@openforce.net) @cvs_id $Id$ -} { - {period_days:optional} } -properties { } @@ -32,15 +30,6 @@ set view $config(default_view) set list_of_calendar_ids $config(calendar_id) -set calendar_id [lindex $list_of_calendar_ids 0] -db_0or1row select_calendar_package_id {select package_id from calendars where calendar_id=:calendar_id} - -if { ![info exists period_days] } { - set period_days [parameter::get -package_id $package_id -parameter DefaultPeriodDays] -} else { - parameter::set_value -package_id $package_id -parameter DefaultPeriodDays -value $period_days -} - if {[llength $list_of_calendar_ids] > 1} { return -code error "shouldn't be more than one calendar in admin!" } Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v diff -u -r1.24.2.3 -r1.24.2.4 --- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp 20 Nov 2006 20:00:15 -0000 1.24.2.3 +++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp 22 Nov 2006 10:03:12 -0000 1.24.2.4 @@ -103,7 +103,7 @@ - - #new-portal.when_portlet_shaded# - +
+ + Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v diff -u -r1.34.2.1 -r1.34.2.2 --- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl 20 Nov 2006 20:00:15 -0000 1.34.2.1 +++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl 22 Nov 2006 10:03:12 -0000 1.34.2.2 @@ -24,7 +24,7 @@ {view ""} {page_num ""} {date ""} - {period_days:optional} + {period_days 30} {julian_date ""} } -properties { @@ -46,38 +46,6 @@ } set list_of_calendar_ids $config(calendar_id) -# Set the community. Is set to NULL if under dotlrn -set community_id [dotlrn_community::get_community_id] - -# Set the first list entry to calendar_id. Will not be used if under -# dotlrn. Otherwise the list will actually contain only one calendar_id (the -# first one, though) -set calendar_id [lindex $list_of_calendar_ids 0] - -# Get the package_id depending on which calender_id was set -db_0or1row select_calendar_package_id {select package_id from calendars where calendar_id=:calendar_id} - -# If period_days was NOT passed to the site, it will be reset with the -# corresponding parameter value -if { ![info exists period_days] } { - # Check if under dotlrn or in a community and set period_days to the - # relevant parameter - if { [exists_and_not_null community_id] } { - # in a community the correct package_id is already set and can be used - set period_days [parameter::get -package_id $package_id -parameter DefaultPeriodDays -default 31] - } else { - foreach calendar $list_of_calendar_ids { - # returns 1 if calendar_id is user's personal calendar - if { [calendar::personal_p -calendar_id $calendar] } { - # get the package_id of this calendar and the corresponding parameter - db_0or1row select_calendar_package_id {select package_id from calendars where calendar_id=:calendar} - set period_days [parameter::get -package_id $package_id -parameter DefaultPeriodDays -default 31] - break - } - } - } -} - set ad_conn_url [ad_conn url] set base_url [ad_conn package_url] Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp 20 Nov 2006 20:00:15 -0000 1.8.2.1 +++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp 22 Nov 2006 10:03:12 -0000 1.8.2.2 @@ -35,7 +35,5 @@ sort_by=@sort_by@> - - #new-portal.when_portlet_shaded# - - \ No newline at end of file +
+ Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl,v diff -u -r1.9.2.2 -r1.9.2.3 --- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl 20 Nov 2006 20:00:15 -0000 1.9.2.2 +++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl 22 Nov 2006 10:03:12 -0000 1.9.2.3 @@ -25,7 +25,7 @@ {page_num ""} {date ""} {julian_date ""} - {period_days:optional} + {period_days 60} {sort_by ""} } -properties { @@ -47,17 +47,6 @@ } set list_of_calendar_ids $config(calendar_id) -# Set the first list entry to calendar_id. Will not be used if under -# dotlrn. Otherwise the list will actually contain only one calendar_id -# (the first one, though) -set calendar_id [lindex $list_of_calendar_ids 0] -# Get the package_id depending on which calender_id was set -db_0or1row select_calendar_package_id {select package_id from calendars where calendar_id=:calendar_id} - -if { ![info exists period_days] } { - set period_days [parameter::get -package_id $package_id -parameter DefaultPeriodDays -default 31] -} - set scoped_p $config(scoped_p) if {$scoped_p == "t"} { set show_calendar_name_p 1 Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v diff -u -r1.16.2.1 -r1.16.2.2 --- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp 20 Nov 2006 20:00:15 -0000 1.16.2.1 +++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp 22 Nov 2006 10:03:12 -0000 1.16.2.2 @@ -80,7 +80,5 @@ - - #new-portal.when_portlet_shaded# - - \ No newline at end of file +   + Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v diff -u -r1.28.2.3 -r1.28.2.4 --- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl 20 Nov 2006 20:00:15 -0000 1.28.2.3 +++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl 22 Nov 2006 10:03:12 -0000 1.28.2.4 @@ -24,7 +24,7 @@ {view ""} {page_num ""} {date ""} - {period_days:optional} + {period_days 30} {julian_date ""} } -properties { @@ -38,7 +38,6 @@ } } -set period_days [parameter::get -parameter DefaultPeriodDays -default 30] # get stuff out of the config array array set config $cf Index: openacs-4/packages/curriculum/lib/summary.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/summary.adp,v diff -u -r1.2.6.1 -r1.2.6.2 --- openacs-4/packages/curriculum/lib/summary.adp 20 Nov 2006 20:00:15 -0000 1.2.6.1 +++ openacs-4/packages/curriculum/lib/summary.adp 22 Nov 2006 10:03:12 -0000 1.2.6.2 @@ -21,7 +21,7 @@
  • - @community_name@: #curriculum.lt_No_published_curricul# + #curriculum.lt_No_published_curricul#
    • Index: openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp 20 Nov 2006 20:00:15 -0000 1.2.2.1 +++ openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp 22 Nov 2006 10:03:13 -0000 1.2.2.2 @@ -13,5 +13,5 @@ - #new-portal.when_portlet_shaded# +   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.12 -r1.22.2.13 --- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:15 -0000 1.22.2.12 +++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:13 -0000 1.22.2.13 @@ -1,5 +1,5 @@ - + Eine Kopie von Zugriff @@ -34,7 +34,6 @@ Verwalten Verwalten <img border=0 valign="bottom" src="/resources/dotlrn/admin.gif" alt="Verwalten"> - Administration .LRN-Administration Administrator Administratoren @@ -200,11 +199,9 @@ Von Fuchsie Unbeschr�nkt - voll Unbeschr�nkter Zugriff Allgemeine Informationen Hilfe - Link zu %communities.pretty_name% Systemadministrationsrechte erteilen Grau Gr�n @@ -225,7 +222,6 @@ Kopfzeilenlogo-ID Hilfe .LRN toolbar verstecken - Home HTML Interne ID ID @@ -263,7 +259,6 @@ Wollen Sie diese Benutzer wirklich l�schen? Hinweis: das System wird nur versuchen, diese Benutzer zu entfernen, und es k�nnte Probleme f�r andere Benutzer bekommen. - Sind Sie sicher, dass Sie die nachfolgende Email verschicken wollen? Stellen Sie sicher, dass die Person nicht bereits f�r eine andere E-Mail-Adresse ein Benutzerkonto bei dotLRN besitzt, da doppelte Benutzerkonten Probeme verursachen. Um eine Person mit einem bestehenden Benutzerkonto hinzuzuf�gen, benutzen Sie die Option <a href=members>Teilnehmer verwalten</a>. Kursschl�ssel (eine kurze Bezeichnung ohne Leerzeichen) Web-Adresse der Gruppe @@ -493,9 +488,6 @@ Versenden am E-Mail senden An die ganze Gruppe senden - An die folgenden Mitglieder senden: - An die folgenden Gruppen senden: - Setze f�r alle Benutzer screennames, die noch keinen haben Freigegebene Dateien .LRN Toolbar anzeigen Silber @@ -521,7 +513,6 @@ Administration der Parameter Klein &nbsp; - Rundmail Gruppen-E-Mail... Gruppen-E-Mail senden Gruppen-E-Mail an Benutzer senden @@ -594,9 +585,7 @@ Ja Ja Ja, l�schen - Ja, Mitgliedschaften l�schen Ja, wirklich - Ja, Mitgliedschaften beibehalten Sie k�nnen Farben mit Hilfe von Farbnamen <b>Hinweis:</b> Sie m�ssen <a href="%terms_url%">%terms_pretty_plural%</a> erstellen, um %class_instances_pretty_plural% anlegen zu k�nnen, denn diese m�ssen %terms_pretty_plural%n zugeordnet sein. Ihr Logo ist zu gro�. Die zul�ssige Maximalgr��e f�r Anh�nge betr�gt innerhalb von %system_name% %max_attachments_bytes% Bytes.\n 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.22 -r1.43.2.23 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:16 -0000 1.43.2.22 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:13 -0000 1.43.2.23 @@ -215,7 +215,6 @@ From fuchsia Full - full Full Access General Information General Site Help @@ -550,9 +549,6 @@ Send Date Send Email Send to everyone in the group - In addition, send to the following people (if you have not selected "Send to Everyone" above): - Send to the following roles: - Set all screenames where no screenname is set Shared Files .LRN Toolbar anzeigen silver @@ -578,7 +574,6 @@ Parameters Administration Small Sorry! - Spam Spam ... Spam Community Spam Users @@ -655,9 +650,7 @@ Yes yes Yes, delete - Yes, delete memberships Yes, I'm sure. - Yes, keep memberships You can specify colors by name <b>Note:</b> You must create <a href="%terms_url%">%terms_pretty_plural%</a> to be able to create %class_instances_pretty_plural%, since these must be associated with %terms_pretty_plural%. Your icon is too large. The publisher of %system_name% has chosen to limit attachments to %max_attachments_bytes% bytes.\n Index: openacs-4/packages/dotlrn/sql/oracle/communities-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/communities-create.sql,v diff -u -r1.13.8.3 -r1.13.8.4 --- openacs-4/packages/dotlrn/sql/oracle/communities-create.sql 20 Nov 2006 20:00:16 -0000 1.13.8.3 +++ openacs-4/packages/dotlrn/sql/oracle/communities-create.sql 22 Nov 2006 10:03:13 -0000 1.13.8.4 @@ -80,7 +80,6 @@ references apm_packages (package_id), tree_sortkey raw(240), max_child_sortkey raw(3), - max_members integer default '0', site_template_id integer constraint dotlrn_c_site_template_id_fk references dotlrn_site_templates(site_template_id) Index: openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.2.0d2-2.2.0d3.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.2.0d2-2.2.0d3.sql,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.2.0d2-2.2.0d3.sql 20 Nov 2006 20:00:16 -0000 1.1.2.4 +++ openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.2.0d2-2.2.0d3.sql 22 Nov 2006 10:03:13 -0000 1.1.2.5 @@ -26,6 +26,3 @@ end; / --- Altering dotlrn communities table in order to have a maximum members field -alter table dotlrn_communities_all add column max_members integer; -ALTER TABLE dotlrn_communities_all ALTER COLUMN max_members SET DEFAULT 0; Index: openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql,v diff -u -r1.4.8.3 -r1.4.8.4 --- openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql 20 Nov 2006 20:00:16 -0000 1.4.8.3 +++ openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql 22 Nov 2006 10:03:13 -0000 1.4.8.4 @@ -92,7 +92,6 @@ default '', tree_sortkey varbit, max_child_sortkey varbit, - max_members integer default 0, site_template_id integer constraint dotlrn_c_site_template_id_fk references dotlrn_site_templates(site_template_id) Index: openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.2.0d1-2.2.0d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.2.0d1-2.2.0d2.sql,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.2.0d1-2.2.0d2.sql 20 Nov 2006 20:00:16 -0000 1.1.2.3 +++ openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.2.0d1-2.2.0d2.sql 22 Nov 2006 10:03:13 -0000 1.1.2.4 @@ -25,9 +25,6 @@ alter table dotlrn_communities_all add column site_template_id integer; alter table dotlrn_communities_all add constraint dotlrn_c_site_template_id_fk foreign key (site_template_id) references dotlrn_site_templates(site_template_id); --- Altering dotlrn communities table in order to have a maximum members field -alter table dotlrn_communities_all add column max_members integer; -ALTER TABLE dotlrn_communities_all ALTER COLUMN max_members SET DEFAULT 0; -- Altering Users Profile table and dotlrn users view in order to have -- which site teemplate is going to be using the user Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/community-init.tcl'. Fisheye: No comparison available. Pass `N' to diff? 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.31 -r1.191.2.32 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 20 Nov 2006 20:00:16 -0000 1.191.2.31 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 22 Nov 2006 10:03:14 -0000 1.191.2.32 @@ -738,41 +738,6 @@ return [db_list_of_lists select_users_in_role {}] } - ad_proc -public members_count { - -community_id - {-join_policy "open"} - } { - Count members given the join policy. - } { - return [db_string select_count {}] - } - - ad_proc -public max_members { - -community_id - } { - Returns the max members setting for the community - } { - return [db_string select_max_members {}] - } - - ad_proc -public max_members_p { - -community_id - } { - Have we reached maximum members - } { - set max_members [db_string select_max_members {}] - if {$max_members == 0} { - return 0 - } else { - set size [members_count -community_id $community_id] - if {$size < $max_members} { - return 0 - } else { - return 1 - } - } - } - ad_proc -public member_p { community_id user_id @@ -963,18 +928,6 @@ } } - ad_proc -public remove_banned_users_from_all { - } { - Remove all banned users from all communities (if they are members) - } { - db_foreach get_banned_users_with_membership {} { - dotlrn_community::remove_user_from_all -user_id $user_id - ns_log Debug "User $user_id is banned and was removed from all communities" - } if_no_rows { - ns_log Debug "No banned user needed to be removed from a community" - } - } - ad_proc -public get_all_communities_by_user { user_id } { @@ -1323,12 +1276,7 @@ } elseif {[needs_approval_p -community_id $sc_id]} { append chunk "[_ dotlrn.Request_Membership]\n" } else { - set max_members_p [max_members_p -community_id $sc_id] - if {$max_members_p} { - append chunk "([_ dotlrn.full])\n" - } else { - append chunk "([_ dotlrn.Join])\n" - } + append chunk "([_ dotlrn.Join])\n" } append chunk "\n" Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.87.2.4 -r1.87.2.5 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 20 Nov 2006 20:00:16 -0000 1.87.2.4 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 22 Nov 2006 10:03:14 -0000 1.87.2.5 @@ -191,13 +191,6 @@ - - - select count(*) from dotlrn_member_rels_approved where community_id - = :community_id - - - select count(*) @@ -209,20 +202,6 @@ - - - select max_members from dotlrn_communities_all - where community_id = :community_id - - - - - - select max_members from dotlrn_communities_all - where community_id = :community_id - - - select count(*) Index: openacs-4/packages/dotlrn/www/community-member.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v diff -u -r1.22.2.4 -r1.22.2.5 --- openacs-4/packages/dotlrn/www/community-member.adp 20 Nov 2006 20:00:17 -0000 1.22.2.4 +++ openacs-4/packages/dotlrn/www/community-member.adp 22 Nov 2006 10:03:14 -0000 1.22.2.5 @@ -51,7 +51,7 @@ -

    #dotlrn.Biography# @bio;noquote@ +

    #dotlrn.Biography# @bio@ 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.11 -r1.15.2.12 --- openacs-4/packages/dotlrn/www/control-panel.adp 20 Nov 2006 20:00:17 -0000 1.15.2.11 +++ openacs-4/packages/dotlrn/www/control-panel.adp 22 Nov 2006 10:03:14 -0000 1.15.2.12 @@ -27,7 +27,7 @@

    -

    #acs-subsite.My_Account#

    +

    #acs-subsite.My_Account#

    @@ -63,7 +63,7 @@
    -

    #acs-subsite.Your_Portrait#

     +

    #acs-subsite.Your_Portrait#

    @@ -76,7 +76,7 @@

    -

    #acs-subsite.Your_Portrait#

     +

    #acs-subsite.Your_Portrait#

    @@ -96,9 +96,9 @@

    -

    #acs-subsite.Privacy#

    +

    #acs-subsite.Privacy#

    -
    +
    -

    #dotlrn.General_Site_Help#

     +

    #dotlrn.General_Site_Help#
    -
    +
    +
    Index: openacs-4/packages/dotlrn/www/control-panel.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.xql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/dotlrn/www/control-panel.xql 20 Nov 2006 20:00:17 -0000 1.1.2.2 +++ openacs-4/packages/dotlrn/www/control-panel.xql 22 Nov 2006 10:03:14 -0000 1.1.2.3 @@ -9,7 +9,6 @@ and ci.item_id = a.object_id_two and a.object_id_one = :user_id and a.rel_type = 'user_portrait_rel' - limit 1 Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v diff -u -r1.39.2.5 -r1.39.2.6 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 20 Nov 2006 20:00:17 -0000 1.39.2.5 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 22 Nov 2006 10:03:14 -0000 1.39.2.6 @@ -27,7 +27,6 @@ - @communities.previous_type_ul_tags;noquote@
    • @@ -63,7 +62,7 @@
    -     +     @final_ul_tags;noquote@ Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl 20 Nov 2006 20:00:17 -0000 1.1.2.4 +++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl 22 Nov 2006 10:03:14 -0000 1.1.2.5 @@ -5,9 +5,7 @@ if {![empty_string_p $community_id]} { set dotlrn_master [dotlrn_community::get_dotlrn_master -community_id $community_id] } elseif {$user_id } { - #unima-nm - #set dotlrn_master [dotlrn::get_dotlrn_master -user_id $user_id] - set dotlrn_master "/packages/dotlrn/www/dotlrn-master" + set dotlrn_master [dotlrn::get_dotlrn_master -user_id $user_id] } else { set dotlrn_master [parameter::get -package_id $dotlrn_package_id -parameter "DefaultMaster_p" \ -default "/packages/dotlrn/www/dotlrn-master"] Index: openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl,v diff -u -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl 20 Nov 2006 20:00:17 -0000 1.10.2.2 +++ openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl 22 Nov 2006 10:03:14 -0000 1.10.2.3 @@ -31,5 +31,5 @@ portal::configure_dispatch -portal_id $portal_id -form [ns_getform] -ad_returnredirect "one-community-portal-configure?portal_id=$portal_id&referer=$return_url" +ad_returnredirect "one-community-portal-configure?portal_id=$portal_id&referer=$return_url#$anchor" Index: openacs-4/packages/dotlrn/www/one-community.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v diff -u -r1.27.2.1 -r1.27.2.2 --- openacs-4/packages/dotlrn/www/one-community.adp 20 Nov 2006 20:00:17 -0000 1.27.2.1 +++ openacs-4/packages/dotlrn/www/one-community.adp 22 Nov 2006 10:03:14 -0000 1.27.2.2 @@ -23,4 +23,6 @@

    -@rendered_page;noquote@ \ No newline at end of file +@rendered_page;noquote@ + + Index: openacs-4/packages/dotlrn/www/register.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.xql,v diff -u -r1.2.8.1 -r1.2.8.2 --- openacs-4/packages/dotlrn/www/register.xql 20 Nov 2006 20:00:17 -0000 1.2.8.1 +++ openacs-4/packages/dotlrn/www/register.xql 22 Nov 2006 10:03:14 -0000 1.2.8.2 @@ -19,12 +19,4 @@ - - - select max_members - from dotlrn_communities_all - where community_id = :community_id - - - - \ No newline at end of file + Index: openacs-4/packages/dotlrn/www/spam-recipients.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.adp,v diff -u -r1.6.2.4 -r1.6.2.5 --- openacs-4/packages/dotlrn/www/spam-recipients.adp 20 Nov 2006 20:00:17 -0000 1.6.2.4 +++ openacs-4/packages/dotlrn/www/spam-recipients.adp 22 Nov 2006 10:03:14 -0000 1.6.2.5 @@ -32,12 +32,12 @@ #dotlrn.Send_to_all#

    -#dotlrn.Send_to_the_following_roles#

    +Send to the following roles:

    @rel_types_html;noquote@

    -#dotlrn.Send_to_the_following_members#:

    +In addition, send to the following people (if you have not selected "Send to Everyone" above):

    Index: openacs-4/packages/dotlrn/www/spam-recipients.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.tcl,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/dotlrn/www/spam-recipients.tcl 20 Nov 2006 20:00:17 -0000 1.4.2.1 +++ openacs-4/packages/dotlrn/www/spam-recipients.tcl 22 Nov 2006 10:03:14 -0000 1.4.2.2 @@ -4,7 +4,7 @@ {referer "control-panel"} } -set spam_name [bulk_mail::parameter -parameter PrettyName -default [_ dotlrn.Spam]] +set spam_name [bulk_mail::parameter -parameter PrettyName -default Spam] set context_bar [list [list $referer [_ dotlrn.Admin]] "$spam_name [_ dotlrn.Community]"] if { ![exists_and_not_null community_id] } { Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v diff -u -r1.8.8.2 -r1.8.8.3 --- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 20 Nov 2006 20:00:17 -0000 1.8.8.2 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 22 Nov 2006 10:03:14 -0000 1.8.8.3 @@ -39,8 +39,7 @@ form create archive_form # this is lame, but I don't have a better way yet -set yes_label "[_ dotlrn.Yes_keep_members]" -set yes_delete_label "[_ dotlrn.Yes_delete_members]" +set yes_label "[_ dotlrn.Yes_Im_sure]" set no_label "[_ dotlrn.lt_No_I_dont_want_to_arc]" element create archive_form no_button \ @@ -49,16 +48,11 @@ -widget submit \ -value "1" -element create archive_form yes_keep_button \ +element create archive_form yes_button \ -label $yes_label \ -datatype text \ -widget submit -element create archive_form yes_delete_button \ - -label $yes_delete_label \ - -datatype text \ - -widget submit - element create archive_form community_id \ -label " " \ -datatype text \ @@ -72,30 +66,18 @@ -value $referer if {[form is_valid archive_form]} { - form get_values archive_form community_id referer no_button yes_keep_button yes_delete_button + form get_values archive_form community_id referer no_button yes_button - if {[string equal $yes_keep_button $yes_label]} { - #keep all memberships and archive this community - db_transaction { - set subcomm_id [dotlrn_community::archive \ - -community_id $community_id - ] - } - } + if {[string equal $yes_button $yes_label]} { - if {[string equal $yes_delete_button $yes_delete_label]} { - #delete all memberships ... - db_foreach get_list_of_members {} { - dotlrn_community::remove_user $community_id $user_id - } - #... and archive community db_transaction { set subcomm_id [dotlrn_community::archive \ - -community_id $community_id - ] + -community_id $community_id + ] } - } + ad_returnredirect "$referer" ad_script_abort -} +} + Index: openacs-4/packages/dotlrn/www/admin/class.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v diff -u -r1.32.2.2 -r1.32.2.3 --- openacs-4/packages/dotlrn/www/admin/class.adp 20 Nov 2006 20:00:17 -0000 1.32.2.2 +++ openacs-4/packages/dotlrn/www/admin/class.adp 22 Nov 2006 10:03:14 -0000 1.32.2.3 @@ -74,12 +74,13 @@

    +

    - #dotlrn.Search_classes_with# - #dotlrn.Please_type_a_keyword# + Search classes with : + - +
    Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v diff -u -r1.20.2.2 -r1.20.2.3 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 20 Nov 2006 20:00:17 -0000 1.20.2.2 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 22 Nov 2006 10:03:14 -0000 1.20.2.3 @@ -32,11 +32,11 @@
    - #dotlrn.Search_subjects_with# - #dotlrn.Please_type_a_keyword# + Search subjects with : + - +
    Index: openacs-4/packages/dotlrn/www/admin/departments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v diff -u -r1.21.2.2 -r1.21.2.3 --- openacs-4/packages/dotlrn/www/admin/departments.adp 20 Nov 2006 20:00:17 -0000 1.21.2.2 +++ openacs-4/packages/dotlrn/www/admin/departments.adp 22 Nov 2006 10:03:14 -0000 1.21.2.3 @@ -17,15 +17,15 @@ # %> - + @title@ @context_bar@
    - #dotlrn.Search_departments_with# - #dotlrn.Please_type_a_keyword# - + Search departments with : + +
    Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 20 Nov 2006 20:00:17 -0000 1.5.2.2 +++ openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 22 Nov 2006 10:03:14 -0000 1.5.2.3 @@ -34,10 +34,10 @@ set admin_id [ad_verify_and_get_user_id] set elements [list user \ - [list label "[_ dotlrn.User]"\ + [list label "User" \ link_url_col user_url ] \ remove \ - [list label "[_ dotlrn.Remove]" \ + [list label "Remove" \ link_url_col remove_url \ display_template {
    } \ sub_class narrow ] \ @@ -50,7 +50,7 @@ -name dotlrn_admins \ -multirow $multirow_name \ -actions $actions \ - -no_data "[_ dotlrn.No_dotlrn-admins]" \ + -no_data "No dotlrn-admins." \ -elements $elements db_multirow \ Index: openacs-4/packages/dotlrn/www/admin/term.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v diff -u -r1.24.2.2 -r1.24.2.3 --- openacs-4/packages/dotlrn/www/admin/term.adp 20 Nov 2006 20:00:17 -0000 1.24.2.2 +++ openacs-4/packages/dotlrn/www/admin/term.adp 22 Nov 2006 10:03:14 -0000 1.24.2.3 @@ -79,11 +79,11 @@
    - #dotlrn.Search_classes_with# - #dotlrn.Please_type_a_keyword# + Search classes with : + - +
    Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/update-screennames.tcl'. Fisheye: No comparison available. Pass `N' to diff? 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.2.3 -r1.29.2.4 --- openacs-4/packages/dotlrn/www/admin/user.adp 20 Nov 2006 20:00:17 -0000 1.29.2.3 +++ openacs-4/packages/dotlrn/www/admin/user.adp 22 Nov 2006 10:03:14 -0000 1.29.2.4 @@ -47,7 +47,6 @@ @screen_name@ [ #dotlrn.Edit# ] - [ #dotlrn.set_all_screennames_where_null# ] Index: openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl,v diff -u -r1.9.12.1 -r1.9.12.2 --- openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl 20 Nov 2006 20:00:17 -0000 1.9.12.1 +++ openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl 22 Nov 2006 10:03:14 -0000 1.9.12.2 @@ -50,7 +50,7 @@ } { returns the pretty name } { - return "#bulk-mail.pretty_name#" + return "Bulk Mail" } ad_proc -public add_applet { Index: openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.de_DE.ISO-8859-1.xml,v diff -u -r1.9.2.5 -r1.9.2.6 --- openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:17 -0000 1.9.2.5 +++ openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:15 -0000 1.9.2.6 @@ -1,5 +1,5 @@ - + Tagesplan Index: openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.en_US.ISO-8859-1.xml,v diff -u -r1.11.2.5 -r1.11.2.6 --- openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:17 -0000 1.11.2.5 +++ openacs-4/packages/dotlrn-calendar/catalog/dotlrn-calendar.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:15 -0000 1.11.2.6 @@ -1,5 +1,5 @@ - + Day Summary Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v diff -u -r1.76.2.3 -r1.76.2.4 --- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl 20 Nov 2006 20:00:17 -0000 1.76.2.3 +++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl 22 Nov 2006 10:03:15 -0000 1.76.2.4 @@ -48,7 +48,7 @@ ad_proc -public dotlrn_calendar::get_pretty_name { } { } { - return "#calendar-portlet.pretty_name#" + return "Calendar" } ad_proc -public dotlrn_calendar::add_applet { Index: openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl 20 Nov 2006 20:00:17 -0000 1.2.2.1 +++ openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl 22 Nov 2006 10:03:15 -0000 1.2.2.2 @@ -14,7 +14,7 @@ } { get the pretty name } { - return "#curriculum.pretty_name#" + return "Curriculum" } ad_proc -public applet_key {} { Index: openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.5 -r1.10.2.6 --- openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:18 -0000 1.10.2.5 +++ openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:15 -0000 1.10.2.6 @@ -1,5 +1,5 @@ - + Kernanwendungen von dotLRN Liste der Teilnehmer Index: openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.en_US.ISO-8859-1.xml,v diff -u -r1.11.2.5 -r1.11.2.6 --- openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:18 -0000 1.11.2.5 +++ openacs-4/packages/dotlrn-dotlrn/catalog/dotlrn-dotlrn.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:15 -0000 1.11.2.6 @@ -1,5 +1,5 @@ - + Core DotLRN Applets Group Members Info Index: openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl 20 Nov 2006 20:00:18 -0000 1.2.2.1 +++ openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl 22 Nov 2006 10:03:15 -0000 1.2.2.2 @@ -29,7 +29,7 @@ } { get the pretty name } { - return "#edit-this-page.pretty_name#" + return "Edit This Page" } ad_proc -public applet_key {} { Index: openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.de_DE.ISO-8859-1.xml,v diff -u -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:18 -0000 1.2.2.2 +++ openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:16 -0000 1.2.2.3 @@ -1,5 +1,5 @@ - + Evaluierung Index: openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.en_US.ISO-8859-1.xml,v diff -u -r1.1.4.2 -r1.1.4.3 --- openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:18 -0000 1.1.4.2 +++ openacs-4/packages/dotlrn-evaluation/catalog/dotlrn-evaluation.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:16 -0000 1.1.4.3 @@ -1,5 +1,5 @@ - + Evaluation Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v diff -u -r1.41.2.1 -r1.41.2.2 --- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl 20 Nov 2006 20:00:18 -0000 1.41.2.1 +++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl 22 Nov 2006 10:03:16 -0000 1.41.2.2 @@ -29,7 +29,7 @@ } { get the pretty name } { - return "#faq.pretty_name#" + return "Frequently Asked Questions" } ad_proc -public applet_key {} { Index: openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.de_DE.ISO-8859-1.xml,v diff -u -r1.11.2.3 -r1.11.2.4 --- openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:18 -0000 1.11.2.3 +++ openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:16 -0000 1.11.2.4 @@ -1,5 +1,5 @@ - + verwalten Alle Foren Index: openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.en_US.ISO-8859-1.xml,v diff -u -r1.15.2.3 -r1.15.2.4 --- openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:18 -0000 1.15.2.3 +++ openacs-4/packages/dotlrn-forums/catalog/dotlrn-forums.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:16 -0000 1.15.2.4 @@ -1,5 +1,5 @@ - + administer All forums Index: openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl,v diff -u -r1.12.8.2 -r1.12.8.3 --- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl 20 Nov 2006 20:00:19 -0000 1.12.8.2 +++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl 22 Nov 2006 10:03:16 -0000 1.12.8.3 @@ -53,7 +53,7 @@ } { return the pretty name of this applet. } { - return "#forums.pretty_name#" + return Forums } ad_proc -public add_applet { Index: openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.7 -r1.10.2.8 --- openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:19 -0000 1.10.2.7 +++ openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:16 -0000 1.10.2.8 @@ -1,5 +1,5 @@ - + Alle Alle Inhalte Index: openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.en_US.ISO-8859-1.xml,v diff -u -r1.13.2.7 -r1.13.2.8 --- openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:19 -0000 1.13.2.7 +++ openacs-4/packages/dotlrn-fs/catalog/dotlrn-fs.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:16 -0000 1.13.2.8 @@ -1,5 +1,5 @@ - + All All items Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v diff -u -r1.90.2.7 -r1.90.2.8 --- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 20 Nov 2006 20:00:19 -0000 1.90.2.7 +++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 22 Nov 2006 10:03:16 -0000 1.90.2.8 @@ -30,7 +30,7 @@ } { What's my key? } { - return "dotlrn_fs" + return dotlrn_fs } ad_proc -public package_key { @@ -51,7 +51,7 @@ } { returns the pretty name } { - return "#file-storage.pretty_name#" + return "File Storage" } ad_proc -public add_applet { Index: openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.de_DE.ISO-8859-1.xml,v diff -u -r1.4.2.3 -r1.4.2.4 --- openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:19 -0000 1.4.2.3 +++ openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.4.2.4 @@ -1,5 +1,5 @@ - + Aktion Warnung Index: openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.en_US.ISO-8859-1.xml,v diff -u -r1.4.2.3 -r1.4.2.4 --- openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:19 -0000 1.4.2.3 +++ openacs-4/packages/dotlrn-homework/catalog/dotlrn-homework.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.4.2.4 @@ -1,5 +1,5 @@ - + Action Alert Index: openacs-4/packages/dotlrn-news/catalog/dotlrn-news.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/catalog/dotlrn-news.de_DE.ISO-8859-1.xml,v diff -u -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/dotlrn-news/catalog/dotlrn-news.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:19 -0000 1.9.2.3 +++ openacs-4/packages/dotlrn-news/catalog/dotlrn-news.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.9.2.4 @@ -1,5 +1,5 @@ - + Ank�ndigungen Index: openacs-4/packages/dotlrn-news/catalog/dotlrn-news.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/catalog/dotlrn-news.en_US.ISO-8859-1.xml,v diff -u -r1.11.2.3 -r1.11.2.4 --- openacs-4/packages/dotlrn-news/catalog/dotlrn-news.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:19 -0000 1.11.2.3 +++ openacs-4/packages/dotlrn-news/catalog/dotlrn-news.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.11.2.4 @@ -1,5 +1,5 @@ - + News Index: openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl 20 Nov 2006 20:00:20 -0000 1.3.2.1 +++ openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl 22 Nov 2006 10:03:17 -0000 1.3.2.2 @@ -28,7 +28,7 @@ ad_proc -public dotlrn_news_aggregator::get_pretty_name {} { returns the pretty name } { - return "#news-aggregator-portlet.pretty_name#" + return "News Aggregator" } ad_proc -public dotlrn_news_aggregator::add_applet {} { @@ -49,7 +49,7 @@ Add the news-aggregator applet to a specifc dotlrn community } { set portal_id [dotlrn_community::get_portal_id -community_id $community_id] - + # create the news-aggregator package instance (all in one, I've mounted it) set package_id [dotlrn::instantiate_and_mount $community_id [package_key]] @@ -66,25 +66,6 @@ ns_set put $args package_id $package_id add_portlet_helper $portal_id $args - #create a aggregator to avoid the "no aggregator"-error - #begin - set package_name [apm_instance_name_from_id [ad_conn package_id]] - set aggregator_name "${package_name} - #news-aggregator.pretty_name#" - set user_id [ad_conn user_id] - set aggregator_id [news_aggregator::aggregator::new \ - -aggregator_name $aggregator_name \ - -package_id $package_id \ - -public_p 0 \ - -creation_user $user_id \ - -creation_ip [ad_conn peeraddr]] - news_aggregator::aggregator::set_user_default -user_id $user_id \ - -package_id $package_id -aggregator_id $aggregator_id - #load preinstalled subscriptions into aggregator - news_aggregator::aggregator::load_preinstalled_subscriptions \ - -aggregator_id $aggregator_id \ - -package_id $package_id - #end - return $package_id } Index: openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.6 -r1.10.2.7 --- openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:20 -0000 1.10.2.6 +++ openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.10.2.7 @@ -1,5 +1,5 @@ - + Gruppe verwalten Verwalten @@ -16,9 +16,6 @@ Begr��ungsnachricht editieren E-Mail an Teilnehmer senden Eingeschaltet - Zur %admin_pretty_name% gehen - Zur Administratoren-FAQ gehen - Zur Teilnehmerverwaltung gehen Bei "%pretty_name%" Teilnehmer hinzuf�gen/entfernen k�nnen Gruppen-E-Mails an diese Gruppe senden. Gruppen-E-Mail-Optionen �ndern @@ -48,9 +45,6 @@ Keine %teaching_assistant_role_pretty_plural% vorhanden Nur Administratoren Selbstregistrierung - Gr��e: Sortieren Sortieren/Verwalten - Verhindern, dass Gastnutzern Informationen zu Gruppenmitgliedschaften sehen. - Gastnutzern erlauben Information zu Gruppenmitgliedschaften zu sehen Index: openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.18.2.8 -r1.18.2.9 --- openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:20 -0000 1.18.2.8 +++ openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.18.2.9 @@ -50,7 +50,6 @@ No %teaching_assistant_role_pretty_plural% Only admins Open - Size: Sort Sort/manage Change privacy policy so guest users can not view group membership information. Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v diff -u -r1.33.2.7 -r1.33.2.8 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 20 Nov 2006 20:00:20 -0000 1.33.2.7 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 22 Nov 2006 10:03:17 -0000 1.33.2.8 @@ -67,7 +67,6 @@
    • #dotlrn-portlet.lt_Customize_Portal_Layo#
      • -
    • #dotlrn-portlet.Size#
    • #dotlrn-portlet.lt_Change_Name_Portlet#
    • #dotlrn.Customize_Template#
      • Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v diff -u -r1.16.2.4 -r1.16.2.5 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl 20 Nov 2006 20:00:20 -0000 1.16.2.4 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl 22 Nov 2006 10:03:17 -0000 1.16.2.5 @@ -23,8 +23,6 @@ @author Arjun Sanyal (arjun@openforce.net) @author Ben Adida (ben@openforce) @cvs_id $Id$ -} { - {size:optional} } -properties { } @@ -38,18 +36,6 @@ set admin_pretty_name [ad_parameter -localize dotlrn_admin_pretty_name dotlrn] set subcommunity_p [dotlrn_community::subcommunity_p -community_id $community_id] -set max_members [dotlrn_community::max_members -community_id $community_id] - -if {[exists_and_not_null size]} { - if {$size >= 0} { - db_dml update_max_members {} - set max_members $size - } else { - ad_return_complaint 1 "[_ dotlrn.Invalid_size]" - ad_script_abort - } -} - #The community_type is dotlrn_club for "communties" and the subject name for classes. set comm_type [dotlrn_community::get_community_type_from_community_id $community_id] Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.xql,v diff -u -r1.6.12.2 -r1.6.12.3 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.xql 20 Nov 2006 20:00:20 -0000 1.6.12.2 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.xql 22 Nov 2006 10:03:17 -0000 1.6.12.3 @@ -2,14 +2,6 @@ - - - update dotlrn_communities_all set - max_members = :size - where community_id = :community_id - - - select community_type, @@ -19,8 +11,7 @@ portal_id, non_member_portal_id, admin_portal_id, - archived_p, - max_members + archived_p from dotlrn_communities_all, groups where community_id = :community_id and groups.group_id = community_id Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v diff -u -r1.16.2.3 -r1.16.2.4 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp 20 Nov 2006 20:00:20 -0000 1.16.2.3 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp 22 Nov 2006 10:03:17 -0000 1.16.2.4 @@ -48,8 +48,8 @@ <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> - - @users.email;noquote@ + + @users.email;noquote@ @users.role@ @@ -78,5 +78,6 @@ - #new-portal.when_portlet_shaded# + <% # The portal is shaded - should not be displayed %> +
      Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v diff -u -r1.17.2.3 -r1.17.2.4 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp 20 Nov 2006 20:00:20 -0000 1.17.2.3 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp 22 Nov 2006 10:03:17 -0000 1.17.2.4 @@ -18,7 +18,7 @@ %> - + #dotlrn-portlet.lt_No_community_was_spec# @@ -39,9 +39,12 @@ - #dotlrn-portlet.no_instructor_members# +
    • #dotlrn-portlet.no_instructor_members#
      •  -

    + + +

    + <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_ta_rel] %>:

      @@ -55,9 +58,11 @@ -

    +     +

    + <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_ca_rel] %>:

    -     - - - #new-portal.when_portlet_shaded# - - Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp,v diff -u -r1.13.8.1 -r1.13.8.2 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp 20 Nov 2006 20:00:20 -0000 1.13.8.1 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp 22 Nov 2006 10:03:17 -0000 1.13.8.2 @@ -41,7 +41,7 @@     - #new-portal.when_portlet_shaded# +
    Index: openacs-4/packages/dotlrn-static/catalog/dotlrn-static.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/catalog/dotlrn-static.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/dotlrn-static/catalog/dotlrn-static.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:20 -0000 1.10.2.3 +++ openacs-4/packages/dotlrn-static/catalog/dotlrn-static.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.10.2.4 @@ -1,5 +1,5 @@ - + Kurs-Information Community-Information Index: openacs-4/packages/dotlrn-static/catalog/dotlrn-static.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/catalog/dotlrn-static.en_US.ISO-8859-1.xml,v diff -u -r1.13.2.3 -r1.13.2.4 --- openacs-4/packages/dotlrn-static/catalog/dotlrn-static.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:20 -0000 1.13.2.3 +++ openacs-4/packages/dotlrn-static/catalog/dotlrn-static.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:17 -0000 1.13.2.4 @@ -1,5 +1,5 @@ - + Class Info Community Info Index: openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:21 -0000 1.10.2.3 +++ openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:18 -0000 1.10.2.4 @@ -1,5 +1,5 @@ - + Lehrplan verwalten Herunterladen Index: openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml,v diff -u -r1.11.2.3 -r1.11.2.4 --- openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:22 -0000 1.11.2.3 +++ openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:18 -0000 1.11.2.4 @@ -1,5 +1,5 @@ - + Syllabus Administration Download Index: openacs-4/packages/dotlrn-syllabus/tcl/dotlrn-syllabus-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/tcl/dotlrn-syllabus-procs.tcl,v diff -u -r1.10.12.1 -r1.10.12.2 --- openacs-4/packages/dotlrn-syllabus/tcl/dotlrn-syllabus-procs.tcl 20 Nov 2006 20:00:22 -0000 1.10.12.1 +++ openacs-4/packages/dotlrn-syllabus/tcl/dotlrn-syllabus-procs.tcl 22 Nov 2006 10:03:18 -0000 1.10.12.2 @@ -43,7 +43,7 @@ ad_proc -public get_pretty_name { } { } { - return "#dotlrn-syllabus.pretty_name#" + return "Syllabus" } ad_proc -public add_applet { Index: openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:23 -0000 1.2.2.1 +++ openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:18 -0000 1.2.2.2 @@ -1,15 +1,15 @@ - + - Administer ETP ETP Administration Disable Disabled Enable - ETP File Storage Group Name - no entry + Administer ETP + ETP File Storage There should be only one instance of ETP for admin purposes ETP + no entry Index: openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp 20 Nov 2006 20:00:23 -0000 1.2.2.1 +++ openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp 22 Nov 2006 10:03:18 -0000 1.2.2.2 @@ -33,11 +33,9 @@ - #edit-this-page-portlet.noentry_edit-this-page# + #edit-this-page-portlet.noentry_edit-this-page# - - #new-portal.when_portlet_shaded# - +   \ No newline at end of file Index: openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml,v diff -u -r1.2.4.3 -r1.2.4.4 --- openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:23 -0000 1.2.4.3 +++ openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:18 -0000 1.2.4.4 @@ -316,7 +316,7 @@ Gewichtung innerhalb der <br /> gesamt zu erreichenden %grade_weight%% <br /> f�r "%grade_plural_name%" Die Gewichtung �bersteigt %grade_weight%% von %grade_plural_name%"} {html {size 5}} {help_text "<#_ Sie k�nnen die Gewichtung �ber %grade_weight%% von %grade_plural_name% angeben. Sie k�nnen aber auch den Nettowert in dem Feld darunter angeben. Gewichtung in den %grade_weight%% von %grade_plural_name% - Die Gewichtung die in %grade_plural_name%: %category_weight%% (von 100% von %grade_plural_name%) <br /> %grade_plural_name% genutzt wird macht %grade_weight%% von 100% der gesamten Klassenleistung aus. + Die Gewichtung die in $grade_plural_name: ${category_weight}% (of 100% of $grade_plural_name) <br /> $grade_plural_name genutzt wird macht ${grade_weight}% von 100% der gesamten Klassenleistung aus. Die Gewichtung die in $grade_plural_name: ${category_weight}% (of 100% of $grade_plural_name) <br /> $grade_plural_name genutzt wird macht ${grade_weight}% von 100% der gesamten Klassenleistung aus. Die Gewichtung die in %grade_plural_name%: %category_weight%% (of 100% of %grade_plural_name%) <br /> %grade_plural_name% genutzt wird macht %grade_weight%% von 100% der gesamten Klassenleistung aus. Soll der Student dazu in der Lage sein, die Benotung einzusehen? (1 = JA, 2 = NEIN) Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:23 -0000 1.1.2.3 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:18 -0000 1.1.2.4 @@ -1,5 +1,5 @@ - + Hinzuf�gen %grade_name% Antwort hinzuf�gen/ver�ndern @@ -19,7 +19,7 @@ Evaluierung administrieren Gewichtungsverteilung von "%grade_plural_name%" ver�ndern Admin Portlet f�r Bewertungen - Evaluierung administrieren + Bewertungen administrieren Admin Portlet f�r Aufgabenzuweisungen Gruppen administrieren <small>Gesamtpunkte in dieser Kategorie: %total_grade%/%max_grade%<br /> Diese Bewertungskategorie macht %grade_weight%% von 100% der Gesamtklassenleistung aus</small> @@ -36,7 +36,6 @@ Keine Gruppe f�r diese Aufgabe nicht vorhanden nicht bewertet - Portlet-Darstellung Anwort abschicken Antwort nochmal abschicken %task_name% (keine Daten) Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql,v diff -u -r1.3.2.3 -r1.3.2.4 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql 20 Nov 2006 20:00:23 -0000 1.3.2.3 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql 22 Nov 2006 10:03:19 -0000 1.3.2.4 @@ -5,7 +5,7 @@ - select grade_plural_name as grade_plural_name, grade_plural_name as low_name,grade_name,weight as grade_weight,weight as category_weight from evaluation_grades where grade_id = :grade_id + select upper(grade_plural_name) as grade_plural_name, grade_plural_name as low_name,grade_name,weight as grade_weight,weight as category_weight from evaluation_grades where grade_id = :grade_id Index: openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:24 -0000 1.10.2.3 +++ openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:19 -0000 1.10.2.4 @@ -6,9 +6,7 @@ Verwalten Alle F&amp;As Antwort - Antwort im HTML-Format Zur�ck zu FAQs - &Auml;nderungen &uuml;bernehmen Konfigurieren Neues FAQ erstellen Neues FAQ erstellen @@ -39,13 +37,11 @@ Eine Frage Einfacher Text Vorformatierter Text - FAQ Vorschau F: F&A auf getrennten Seiten? F&A auf getrennten Seiten? Frage - Frage im HTML-Format Um eins nach unten verschieben Format Titel: Index: openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml,v diff -u -r1.11.2.5 -r1.11.2.6 --- openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:24 -0000 1.11.2.5 +++ openacs-4/packages/faq/catalog/faq.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:19 -0000 1.11.2.6 @@ -40,7 +40,6 @@ One Question Plain Preformatted - FAQ preview Q: Q&A On Separate Pages? Index: openacs-4/packages/faq/lib/faq-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/lib/faq-add-edit.tcl,v diff -u -r1.1.6.1 -r1.1.6.2 --- openacs-4/packages/faq/lib/faq-add-edit.tcl 20 Nov 2006 20:00:24 -0000 1.1.6.1 +++ openacs-4/packages/faq/lib/faq-add-edit.tcl 22 Nov 2006 10:03:19 -0000 1.1.6.2 @@ -5,8 +5,8 @@ ad_form -name faq_add_edit -mode $mode -action "[ad_conn package_url]admin/faq-add-edit" -form { faq_id:key - {faq_name:text(text) {label "#faq.Name#"} {html { size 50 }}} - {separate_p:text(select) {label "#faq.QA_on_Separate_Pages#"} { options {{[_ faq.No] f} {[_ faq.Yes] t}} } } + {faq_name:text(text) {label "FAQ Name"} {html { size 50 }}} + {separate_p:text(select) {label "Each Q&A on separate page"} { options {{No f} {Yes t}} } } } -select_query { select faq_name,separate_p from faqs where faq_id = :faq_id Index: openacs-4/packages/faq/www/admin/configure.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/configure.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/faq/www/admin/configure.tcl 20 Nov 2006 20:00:24 -0000 1.2.2.1 +++ openacs-4/packages/faq/www/admin/configure.tcl 22 Nov 2006 10:03:19 -0000 1.2.2.2 @@ -18,11 +18,11 @@ ad_form -name categories_mode -form { {cat_enabled_p:text(radio) {label "#faq.Enable_Categories#"} - {options {{[_ faq.Yes] 1} {[_ faq.No] 0}}} + {options {{Yes 1} {No 0}}} {value $use_categories_p}} {wysiwyg_enabled_p:text(radio) {label "#faq.Enable_WYSIWYG#"} - {options {{[_ faq.Yes] t} {[_ faq.No] f}}} + {options {{Yes t} {No f}}} {value $use_wysiwyg_p} } {return_url:text(hidden) {value $return_url}} Index: openacs-4/packages/faq-portlet/catalog/faq-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/catalog/faq-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/faq-portlet/catalog/faq-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:24 -0000 1.12.2.3 +++ openacs-4/packages/faq-portlet/catalog/faq-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:19 -0000 1.12.2.4 @@ -1,5 +1,5 @@ - + FAQs verwalten Deaktivieren Index: openacs-4/packages/faq-portlet/www/faq-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.adp,v diff -u -r1.19.2.2 -r1.19.2.3 --- openacs-4/packages/faq-portlet/www/faq-portlet.adp 20 Nov 2006 20:00:24 -0000 1.19.2.2 +++ openacs-4/packages/faq-portlet/www/faq-portlet.adp 22 Nov 2006 10:03:19 -0000 1.19.2.3 @@ -19,23 +19,80 @@ %> - - @faq_name@ - + + + +<% + set new_package_id "" + set old_package_id "" +%> + + + + + + + + + +
      + + + + +<% set new_package_id $faqs(package_id) %> + + +
    + + + +
  • + @faqs.faq_name@ +
    • +     + + + - - #faq-portlet.no_faqs# - - - - + + + + + + + + +<% set old_package_id $new_package_id %> + + + + + + + +
    #faq-portlet.name##dotlrn.clubs_pretty_name#
    @faqs.faq_name@@faqs.parent_name@
    +     + + + + +     + + + @faq_name@ + + + + #faq-portlet.no_faqs# + + +     - - #new-portal.when_portlet_shaded# - +   \ No newline at end of file Index: openacs-4/packages/faq-portlet/www/faq-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.tcl,v diff -u -r1.15.12.1 -r1.15.12.2 --- openacs-4/packages/faq-portlet/www/faq-portlet.tcl 20 Nov 2006 20:00:24 -0000 1.15.12.1 +++ openacs-4/packages/faq-portlet/www/faq-portlet.tcl 22 Nov 2006 10:03:19 -0000 1.15.12.2 @@ -30,19 +30,6 @@ set list_of_package_ids $config(package_id) set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] -template::list::create -name faqs -multirow faqs -key faq_id -pass_properties { -} -elements { - item { - label "" - display_template { - @faqs.parent_name@
    - - » @faqs.faq_name@
    -     - } - } -} - db_multirow faqs select_faqs {} if {${faqs:rowcount} == 1} { Index: openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml,v diff -u -r1.14.2.6 -r1.14.2.7 --- openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:24 -0000 1.14.2.6 +++ openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:20 -0000 1.14.2.7 @@ -1,11 +1,10 @@ - + �nderung Aktion Aktionen: Aktionen - Wenn Sie eine Datei mit demselben Namen hochladen, wird dem Dateinamen zur Unterscheidung ein Suffix angeh�ngt. Bitte beachten Sie, dass es sich hierbei nicht um einen Titel f�r die Datei handelt. Diesen k�nnen Sie beliebig w�hlen. Der Dateiname hingegen mu� immer eindeutig sein. Datei hochladen %pretty_name% hinzuf�gen Autor @@ -53,7 +52,6 @@ Ordner-ID Ordnername: Ordner - Warnung! Eine Ebene nach oben zu %up_name% Element Elemente @@ -136,7 +134,6 @@ URL nicht gefunden PDF Berechtigungen - Dateisystem Eigenschaften Umbenennen Datei umbenennen @@ -168,7 +165,6 @@ Hochgeladen von: %owner% URL: URL gel�scht - Verwenden Sie dieses Formular, um eine ZIP-Datei hochzuladen. Der Inhalt wird in ein Verzeichnis mit obigem Namen oder dem der ZIP-Datei entpackt. Neue Version von "%title%" hochladen "%version_name%" l�schen Dateiname der Version Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v diff -u -r1.32.2.13 -r1.32.2.14 --- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:25 -0000 1.32.2.13 +++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:20 -0000 1.32.2.14 @@ -7,9 +7,9 @@ Actions If you upload a file with the same name as a file already in this folder, we will alter your new file's name by adding an incremental suffix (eg. &quot;mydoc.doc&quot; -&gt; &quot;mydoc-1.doc&quot;) and making it a new, separate file. <br /><br /><em>Note that this is not the Title of the file, which you can specify as you like. This is the File Name, which must be unique in each folder.</em> Add File + Add Revision Add folder from file system Add %pretty_name% - Add Revision Author Back to folder view Back to project @@ -56,7 +56,6 @@ Folder ID Folder Name: folder - Important! Up to %up_name% item items @@ -145,7 +144,6 @@ No valid destination folder exists PDF Permissions - File-Storage properties Rename Rename File @@ -179,7 +177,6 @@ Uploaded by: %owner% URL: URL deleted - Use this form to upload a ZIP file (its contents will be extracted into a folder with the title you enter above). Upload New Version of %title% Delete %version_name% Version filename Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/file-storage/www/folder-zip-add.tcl 20 Nov 2006 20:00:25 -0000 1.1.2.4 +++ openacs-4/packages/file-storage/www/folder-zip-add.tcl 22 Nov 2006 10:03:20 -0000 1.1.2.5 @@ -79,7 +79,7 @@ if {[ad_form_new_p -key file_id]} { ad_form -extend -name file_add -form { - {unpack_message:text(inform) {label "[_ file-storage.Important]"} {value "[_ file-storage.Use_this_form_to_upload_a_ZIP]"}} + {unpack_message:text(inform) {label "Important!"} {value "Use this form to upload a ZIP file (its contents will be extracted into a folder with the title you enter above)."}} } } Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.32.2.4 -r1.32.2.5 --- openacs-4/packages/forums/forums.info 20 Nov 2006 20:00:25 -0000 1.32.2.4 +++ openacs-4/packages/forums/forums.info 22 Nov 2006 10:03:20 -0000 1.32.2.5 @@ -17,8 +17,8 @@ - + @@ -34,7 +34,6 @@ - Index: openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.2 -r1.12.2.3 --- openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:25 -0000 1.12.2.2 +++ openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:20 -0000 1.12.2.3 @@ -3,35 +3,28 @@ Forum verwalten Diskussionsforen verwalten - Sie koennen in diesem Forum Ihre Nachricht auch anonym senden. Anonym Freigeben Wollen Sie diesen Beitrag und <strong>alle zugeh�rigen Antworten </strong> wirklich l�schen? Anh�ngen? Anh�nge: Verfasser - Verf�gbare Foren Zur�ck zu %forum.name% <a href="%thread_url%">Zur�ck</a> zu %forum.name% Text nach Datum nach Forum Beschreibung Geschlossen - zuklappen Best�tigen L�schen best�tigen: - Verschieben best�tigen Forumsbeitrag best�tigen: Neues Forum erstellen Neues Forum erstellen L�schen - Direkter Link zu dieser Nachricht Deaktivieren deaktivieren Deaktiviert - Anzeige anpassen: - Zeige vollstaendige Nachrichten Bearbeiten Bearbeiten Erneut bearbeiten @@ -45,10 +38,8 @@ aktivieren aktiviert Gesamter Thread - aufklappen Erster Beitrag Chronologisch geordnet - flach Format Forum Forum: @@ -62,11 +53,8 @@ Weiterleiten Fwd: HTML - In diesem Forum wird anstatt ihres Namens ihr Alias angezeigt: - Zeige nur die Ueberschriften Letzter Beitrag Letzter Beitrag zum Thema - Link zu dieser Nachricht in einem neuen Fenster Eine Kopie des folgenden Beitrags per E-Mail versenden: Erster Beitrag zum Thema Diskussionsforen verwalten @@ -86,29 +74,13 @@ Beitrags-ID Moderieren Moderiert - Verschiebe Nachricht - Verschiebe Nachricht in Forum:: - Verschiebe Nachricht zu Nachricht - Verschiebe Thread - Verschiebe Thread in Forum - Verschiebe Nachricht zu anderer Nachricht - Verschiebe Thread in ein anderes Forum - Verschiebe Thread in anderen Thread - Verschiebe den Thread in den Thread - Verschiebe Thread in den Thread - Verschiebe nach - Verschiebe in einen anderen Thread Name - einger�ckt Neues Forum erstellen Nein Keine Diskussionsforen vorhanden - Zeige Nachrichten nicht eingerueckt Keine Beitr�ge vorhanden Keine Beitr�ge vorhanden Kein Forum vorhanden - Entschuldigung, aber es scheint, dass Sie nicht die benoetigten Rechten besitzen. - am Einzelner Beitrag Einzelner Thread Offen @@ -128,10 +100,7 @@ Verlauf der Beitr�ge f�r Teilnahmeregelung Darstellungsform - Foren Vorschau - drucken - Druckansicht Re: Ablehnen Abgelehnt @@ -143,15 +112,13 @@ Suche Suche: In Foren suchen - Entschuldigen Sie, aber es gibt kein anderes Forum, in welches dieser Thread geschoben werden k�nnte. Betreff Benachrichtigungsfunktion aktivieren? Einfacher Text Dieses Forum ist Strukturiert Diskussionsthemen Ansicht - Zeige Nachrichten eingerueckt Ja Sie k�nnen es Ihr Kommentar 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.2.4 -r1.30.2.5 --- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:25 -0000 1.30.2.4 +++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:20 -0000 1.30.2.5 @@ -4,7 +4,6 @@ Administrative options for all forums. Administer Administration - You can post in this forum anonymiously. Anonymous approve Are you sure you want to delete this message and <strong>all replies to it</strong>? @@ -13,7 +12,6 @@ Attach? Attachments: Author - Available Forums Back to %forum.name% <a href="%thread_url%">Back</a> to %forum.name% Body @@ -22,20 +20,16 @@ Charter Charter exceeds maximum length (4000 characters) closed - Collapse Confirm? Confirm Delete: Confirm Move to Confirm Post to Forum: Create a New Forum Create New Forum Delete - Direct link to this post disable disable it disabled - Display as: - Display full posts Edit Edit Edit again @@ -51,10 +45,8 @@ 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 - Expand First Post Flat - Flat Format Forum Forum: @@ -74,11 +66,8 @@ <b>Flat</b> only allows replies at the end of a thread with no nesting or threading, <b>Threaded</b> allows replies to be made to any post in the thread and the reply will be indented under the post they are associated with. HTML If checked, create users that don't exist: - In this forum your screenname is used instead of your realname as follows: - Just display subjects Last Post Last post in subject - Link to this post on a separate page List of users that wrote in the forum: Email a copy of the following message: First post in subject @@ -115,18 +104,14 @@ Name Name Forum Name - Nested New Forum No No Forums - No indentation for replies No Messages No Postings. None - We're sorry, but it appears that you do not have the permission to perform this operation. Number of Posts of forum - on One Message One Thread open @@ -148,10 +133,7 @@ Posting history for Posting Policy Presentation - Forums Preview - Print - Printable view Re: reject Rejected @@ -182,7 +164,6 @@ User Users that wrote in the forum View - With indentation of replies Yes You may Your Note Index: openacs-4/packages/forums/lib/message/messages-table.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/messages-table.adp,v diff -u -r1.1.6.2 -r1.1.6.3 --- openacs-4/packages/forums/lib/message/messages-table.adp 20 Nov 2006 20:00:25 -0000 1.1.6.2 +++ openacs-4/packages/forums/lib/message/messages-table.adp 22 Nov 2006 10:03:20 -0000 1.1.6.3 @@ -19,7 +19,7 @@ @messages.subject@ - @messages.screen_name@@messages.user_name@ + @messages.user_name@ @messages.posting_date@ Index: openacs-4/packages/forums/lib/message/messages-table.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/messages-table.tcl,v diff -u -r1.1.6.1 -r1.1.6.2 --- openacs-4/packages/forums/lib/message/messages-table.tcl 20 Nov 2006 20:00:25 -0000 1.1.6.1 +++ openacs-4/packages/forums/lib/message/messages-table.tcl 22 Nov 2006 10:03:20 -0000 1.1.6.2 @@ -12,7 +12,6 @@ set table_border_color [parameter::get -parameter table_border_color] set table_bgcolor [parameter::get -parameter table_bgcolor] set table_other_bgcolor [parameter::get -parameter table_other_bgcolor] -set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] if {[exists_and_not_null alt_template]} { ad_return_template $alt_template Index: openacs-4/packages/forums/lib/message/post.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.adp,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/forums/lib/message/post.adp 20 Nov 2006 20:00:25 -0000 1.2.2.1 +++ openacs-4/packages/forums/lib/message/post.adp 22 Nov 2006 10:03:20 -0000 1.2.2.2 @@ -3,6 +3,5 @@
    -#forums.in_this_forum_your_screename_is_used# "@screen_name@"
    -#forums.anonymious_posts_are_allowed# + Index: openacs-4/packages/forums/lib/message/post.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/forums/lib/message/post.tcl 20 Nov 2006 20:00:25 -0000 1.7.2.2 +++ openacs-4/packages/forums/lib/message/post.tcl 22 Nov 2006 10:03:20 -0000 1.7.2.3 @@ -9,9 +9,6 @@ } set user_id [ad_conn user_id] -set screen_name [db_string select_screen_name { select screen_name from users where user_id = :user_id}] -set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] -set pvt_home [ad_pvt_home] if {[array exists parent_message]} { set parent_id $parent_message(message_id) @@ -110,7 +107,6 @@ set message(content) $content set message(user_id) $displayed_user_id set message(user_name) [db_string select_name {}] - set message(screen_name) $screen_name set message(posting_date_ansi) [db_string select_date {}] set message(posting_date_pretty) [lc_time_fmt $message(posting_date_ansi) "%x %X"] @@ -154,7 +150,7 @@ set redirect_message_id $message(root_message_id) } - set redirect_url "[ad_conn package_url]message-view?message_id=[set redirect_message_id]&\#$message_id" + set redirect_url "[ad_conn package_url]message-view?message_id=[set redirect_message_id]\#$message_id" # Wrap the notifications URL if {![empty_string_p $subscribe_p] && $subscribe_p && [empty_string_p $parent_id]} { Index: openacs-4/packages/forums/lib/message/row.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/forums/lib/message/row.adp 20 Nov 2006 20:00:25 -0000 1.10.2.1 +++ openacs-4/packages/forums/lib/message/row.adp 22 Nov 2006 10:03:20 -0000 1.10.2.2 @@ -34,27 +34,22 @@
    - @message.number@: - @message.subject@ + @message.number@: + @message.subject@
    @message.subject@ -
    @message.number@ +
    @message.number@ (response to @message.parent_number@)
    -
    - #forums.Posted_by# - @message.screen_name@ - @message.user_name@ #forums.on# @message.posting_date_pretty@ +
    #forums.Posted_by# @message.user_name@ on @message.posting_date_pretty@
    -
    @message.content;noquote@ Index: openacs-4/packages/forums/lib/message/row.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/forums/lib/message/row.tcl 20 Nov 2006 20:00:25 -0000 1.5.2.1 +++ openacs-4/packages/forums/lib/message/row.tcl 22 Nov 2006 10:03:20 -0000 1.5.2.2 @@ -10,7 +10,6 @@ } set viewer_id [ad_conn user_id] -set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] if {![exists_and_not_null rownum]} { set rownum 1 Index: openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql 20 Nov 2006 20:00:25 -0000 1.5.2.1 +++ openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql 22 Nov 2006 10:03:20 -0000 1.5.2.2 @@ -18,46 +18,42 @@ select message_id, 0 as n_attachments, - t.subject, - t.content, - t.format, - person__name(t.user_id) as user_name, - to_char(t.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - tree_level(t.tree_sortkey) as tree_level, - t.state, - t.user_id, - t.parent_id, - t.open_p, - t.max_child_sortkey, - u.screen_name - from $table_name t, users u - where t.forum_id = :forum_id - and u.user_id = t.user_id - and t.tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey) + subject, + content, + format, + person__name(user_id) as user_name, + to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, + tree_level(tree_sortkey) as tree_level, + state, + user_id, + parent_id, + open_p, + max_child_sortkey + from $table_name + where forum_id = :forum_id + and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey) order by $order_by select message_id, - (select count(*) from attachments where object_id = t.message_id) as n_attachments, - t.subject, - t.content, - t.format, - person__name(t.user_id) as user_name, - to_char(t.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - tree_level(t.tree_sortkey) as tree_level, - t.state, - t.user_id, - t.parent_id, - t.open_p, - t.max_child_sortkey, - u.screen_name - from $table_name t, users u - where t.forum_id = :forum_id - and u.user_id = t.user_id - and t.tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey) + (select count(*) from attachments where object_id = message_id) as n_attachments, + subject, + content, + format, + person__name(user_id) as user_name, + to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, + tree_level(tree_sortkey) as tree_level, + state, + user_id, + parent_id, + open_p, + max_child_sortkey + from $table_name + where forum_id = :forum_id + and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey) order by $order_by Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/forums/lib/message/thread-chunk.tcl 20 Nov 2006 20:00:25 -0000 1.5.2.1 +++ openacs-4/packages/forums/lib/message/thread-chunk.tcl 22 Nov 2006 10:03:20 -0000 1.5.2.2 @@ -78,7 +78,7 @@ # More Tcl vars (we might as well use them - Ben) if { [string equal $forum(presentation_type) flat] } { - set order_by "t.posting_date, tree_sortkey" + set order_by "$table_name.posting_date, tree_sortkey" } else { set order_by "tree_sortkey" } Index: openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/threads-chunk-postgresql.xql,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql 20 Nov 2006 20:00:25 -0000 1.3.2.1 +++ openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql 22 Nov 2006 10:03:20 -0000 1.3.2.2 @@ -26,12 +26,9 @@ fm.state, $replies as n_messages, to_char(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi, - case when fm.last_child_post > (now() - interval '1 day') then 't' else 'f' end as new_p, - u.screen_name - from forums_messages_approved fm, - users u + case when fm.last_child_post > (now() - interval '1 day') then 't' else 'f' end as new_p + from forums_messages_approved fm where fm.forum_id = :forum_id - and fm.user_id = u.user_id and fm.parent_id is null [template::list::page_where_clause -and -name messages -key fm.message_id] [template::list::orderby_clause -orderby -name messages] 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.2.4 -r1.3.2.5 --- openacs-4/packages/forums/lib/message/threads-chunk.tcl 20 Nov 2006 20:00:25 -0000 1.3.2.4 +++ openacs-4/packages/forums/lib/message/threads-chunk.tcl 22 Nov 2006 10:03:20 -0000 1.3.2.5 @@ -110,8 +110,6 @@ forum_id {} } -set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] - db_multirow -extend { last_child_post_pretty posting_date_pretty @@ -127,12 +125,7 @@ set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] set message_url [export_vars -base "${base_url}message-view" { message_id }] - if { $useScreenNameP } { - set user_name $screen_name - set user_url "" - } else { - set user_url [export_vars -base "${base_url}user-history" { user_id }] - } + set user_url [export_vars -base "${base_url}user-history" { user_id }] set n_messages_pretty [lc_numeric $n_messages] switch $state { Index: openacs-4/packages/forums/lib/search/search-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk.tcl,v diff -u -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/forums/lib/search/search-chunk.tcl 20 Nov 2006 20:00:25 -0000 1.2.2.2 +++ openacs-4/packages/forums/lib/search/search-chunk.tcl 22 Nov 2006 10:03:20 -0000 1.2.2.3 @@ -6,7 +6,6 @@ } set package_id [ad_conn package_id] -set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] set searchbox_p [parameter::get -parameter ForumsSearchBoxP -package_id $package_id -default 1] if {$searchbox_p} { @@ -28,18 +27,11 @@ if { [parameter::get -parameter UseIntermediaForSearchP -default 0] } { append query "_intermedia" } - - if { $useScreenNameP == 1 } { - db_multirow -extend { screen_name } messages $query {} { - set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] - set screen_name [db_string select_screen_name {select screen_name from users where user_id = :user_id}] - } - } else { - db_multirow messages $query {} { - set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] - } - } - + + db_multirow messages $query {} { + set posting_date [lc_time_fmt $posting_date_ansi "%x %X"] + } + } else { set messages:rowcount 0 } Index: openacs-4/packages/forums/tcl/forums-email-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-email-procs.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/forums/tcl/forums-email-procs.tcl 20 Nov 2006 20:00:25 -0000 1.3.2.1 +++ openacs-4/packages/forums/tcl/forums-email-procs.tcl 22 Nov 2006 10:03:21 -0000 1.3.2.2 @@ -21,12 +21,7 @@ # Variables for I18N message lookup: set posting_date $message(posting_date_ansi) - set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] - if {$useScreenNameP != 0} { - set user_name $message(screen_name) - } else { - set user_name $message(user_name) - } + set user_name $message(user_name) # Set up the message body set new_body "[ad_html_to_text -- $pre_body]" Index: openacs-4/packages/forums/tcl/messages-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/Attic/messages-procs-postgresql.xql,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/forums/tcl/messages-procs-postgresql.xql 20 Nov 2006 20:00:25 -0000 1.9.2.1 +++ openacs-4/packages/forums/tcl/messages-procs-postgresql.xql 22 Nov 2006 10:03:21 -0000 1.9.2.2 @@ -11,14 +11,12 @@ party__email(forums_messages.user_id) as user_email, forums_forum__name(forums_messages.forum_id) as forum_name, forums_message__root_message_id(forums_messages.message_id) as root_message_id, - users.screen_name, (select fm2.subject from forums_messages fm2 where fm2.message_id = forums_message__root_message_id(forums_messages.message_id)) as root_subject, to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi - from forums_messages, users + from forums_messages where forums_messages.message_id= :message_id - and forums_messages.user_id = users.user_id @@ -30,14 +28,12 @@ party__email(forums_messages.user_id) as user_email, forums_forum__name(forums_messages.forum_id) as forum_name, forums_message__root_message_id(forums_messages.message_id) as root_message_id, - users.screen_name, (select fm2.subject from forums_messages fm2 where fm2.message_id = forums_message__root_message_id(forums_messages.message_id)) as root_subject, to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi - from forums_messages, users + from forums_messages where forums_messages.message_id= :message_id - and forums_messages.user_id = users.user_id Index: openacs-4/packages/forums/tcl/messages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v diff -u -r1.31.2.2 -r1.31.2.3 --- openacs-4/packages/forums/tcl/messages-procs.tcl 20 Nov 2006 20:00:25 -0000 1.31.2.2 +++ openacs-4/packages/forums/tcl/messages-procs.tcl 22 Nov 2006 10:03:21 -0000 1.31.2.3 @@ -44,7 +44,7 @@ get -message_id $message_id -array message if {[info exists message(state)] && [string equal $message(state) approved]} { - do_notifications -message_id $message_id -user_id $user_id + do_notifications -message_id $message_id } } on_error { @@ -73,24 +73,13 @@ ad_proc -public forum::message::do_notifications { {-message_id:required} - {-user_id ""} } { # Select all the important information forum::message::get -message_id $message_id -array message set forum_id $message(forum_id) set url "[ad_url][db_string select_forums_package_url {}]" - set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] - if {($useScreenNameP == 0) && ($user_id != 0)} { - if {[empty_string_p $user_id]} { - set user_id [ad_conn user_id] - } - } else { - set user_id [party::get_by_email -email [ad_parameter -package_id [ad_acs_kernel_id] HostAdministrator]] - } - set notif_user $user_id - set attachments [attachments::get_attachments -object_id $message(message_id)] set message_text [ad_html_text_convert -from $message(format) -to text/plain -- $message(content)] @@ -99,11 +88,7 @@ set html_version "" append html_version "Forum: $message(forum_name)
    \n" append html_version "Thread: $message(root_subject)
    \n" - if {$useScreenNameP == 0} { - append html_version "Author: $message(user_name)
    \n" - } else { - append html_version "Author: $message(screen_name)
    \n" - } + append html_version "Author: $message(user_name)
    \n" append html_version "Posted: $message(posting_date)
    " append html_version "\n
    \n" append html_version $message_html @@ -126,13 +111,8 @@ set text_version "" append text_version " Forum: $message(forum_name) -Thread: $message(root_message_id)\n" - if {$useScreenNameP == 0} { - append text_version "Author: $message(user_name)" - } else { - append text_version "Author: $message(screen_name)" - } - append text_version " +Thread: $message(root_message_id) +Author: $message(user_name) Posted: $message(posting_date) ---------------------------------- $message_text Index: openacs-4/packages/forums/www/message-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v diff -u -r1.28.2.5 -r1.28.2.6 --- openacs-4/packages/forums/www/message-view.adp 20 Nov 2006 20:00:26 -0000 1.28.2.5 +++ openacs-4/packages/forums/www/message-view.adp 22 Nov 2006 10:03:21 -0000 1.28.2.6 @@ -28,11 +28,11 @@
    - #forums.display_as# #forums.flat# - #forums.nested# - #forums.collapse# - #forums.expand# - #forums.print# + Display as: Flat + Nested + Collapse + Expand + Print
      Index: openacs-4/packages/forums/www/not-allowed.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/not-allowed.adp,v diff -u -r1.3.8.1 -r1.3.8.2 --- openacs-4/packages/forums/www/not-allowed.adp 20 Nov 2006 20:00:26 -0000 1.3.8.1 +++ openacs-4/packages/forums/www/not-allowed.adp 22 Nov 2006 10:03:21 -0000 1.3.8.2 @@ -2,4 +2,4 @@ Action Not Allowed @context;noquote@ -#forums.not_allowed# \ No newline at end of file +We're sorry, but it appears that you do not have the permission to perform this operation. \ No newline at end of file Index: openacs-4/packages/forums-portlet/catalog/forums-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/catalog/forums-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/forums-portlet/catalog/forums-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:26 -0000 1.12.2.3 +++ openacs-4/packages/forums-portlet/catalog/forums-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:21 -0000 1.12.2.4 @@ -1,5 +1,5 @@ - + Diskussionsforen verwalten Deaktiviert @@ -9,6 +9,4 @@ Neues Forum erstellen Keine Diskussionsforen vorhanden Diskussionsforen - <img src="/resources/acs-subsite/new_de_DE.gif" /> - Index: openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.15.2.4 -r1.15.2.5 --- openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:26 -0000 1.15.2.4 +++ openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:21 -0000 1.15.2.5 @@ -10,5 +10,4 @@ New Forum No Forums Forums - <img src="/resources/acs-subsite/new.gif" /> Index: openacs-4/packages/forums-portlet/www/forums-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.adp,v diff -u -r1.18.2.2 -r1.18.2.3 --- openacs-4/packages/forums-portlet/www/forums-portlet.adp 20 Nov 2006 20:00:26 -0000 1.18.2.2 +++ openacs-4/packages/forums-portlet/www/forums-portlet.adp 22 Nov 2006 10:03:21 -0000 1.18.2.3 @@ -18,14 +18,35 @@ %> - - - - - - #new-portal.when_portlet_shaded# - - + + + + @forums.parent_name@ + + + + + #forums-portlet.No_Forums# + + + + +   + + + + Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v diff -u -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/forums-portlet/www/forums-portlet.tcl 20 Nov 2006 20:00:26 -0000 1.12.2.3 +++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl 22 Nov 2006 10:03:21 -0000 1.12.2.4 @@ -20,10 +20,6 @@ set list_of_package_ids $config(package_id) set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] -# get the parameter from forums-portlet to set the new-graphic correspondingly -set package_id [apm_package_id_from_key [forums_portlet::my_package_key]] -set default_new_period [parameter::get -package_id $package_id -parameter DefaultPeriodNewGraphic -default 2] - set query select_forums if { [acs_privacy::privacy_control_enabled_p] } { @@ -34,25 +30,4 @@ set user_id [ad_conn user_id] -template::list::create -name forums -multirow forums -key forum_id -pass_properties { -} -elements { - item { - label "" - display_template { - @forums.parent_name@
      - - - » @forums.name@ - - #forums-portlet.resources_acs-subsite_new_gif#
      -       -       - - » @forums.name@
      -       -       - } - } -} - db_multirow forums $query {} Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.7 -r1.10.2.8 --- openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:26 -0000 1.10.2.7 +++ openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:21 -0000 1.10.2.8 @@ -1,5 +1,5 @@ - + (<font=red>Fortgeschritten</font>) Byte Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.12.2.5 -r1.12.2.6 --- openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:26 -0000 1.12.2.5 +++ openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:21 -0000 1.12.2.6 @@ -1,5 +1,5 @@ - + (<font=red>Advanced</font>) byte Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp 20 Nov 2006 20:00:26 -0000 1.13.2.1 +++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp 22 Nov 2006 10:03:21 -0000 1.13.2.2 @@ -18,16 +18,8 @@ %> - -

      @notification_chunk;noquote@

      #file-storage.Folder_available_via_WebDAV_at#

       -       - - - #new-portal.when_portlet_shaded# - - Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v diff -u -r1.29.2.6 -r1.29.2.7 --- openacs-4/packages/fs-portlet/www/fs-portlet.adp 20 Nov 2006 20:00:26 -0000 1.29.2.6 +++ openacs-4/packages/fs-portlet/www/fs-portlet.adp 22 Nov 2006 10:03:21 -0000 1.29.2.7 @@ -44,14 +44,75 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + @folders.name@ + #file-storage.folder_type_pretty_name#0 #fs-portlet.items#@folders.content_size@ #fs-portlet.items#@folders.content_size@ #fs-portlet.item#  + + + @folders.name@ + @folders.type@   + + + @folders.name@ + @folders.type@@folders.content_size@ #fs-portlet.byte##fs-portlet.bytes# + [#fs-portlet.view_details#] + +
      + + - - #new-portal.when_portlet_shaded# - +  

      @notification_chunk;noquote@

      Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v diff -u -r1.19.2.3 -r1.19.2.4 --- openacs-4/packages/fs-portlet/www/fs-portlet.tcl 20 Nov 2006 20:00:26 -0000 1.19.2.3 +++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl 22 Nov 2006 10:03:21 -0000 1.19.2.4 @@ -85,61 +85,6 @@ if {$scoped_p} { set scope_fs_url "/packages/file-storage/www/folder-chunk" } else { - - template::list::create -name folders -multirow folders -key forum_id -pass_properties { - } -elements { - item { - label "" - display_template { - - - -
      - #file-storage.folder_type_pretty_name# - - 0 #fs-portlet.items# - - - - @folders.content_size@ #fs-portlet.items# - - - @folders.content_size@ #fs-portlet.item# - - -
      -       - - -
      - - @folders.name@ - @folders.type@ -
      -       - - -
      - @folders.type@ - @folders.content_size@ #fs-portlet.byte##fs-portlet.bytes# - \[#fs-portlet.view_details#\] -
      -       -       -       - } - } - } - db_multirow folders $query { # The name of the folder may contain message keys that need to be localized on the fly set name [lang::util::localize $name] Index: openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql 20 Nov 2006 20:00:26 -0000 1.7.2.2 +++ openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql 22 Nov 2006 10:03:21 -0000 1.7.2.3 @@ -5,7 +5,7 @@ - + select g.comment_id, r.title, r.mime_type, @@ -17,8 +17,7 @@ cr_revisions r, acs_objects o where g.object_id = :object_id and - r.revision_id = - content_item__get_live_revision(g.comment_id) and + r.revision_id = content_item__get_live_revision(g.comment_id) and o.object_id = g.comment_id $context_clause $my_comments_clause @@ -31,6 +30,7 @@ + select g.comment_id, r.title, r.content, Index: openacs-4/packages/new-portal/catalog/new-portal.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.de_DE.ISO-8859-1.xml,v diff -u -r1.10.2.5 -r1.10.2.6 --- openacs-4/packages/new-portal/catalog/new-portal.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:27 -0000 1.10.2.5 +++ openacs-4/packages/new-portal/catalog/new-portal.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:22 -0000 1.10.2.6 @@ -1,5 +1,5 @@ - + Seite hinzuf�gen Falsche Richtung: @@ -46,5 +46,4 @@ MIT Sloan Transaktion fehlgeschlagen Nicht verwendete Portlets - Maximieren Sie das Fenster, um den Inhalt zu sehen. Index: openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml,v diff -u -r1.15.2.6 -r1.15.2.7 --- openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:27 -0000 1.15.2.6 +++ openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:22 -0000 1.15.2.7 @@ -1,5 +1,5 @@ - + Add Page Bad direction: @@ -46,5 +46,4 @@ Sloan transaction failed Unused Portlets - Maximize window to display content 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.2.4 -r1.10.2.5 --- openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml 20 Nov 2006 20:00:27 -0000 1.10.2.4 +++ openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml 22 Nov 2006 10:03:22 -0000 1.10.2.5 @@ -45,5 +45,4 @@ Sloan Transacci�n fallida Portlets disponibles - Maximice la ventana para ver el contenido. Index: openacs-4/packages/new-portal/catalog/new-portal.fr_FR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.fr_FR.ISO-8859-1.xml,v diff -u -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/new-portal/catalog/new-portal.fr_FR.ISO-8859-1.xml 20 Nov 2006 20:00:27 -0000 1.5.2.3 +++ openacs-4/packages/new-portal/catalog/new-portal.fr_FR.ISO-8859-1.xml 22 Nov 2006 10:03:22 -0000 1.5.2.4 @@ -20,5 +20,4 @@ Trois colonnes simple Portlets non utilis�s - Agrandir pour voir le contenue. 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.2.4 -r1.178.2.5 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 20 Nov 2006 20:00:27 -0000 1.178.2.4 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 22 Nov 2006 10:03:22 -0000 1.178.2.5 @@ -813,7 +813,7 @@ } elseif { ![empty_string_p [ns_set get $form "op_add_page"]] } { set pretty_name [ns_set get $form pretty_name] if {[empty_string_p $pretty_name]} { - ad_return_complaint 1 "[_ new-portal.lt_You_must_enter_new_na]" + ad_return_complaint 1 "You must enter a name for the new page." } page_create -pretty_name $pretty_name -portal_id $portal_id } elseif { ![empty_string_p [ns_set get $form "op_remove_empty_page"]] } { Index: openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml,v diff -u -r1.15.2.3 -r1.15.2.4 --- openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:27 -0000 1.15.2.3 +++ openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:23 -0000 1.15.2.4 @@ -17,8 +17,6 @@ Zur�ck zur Auflistung der Ank�ndigungen Text Bytes - W�hlen Sie ein Bild aus... - W�hlen Sie ein Bild aus und dr�cken Sie dann auf 'Hochladen' f�r die Vorschau. Wenn es Ihnen gef�llt dr�cken Sie anschlie�end auf '�bernehmen', um das Bild f�r die Ank�ndigung zu verwenden. Kommentare Best�tigen @@ -31,12 +29,10 @@ Datenbankfehler L�schen Fehler - Datei Los Ver�ffentlichung in %n_days_until_publish% Tagen, kein Archivierungsdatum festgelegt Ver�ffentlichung in %n_days_until_publish% Tagen, Archivierung in %n_days_until_archive% Tagen HTML - Das Bild mu� aus einem der folgenden Formate bestehen: Das Ver�ffentlichungsdatum ist der Das Archivierungsdatum ist der Kurztext @@ -94,15 +90,12 @@ Ank�ndigung in der Vorschau anzeigen Ver�ffentlichungsdatum Ver�ffentlichen - Ver�ffentlicht Ver�ffentlicht, kein Archivierungsdatum festgelegt Ver�ffentlicht, Archivierung in %n_days_until_archive% Tagen Freigeben Ver�ffentlichungsdatum - Zur�ck, um zu �ndern Vers. - Bearbeiten Neue Version hinzuf�gen Version Protokolleintrag @@ -121,11 +114,6 @@ Format: Betreff Nicht freigegeben - Hochladen - Bild hochladen - verwenden Sie die Vorschau, um das Bild zu �berpr�fen. - Verwenden Sie das nachfolgende Formular, um Ihre Ank�ndigung anzulegen. Felder mit sind Pflichtfelder. Sobald Sie fertig sind, k�nnen Sie �ber die 'Vorschau' die Ank�ndigung �berpr�fen und ein Bild hochladen. Ja - Sie k�nnen entweder eine Textnachricht hochladen oder die Nachricht direkt eingeben, aber nicht beides. Ihre Ank�ndigung       Index: openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml,v diff -u -r1.19.2.3 -r1.19.2.4 --- openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:28 -0000 1.19.2.3 +++ openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:23 -0000 1.19.2.4 @@ -17,8 +17,6 @@ Back to news list Body bytes - Choose an image... - Choose an image to upload and press the 'Upload' button to preview it. When you're happy, press 'Accept' to use that image in the article. Comments Confirm Confirm Action: @@ -30,13 +28,11 @@ Database Error Delete Error - File Go Going live in %n_days_until_publish% days, not scheduled for archive Going live in %n_days_until_publish% days, scheduled for archive in %n_days_until_archive% days History HTML - Image must be one of the following types: It will go live on It will move into the archive on Lead @@ -99,16 +95,13 @@ Preview news item Publication Date Publish - Published Published, not scheduled for archive Published, archived in %n_days_until_archive% days Release Release Date - Return to edit Rev. rev. - Revise revise Revision Revision history @@ -123,16 +116,11 @@ Show live news Status Submit a news item - Thank You + Thank You! The action The text is formatted as Title Unapproved - Upload - Upload Image - use 'preview' to revise image - Use the following form to define your news item.Note that the fields marked with are required. When you're done click 'Preview' to see how the news item will look and to choose an image for the article. Yes - You can either upload a news item or enter text in the box provided, but not both. Your news item       Index: openacs-4/packages/news/www/image-choose.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/image-choose.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/news/www/image-choose.adp 20 Nov 2006 20:00:28 -0000 1.1.2.1 +++ openacs-4/packages/news/www/image-choose.adp 22 Nov 2006 10:03:23 -0000 1.1.2.2 @@ -1,8 +1,10 @@ -#news.Upload_Image# +Upload Image -

      #news.Choose_an_image_to_upload_and_press#

      +

      Choose an image to upload and press the 'Upload' button to preview +it. When you're happy, press 'Accept' to use that image in the +article.

      Index: openacs-4/packages/news/www/image-choose.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/image-choose.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/news/www/image-choose.tcl 20 Nov 2006 20:00:28 -0000 1.1.2.1 +++ openacs-4/packages/news/www/image-choose.tcl 22 Nov 2006 10:03:23 -0000 1.1.2.2 @@ -30,10 +30,8 @@ if {[info exists item_id]} { lappend vars item_id revision_log } -set button [list [list [list [_ news.Upload] ok]]] - form create img -html {enctype multipart/form-data} \ - -edit_buttons $button + -edit_buttons {{{Upload} {ok}}} foreach var $vars { element create img $var -datatype string -widget hidden -optional @@ -42,11 +40,12 @@ element create img upload \ -datatype file \ -widget file \ - -label {#news.File#} \ + -label {File} \ -html [list accept [parameter::get -parameter ImageUploadTypes]] \ -validate [list img_type \ {test_file_type [ns_queryget upload.tmpfile]} \ - "[_ news.Image_must_be_one_of_the_following_types] [parameter::get -parameter ImageUploadTypes]"] + "Image must be one of the following types: [parameter::get -parameter ImageUploadTypes]" \ + ] # clear the upload file value on every request, as it otherwise it displays # filename, tmppath, mime type which isn't at all useful Index: openacs-4/packages/news/www/item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.tcl,v diff -u -r1.13.2.4 -r1.13.2.5 --- openacs-4/packages/news/www/item.tcl 20 Nov 2006 20:00:28 -0000 1.13.2.4 +++ openacs-4/packages/news/www/item.tcl 22 Nov 2006 10:03:23 -0000 1.13.2.5 @@ -76,7 +76,7 @@ } if {[permission::permission_p -object_id $item_id -privilege write] } { - set edit_link "[_ news.Revise]" + set edit_link "Revise" } else { set edit_link "" } Index: openacs-4/packages/news/www/preview.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/news/www/preview.adp 20 Nov 2006 20:00:28 -0000 1.8.2.2 +++ openacs-4/packages/news/www/preview.adp 22 Nov 2006 10:03:23 -0000 1.8.2.3 @@ -21,11 +21,6 @@ #news.lt_To_the_readers_it_wil#

      -
      - @image_vars;noquote@ - -
      - @edit_action;noquote@ @image_vars;noquote@ - +

      Index: openacs-4/packages/news/www/preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v diff -u -r1.14.2.3 -r1.14.2.4 --- openacs-4/packages/news/www/preview.tcl 20 Nov 2006 20:00:28 -0000 1.14.2.3 +++ openacs-4/packages/news/www/preview.tcl 22 Nov 2006 10:03:23 -0000 1.14.2.4 @@ -55,7 +55,7 @@ ad_complain "[_ news.lt_Publish_body_is_missi]" return } elseif { ![empty_string_p $publish_body] && $file_size > 0 } { - ad_complain "[_ news.You_can_either_upload_a_news_item_or_enter_text_in_the_box_provided_but_not_both]" + ad_complain "You can either upload a news item or enter text in the box provided, but not both." return } } @@ -150,7 +150,7 @@ publish_date(year) publish_date(month) publish_date(day)] || ![regexp $exp $archive_date_ansi match \ archive_date(year) archive_date(month) archive_date(day)] } { - ad_return_complaint 1 "[_ news.Publish_archive_dates_incorrect]" + ad_return_complaint 1 {
    • Publish/archive dates incorrect
      • } } } Index: openacs-4/packages/news/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/news/www/admin/index.adp 20 Nov 2006 20:00:28 -0000 1.14.2.1 +++ openacs-4/packages/news/www/admin/index.adp 22 Nov 2006 10:03:23 -0000 1.14.2.2 @@ -60,7 +60,6 @@

      - Index: openacs-4/packages/news/www/admin/revision-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.adp,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/news/www/admin/revision-add.adp 20 Nov 2006 20:00:28 -0000 1.9.2.1 +++ openacs-4/packages/news/www/admin/revision-add.adp 22 Nov 2006 10:03:23 -0000 1.9.2.2 @@ -3,7 +3,8 @@ @title;noquote@ -

      #news.Use_the_following_form_to_define#

      +

      Use the following form to define your news item.Note that the fields marked with * are required. +When you're done click 'Preview' to see how the news item will look and to choose an image for the article.

      @hidden_vars;noquote@ @@ -31,7 +32,7 @@

      Image

      - [#news.use_preview_to_revise_image#] + [use 'preview' to revise image]

      #news.Release_Date#

      Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/news-aggregator/catalog/news-aggregator.de_DE.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml 20 Nov 2006 19:41:18 -0000 1.1.2.3 +++ openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:23 -0000 1.1.2.4 @@ -1,71 +1,14 @@ - Add - Add new weblog - Blog - Copy - Copy selected subscriptions to %title% - Description - Enter the URL of an XML news feed you want to subscribe to or choose a feed the system already knows about and then click on the Add button. - Export Subscriptions - Export_your_subscriptions as an OPML file - Feed - General - A public aggregator is intended to be used by a group of people and will not have a Purge button. Instead, the most recent 100 items will be displayed. Private aggregators will, by default, only be viewable by the creator. - Last Scan - Last Update Create New Aggregator - Create new aggregator - Edit attributes for this aggregator: - Manage detailed permissions for this aggregator. You can use this form to allow other users to view your personal feeds. Manage This Aggregator - No weblog options available! - Posted: %items.pub_time_pretty% - The following feeds were found in the OPML file at - The following table lists the XML news feeds you've subscribed to. - To delete a subscription, check it and then click on the Unsubscribe button - at the bottom of the page. - The weblogs below will show up as options (in addition to any blogger instances you can post to on your subsite) -when you choose to blog about a news item. - This page lists <b>the most recent items</b> from the feeds you've <a href="@url@subscriptions">subscribed</a> to. - Use tabs below to modify options for this aggregator. Options for %instance_name% are -available on the - You can hit the Purge button to clean out the page. Clicking the <a href="#" class="button">Save</a> button will prevent an item from being purged. - You can import OPML either from an URL, or by uploading a file. - You have the ability to view the following aggregators in %instance_name%. If You select a default aggregator, -you will automatically be directed there when visiting %instance_name%. If you have write privileges on -a particular aggregator, you will have the option to edit or delete it as well. - You will not usually come back to the aggregator. - Manage Manage Subscriptions - Move - Move selected subscriptions to %title% - Name - No No items. - Note: Off On - page. - Permissions Post - News Aggregator - Public? Purges: &raquo; - Save - settings - Source: - Subscriptions - Titles Only? - Toggle - Unsave - Unsubscribe updated %items.diff% - URL - View the XML source for this subscriptions - Yes - You have been unsubscribed from one source. - You have been unsubscribed from %delete_count% sources. Index: openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl,v diff -u -r1.9.2.5 -r1.9.2.6 --- openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl 20 Nov 2006 19:41:18 -0000 1.9.2.5 +++ openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl 22 Nov 2006 10:03:23 -0000 1.9.2.6 @@ -85,7 +85,7 @@ return "Yesterday" } default { - return "$days Days Ago" + return "$days Days Ago" } } -} +} \ No newline at end of file Index: openacs-4/packages/news-aggregator/www/aggregator-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/aggregator-edit.adp,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/news-aggregator/www/aggregator-edit.adp 20 Nov 2006 19:41:18 -0000 1.1.2.2 +++ openacs-4/packages/news-aggregator/www/aggregator-edit.adp 22 Nov 2006 10:03:23 -0000 1.1.2.3 @@ -5,6 +5,6 @@

      -#news-aggregator.lt_Edit_attributes_for_t# +Edit attributes for this aggregator: - + \ No newline at end of file Index: openacs-4/packages/news-aggregator/www/aggregator-tabs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/aggregator-tabs.adp,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/news-aggregator/www/aggregator-tabs.adp 20 Nov 2006 19:41:18 -0000 1.1.2.4 +++ openacs-4/packages/news-aggregator/www/aggregator-tabs.adp 22 Nov 2006 10:03:23 -0000 1.1.2.5 @@ -1,6 +1,7 @@ -

      #news-aggregator.Manage# @ag_info.aggregator_name@

      +

      Manage @ag_info.aggregator_name@

      -#news-aggregator.lt_Use_tabs_below_to_mod# #news-aggregator.settings# #news-aggregator.page# +Use tabs below to modify options for this aggregator. Options for @instance_name@ are +available on the settings page.

      @@ -9,27 +10,26 @@

    - Index: openacs-4/packages/news-aggregator/www/aggregator.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator.tcl,v diff -u -r1.4.2.5 -r1.4.2.6 --- openacs-4/packages/news-aggregator/www/aggregator.tcl 20 Nov 2006 19:41:18 -0000 1.4.2.5 +++ openacs-4/packages/news-aggregator/www/aggregator.tcl 22 Nov 2006 10:03:23 -0000 1.4.2.6 @@ -21,17 +21,17 @@ ad_form -name aggregator -action aggregator -select_query_name select_aggregator -form { {aggregator_id:integer(hidden),key} {aggregator_name:text - {label "\#news-aggregator.Name\#"} + {label "Name"} {html {size 50}} } {description:text(textarea),optional - {label "\#news-aggregator.Description\#"} + {label "Description"} {html {cols 60 rows 10}} } {public_p:text(radio) - {label "\#news-aggregator.Public\#"} - {options {{"[_ news-aggregator.Yes]" t} {"[_ news-aggregator.No]" f}}} - {help_text "[_ news-aggregator.Help_Msg_aggregator]"} + {label "Public?"} + {options {{"Yes" t} {"No" f}}} + {help_text "A public aggregator is intended to be used by a group of people and will not have a Purge button. Instead, the most recent 100 items will be displayed. Private aggregators will, by default, only be viewable by the creator."} } {return_url:text(hidden) {value $return_url} Index: openacs-4/packages/news-aggregator/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v diff -u -r1.12.2.13 -r1.12.2.14 --- openacs-4/packages/news-aggregator/www/index.adp 20 Nov 2006 19:41:18 -0000 1.12.2.13 +++ openacs-4/packages/news-aggregator/www/index.adp 22 Nov 2006 10:03:23 -0000 1.12.2.14 @@ -18,12 +18,12 @@
    - #news-aggregator.lt_This_page_lists# -     + This page lists the most recent items from the feeds you've subscribed to. +
    - #news-aggregator.lt_You_can_hit_the_Purge# + You can hit the Purge button to clean out the page. Clicking the Save button will prevent an item from being purged. Click the Blog button to post the item to a weblog (you will have a choice of weblogs to post to). Index: openacs-4/packages/news-aggregator/www/item-blog.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/item-blog.adp,v diff -u -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/news-aggregator/www/item-blog.adp 20 Nov 2006 19:41:18 -0000 1.2.2.3 +++ openacs-4/packages/news-aggregator/www/item-blog.adp 22 Nov 2006 10:03:23 -0000 1.2.2.4 @@ -3,7 +3,7 @@ @context@

    -

    #news-aggregator.Source# @title@

    +

    Source: @title@

    @@ -13,9 +13,9 @@

    - #news-aggregator.Note# #news-aggregator.lt_You_will_not_usually_# + Note: You will not usually come back to the aggregator.

    - #news-aggregator.lt_No_weblog_options_ava# - + No weblog options available! + \ No newline at end of file Index: openacs-4/packages/news-aggregator/www/multi-source-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/multi-source-chunk.adp,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/news-aggregator/www/multi-source-chunk.adp 20 Nov 2006 19:41:18 -0000 1.1.2.4 +++ openacs-4/packages/news-aggregator/www/multi-source-chunk.adp 22 Nov 2006 10:03:23 -0000 1.1.2.5 @@ -19,7 +19,7 @@ @items.item_title;noquote@
    -
    #news-aggregator.lt_Posted_itemspub_time_# +
    Posted: @items.pub_time_pretty@ # @@ -28,14 +28,14 @@
    - #news-aggregator.Save# + Save - #news-aggregator.Unsave# + Unsave - #news-aggregator.Blog# + Blog
    @@ -44,23 +44,23 @@
    @items.item_title;noquote@ - #news-aggregator.lt_Posted_itemspub_time_# + Posted: @items.pub_time_pretty@ #   - #news-aggregator.Save# + Save - #news-aggregator.Unsave# + Unsave - #news-aggregator.Blog# + Blog
    - + \ No newline at end of file Index: openacs-4/packages/news-aggregator/www/opml-import-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import-2.adp,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/news-aggregator/www/opml-import-2.adp 20 Nov 2006 19:41:18 -0000 1.2.2.1 +++ openacs-4/packages/news-aggregator/www/opml-import-2.adp 22 Nov 2006 10:03:23 -0000 1.2.2.2 @@ -3,8 +3,7 @@ @context@

    - #news-aggregator.lt_The_following_feeds_w# @opml_url@: + The following feeds were found in the OPML file at @opml_url@:

    - Index: openacs-4/packages/news-aggregator/www/opml-import.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import.adp,v diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- openacs-4/packages/news-aggregator/www/opml-import.adp 20 Nov 2006 19:41:18 -0000 1.1.1.1.2.1 +++ openacs-4/packages/news-aggregator/www/opml-import.adp 22 Nov 2006 10:03:23 -0000 1.1.1.1.2.2 @@ -7,9 +7,8 @@

    - #news-aggregator.lt_You_can_import_OPML_e# + You can import OPML either from an URL, or by uploading a file.

    - Index: openacs-4/packages/news-aggregator/www/permissions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/permissions.adp,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/news-aggregator/www/permissions.adp 20 Nov 2006 19:41:18 -0000 1.1.2.2 +++ openacs-4/packages/news-aggregator/www/permissions.adp 22 Nov 2006 10:03:23 -0000 1.1.2.3 @@ -6,7 +6,6 @@

    - #news-aggregator.lt_Manage_detailed_permi# + Manage detailed permissions for this aggregator. You can use this form to allow other users to view your personal feeds.

    - Index: openacs-4/packages/news-aggregator/www/settings.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/settings.adp,v diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 --- openacs-4/packages/news-aggregator/www/settings.adp 20 Nov 2006 19:41:18 -0000 1.1.1.1.2.3 +++ openacs-4/packages/news-aggregator/www/settings.adp 22 Nov 2006 10:03:23 -0000 1.1.1.1.2.4 @@ -4,19 +4,21 @@

    @page_title@

    -#news-aggregator.lt_You_have_the_ability_# +You have the ability to view the following aggregators in @instance_name@. If You select a default aggregator, +you will automatically be directed there when visiting @instance_name@. If you have write privileges on +a particular aggregator, you will have the option to edit or delete it as well.

    - » #news-aggregator.lt_Create_new_aggregator# + » Create new aggregator

     

    -#news-aggregator.lt_The_weblogs_below_wil# +The weblogs below will show up as options (in addition to any blogger instances you can post to on your subsite) +when you choose to blog about a news item.

    - » #news-aggregator.Add_new_weblog# + » Add new weblog

    - Index: openacs-4/packages/news-aggregator/www/single-source-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/single-source-chunk.adp,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/news-aggregator/www/single-source-chunk.adp 20 Nov 2006 19:41:18 -0000 1.1.2.4 +++ openacs-4/packages/news-aggregator/www/single-source-chunk.adp 22 Nov 2006 10:03:23 -0000 1.1.2.5 @@ -18,7 +18,7 @@ @items.item_title;noquote@
    -
    #news-aggregator.lt_Posted_itemspub_time_# +
    Posted: @items.pub_time_pretty@ # @@ -27,14 +27,14 @@
    - #news-aggregator.Save# + Save - #news-aggregator.Unsave# + Unsave - #news-aggregator.Blog# + Blog
    @@ -43,22 +43,22 @@
    @items.item_title;noquote@ - #news-aggregator.lt_Posted_itemspub_time_# + Posted: @items.pub_time_pretty@ #   - #news-aggregator.Save# + Save - #news-aggregator.Unsave# + Unsave - #news-aggregator.Blog# + Blog
    - + \ No newline at end of file Index: openacs-4/packages/news-aggregator/www/subscriptions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.adp,v diff -u -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/news-aggregator/www/subscriptions.adp 20 Nov 2006 19:41:18 -0000 1.5.2.3 +++ openacs-4/packages/news-aggregator/www/subscriptions.adp 22 Nov 2006 10:03:23 -0000 1.5.2.4 @@ -4,17 +4,20 @@ @context@ -

    #news-aggregator.Enter_the_URL_of_an_XML_news_feed#

    +

    + Enter the URL of an XML news feed you want to subscribe to or choose a feed the system already knows about and then click on the Add button. +

    - #news-aggregator.lt_The_following_table_l# + The following table lists the XML news feeds you've subscribed to. + To delete a subscription, check it and then click on the Unsubscribe button + at the bottom of the page.

    - Index: openacs-4/packages/news-aggregator/www/subscriptions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.tcl,v diff -u -r1.7.2.8 -r1.7.2.9 --- openacs-4/packages/news-aggregator/www/subscriptions.tcl 20 Nov 2006 19:41:18 -0000 1.7.2.8 +++ openacs-4/packages/news-aggregator/www/subscriptions.tcl 22 Nov 2006 10:03:23 -0000 1.7.2.9 @@ -15,7 +15,7 @@ -object_id $aggregator_id \ -privilege write -set page_title "[_ news-aggregator.Manage_Subscriptions]" +set page_title "Manage Subscriptions" array set ag_info [news_aggregator::aggregator::aggregator_info -aggregator_id $aggregator_id] set context [list [list "." "$ag_info(aggregator_name)"] "$page_title"] @@ -45,9 +45,9 @@ incr delete_count } if { $delete_count > 1 } { - set message "[_ news-aggregator.You_have_been_unsubscribed_from]" + set message "You have been unsubscribed from $delete_count sources." } else { - set message "[_ news-aggregator.You_have_been_unsubscribed]" + set message "You have been unsubscribed from one source." } ad_returnredirect -message $message subscriptions ad_script_abort @@ -60,7 +60,7 @@ } set bulk_actions { - #news-aggregator.Unsubscribe# subscriptions #news-aggregator.Unsubscribe# + Unsubscribe subscriptions Unsubscribe } if { $aggregator_count > 1 } { @@ -71,8 +71,8 @@ set title [db_string select_name {}] } lappend bulk_actions \ - \#news-aggregator.Copy\# Copy subscription-copy "\#news-aggregator.Copy_Selected\#" \ - \#news-aggregator.Move\# subscription-move "\#news-aggregator.Move_Selected\#" + Copy subscription-copy "Copy selected subscriptions to $title" \ + Move subscription-move "Move selected subscriptions to $title" } @@ -82,30 +82,31 @@ -key source_id \ -row_pretty_plural "subscriptions" \ -actions { - "\#news-aggregator.Export_Subscriptions\#" "opml" "\#news-aggregator.Export_your_subscriptions_as_an_OPML_file\#" + "Export Subscriptions" "opml" "Export your subscriptions as an OPML file" } -bulk_actions $bulk_actions -elements { title { - label "\#news-aggregator.Name\#" + label "Name" link_url_eval $link } last_scanned { - label "\#news-aggregator.Last_Scan\#" + label "Last Scan" } last_modified { - label "\#news-aggregator.Last_Update\#" + label "Last Update" } show_description_p { - label "\#news-aggregator.Titles_Only\#" + label "Titles Only?" display_template { -
    \#news-aggregator.No\#\#news-aggregator.Yes\# toggle
    +
    NoYes toggle
    } } feed_url { - label "\#news-aggregator.Source\#" + label "Source" display_template { - \#news-aggregator.View_the_XML\# + alt="View the XML source for this subscription" border="0"> } } } -orderby { @@ -144,21 +145,21 @@ lappend other_feeds [list $title $source_id] } -ad_form -name add_subscription -form { +ad_form -name add_subscription -action subscriptions -form { {subscription_id:integer(hidden),key} {aggregator_id:integer(hidden) {value $aggregator_id}} {feed_url:text(text),optional {value $feed_url_val} - {label "#news-aggregator.URL#"} + {label "URL"} {value "http://"} {html {size 55}} } {new_source_id:integer(select),optional - {label "\#news-aggregator.Feed\#"} + {label "Feed"} {options $other_feeds} } {add_submit:text(submit),optional - {label "[_ news-aggregator.Add]"} + {label "Add"} } } -validate { {feed_url Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/news-aggregator-portlet/catalog/news-aggregator-portlet.de_DE.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/news-aggregator-portlet/catalog/news-aggregator-portlet.en_US.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl,v diff -u -r1.2.8.1 -r1.2.8.2 --- openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl 20 Nov 2006 20:00:28 -0000 1.2.8.1 +++ openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl 22 Nov 2006 10:03:24 -0000 1.2.8.2 @@ -18,7 +18,7 @@ ad_proc -public news_aggregator_admin_portlet::get_pretty_name { } { - return "#news-aggregator-portlet.news_aggregator_admin_portlet_pretty_name#" + return "News Aggregator Administration" } Index: openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl,v diff -u -r1.2.8.1 -r1.2.8.2 --- openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl 20 Nov 2006 20:00:28 -0000 1.2.8.1 +++ openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl 22 Nov 2006 10:03:24 -0000 1.2.8.2 @@ -26,7 +26,7 @@ ad_proc -public news_aggregator_portlet::get_pretty_name { } { - return "#news-aggregator-portlet.news_aggregator_portlet_pretty_name#" + return "News Aggregator" } Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp,v diff -u -r1.2.8.2 -r1.2.8.3 --- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp 20 Nov 2006 20:00:29 -0000 1.2.8.2 +++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp 22 Nov 2006 10:03:24 -0000 1.2.8.3 @@ -1,3 +1,3 @@ Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp,v diff -u -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp 20 Nov 2006 20:00:29 -0000 1.3.2.2 +++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp 22 Nov 2006 10:03:24 -0000 1.3.2.3 @@ -1,53 +1,51 @@ - - - - - - - - -
    - - - - - - - - - - - - - - - -
    @items.title@, @items.last_scanned@RSS
    - @items.content;noquote@ - - # - -  
    -
    - - - No Feeds. - - - -

    - » Add or remove subscriptions -

    -     - -     - - #news-aggregator-portlet.No_Items# - - -     - - - #new-portal.when_portlet_shaded# - - + + + + + + + + +
    + + + + + + + + + + + + + + + +
    @items.title@, @items.last_scanned@RSS
    + @items.content;noquote@ + + # + +  
    +
    + + + No Feeds. + + + +

    + » Add or remove subscriptions +

    +     + +     + + No Items + + +     + +  + Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl,v diff -u -r1.3.8.2 -r1.3.8.3 --- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl 20 Nov 2006 20:00:29 -0000 1.3.8.2 +++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl 22 Nov 2006 10:03:24 -0000 1.3.8.3 @@ -1,36 +1,36 @@ -ad_page_contract { - The display logic for the news aggregator portlet - @author Simon Carstensen (simon@bcuni.net) -} { - item_id:integer,notnull,optional,multiple -} -properties { - -} - -set user_id [ad_conn user_id] -set write_p [ad_permission_p $user_id write] - -array set config $cf -set shaded_p 0 - -set list_of_package_ids $config(package_id) -set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] - -set package_id [lindex $list_of_package_ids 0] -set aggregator_id [db_string get_aggregator_id "select aggregator_id from na_aggregators where package_id = :package_id limit 1" -default ""] - -if {$aggregator_id eq ""} { - # We have a problem! - return -code error "There should be an aggregator" -} - -set subscription_url [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $package_id] 0]subscriptions" -url {aggregator_id}] - -db_multirow -extend content items select_items {} { - set text_only [string_truncate -len 300 -- $item_description] - if {[exists_and_not_null item_title] && ![string equal -nocase $item_title $text_only] } { - set content "$item_title. $text_only" - } else { - set content $text_only - } -} +ad_page_contract { + The display logic for the news aggregator portlet + @author Simon Carstensen (simon@bcuni.net) +} { + item_id:integer,notnull,optional,multiple +} -properties { + +} + +set user_id [ad_conn user_id] +set write_p [ad_permission_p $user_id write] + +array set config $cf +set shaded_p 0 + +set list_of_package_ids $config(package_id) +set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] + +set package_id [lindex $list_of_package_ids 0] +set aggregator_id [db_string get_aggregator_id "select aggregator_id from na_aggregators where package_id = :package_id limit 1" -default ""] + +if {$aggregator_id eq ""} { + # We have a problem! + return -code error "There should be an aggregator" +} + +set subscription_url [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $package_id] 0]subscriptions" -url {aggregator_id}] + +db_multirow -extend content items select_items {} { + set text_only [string_truncate -len 300 -- $item_description] + if {[exists_and_not_null item_title] && ![string equal -nocase $item_title $text_only] } { + set content "$item_title. $text_only" + } else { + set content $text_only + } +} Index: openacs-4/packages/news-portlet/catalog/news-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/catalog/news-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/news-portlet/catalog/news-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:29 -0000 1.12.2.3 +++ openacs-4/packages/news-portlet/catalog/news-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:24 -0000 1.12.2.4 @@ -1,9 +1,8 @@ - + Neue Ank�ndigung erstellen Ank�ndigungen verwalten - Von Ank�ndigungen verwalten Keine Ank�ndigungen vorhanden Ank�ndigungen Index: openacs-4/packages/news-portlet/catalog/news-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/catalog/news-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.14.2.4 -r1.14.2.5 --- openacs-4/packages/news-portlet/catalog/news-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:29 -0000 1.14.2.4 +++ openacs-4/packages/news-portlet/catalog/news-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:24 -0000 1.14.2.5 @@ -3,7 +3,6 @@ Add a News Item News Administration - Contributed by Manage News News syndication feed No News Index: openacs-4/packages/news-portlet/www/news-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v diff -u -r1.13.2.6 -r1.13.2.7 --- openacs-4/packages/news-portlet/www/news-portlet.adp 20 Nov 2006 20:00:29 -0000 1.13.2.6 +++ openacs-4/packages/news-portlet/www/news-portlet.adp 22 Nov 2006 10:03:25 -0000 1.13.2.7 @@ -32,16 +32,39 @@ - + + +

    @news_items.parent_name@

     + +
    @news_items.notification_chunk;noquote@ + +
    #rss-support.Syndication_Feed# Subscribe via RSS

    +     +     #news-portlet.No_News# - - #new-portal.when_portlet_shaded# - +  -
    #news-portlet.Add_a_News_Item#     +
    #news-portlet.Add_a_News_Item#     Index: openacs-4/packages/news-portlet/www/news-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v diff -u -r1.17.2.4 -r1.17.2.5 --- openacs-4/packages/news-portlet/www/news-portlet.tcl 20 Nov 2006 20:00:29 -0000 1.17.2.4 +++ openacs-4/packages/news-portlet/www/news-portlet.tcl 22 Nov 2006 10:03:25 -0000 1.17.2.5 @@ -59,45 +59,13 @@ set content_column "" } -template::list::create -name news -multirow news_items -key item_id -pass_properties { - display_item_content_p - one_instance_p -} -elements { - item { - label "" - display_template { - @news_items.parent_name@
    - - -

    @news_items.publish_body;noquote@

    - -

    #news-portlet.Contributed_by# @news_items.item_creator@ - - - » @news_items.publish_title@ - @news_items.publish_date@ - - - Subscribe via RSS -
    - - } - } - action { - label "" - display_template { - @news_items.notification_chunk;noquote@ - } - } -} - db_multirow -extend { publish_date view_url rss_exists rss_url notification_chunk} news_items select_news_items {} { set publish_date [lc_time_fmt $publish_date_ansi "%x"] set view_url [export_vars -base "${url}item" { item_id }] set rss_exists [rss_support::subscription_exists -summary_context_id $package_id -impl_name news] set rss_url "[news_util_get_url $package_id]rss/rss.xml" # add news email notification - set notification_chunk [notification::display::request_widget -style "short" -type one_news_item_notif -object_id $package_id -pretty_name "News" -url [ad_return_url] ] + set notification_chunk [notification::display::request_widget -type one_news_item_notif -object_id $package_id -pretty_name "News" -url [ad_return_url] ] # text-only body if {$display_item_content_p && [string equal $html_p "f"]} { Index: openacs-4/packages/news-portlet/www/summary.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/summary.adp,v diff -u -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/news-portlet/www/summary.adp 20 Nov 2006 20:00:30 -0000 1.6.2.3 +++ openacs-4/packages/news-portlet/www/summary.adp 22 Nov 2006 10:03:25 -0000 1.6.2.4 @@ -4,6 +4,6 @@ @publish_body;noquote@ @more_link;noquote@ -

    #news-portlet.Contributed_by# @item_creator@ +

    Contributed by @item_creator@

     Index: openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml,v diff -u -r1.12.2.4 -r1.12.2.5 --- openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.12.2.4 +++ openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:25 -0000 1.12.2.5 @@ -32,9 +32,6 @@ Benachrichtigungstypen Benachrichtigungen Benachrichtigungsfunktion aktivieren - - BETREFF: - benachrichtigen Benachrichtigungsfunktion deaktivieren     Index: openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml,v diff -u -r1.13.2.5 -r1.13.2.6 --- openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.13.2.5 +++ openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:25 -0000 1.13.2.6 @@ -31,9 +31,6 @@ Notification Types Notifications Request Notification - - SUBJECT: - Subscribe Unsubscribe     Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/notifications/tcl/notification-display-procs.tcl 20 Nov 2006 20:00:30 -0000 1.14.2.1 +++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl 22 Nov 2006 10:03:25 -0000 1.14.2.2 @@ -19,7 +19,6 @@ {-pretty_name:required} {-url:required} {-user_id ""} - {-style "default"} } { Produce a widget for requesting notifications of a given type. If the notifications package has not been mounted then return the empty string. @@ -42,19 +41,11 @@ if {![empty_string_p $request_id]} { set sub_url [ad_quotehtml [unsubscribe_url -request_id $request_id -url $url]] set pretty_name [ad_quotehtml $pretty_name] - if {[string equal $style "short"]} { - set sub_chunk "[_ notifications.Short_Unsubscribe_Link]" - } else { - set sub_chunk "[_ notifications.lt_You_have_requested_no]" - } + set sub_chunk "[_ notifications.lt_You_have_requested_no]" } else { set sub_url [ad_quotehtml [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]] set pretty_name [ad_quotehtml $pretty_name] - if {[string equal $style "short"]} { - set sub_chunk "[_ notifications.Short_Subscribe_Link]" - } else { - set sub_chunk "[_ notifications.lt_You_may_a_hrefsub_url]" - } + set sub_chunk "[_ notifications.lt_You_may_a_hrefsub_url]" } if { [empty_string_p $sub_url] } { Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/catalog/rss-support.de_DE.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.1.2.3 +++ openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.1.2.4 @@ -1,5 +1,5 @@ - + Erweiterte Suche Der '<b>AND</>' operator is unn�tig -- es sind alle Suchbegriffe standardm�ssig enthalten Index: openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml,v diff -u -r1.6.2.4 -r1.6.2.5 --- openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.6.2.4 +++ openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.6.2.5 @@ -1,5 +1,5 @@ - + Advanced Search The "<b>AND</b>" operator is unnecessary -- we include all search terms by default. Index: openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.11.2.3 -r1.11.2.4 --- openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.11.2.3 +++ openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.11.2.4 @@ -1,5 +1,5 @@ - + Benutzerdefiniertes Portlet Benutzerdefinierte Portlets verwalten Index: openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.15.2.4 -r1.15.2.5 --- openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.15.2.4 +++ openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.15.2.5 @@ -1,5 +1,5 @@ - + Custom Portlet Custom Portlet Administration Index: openacs-4/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml,v diff -u -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:30 -0000 1.5.2.3 +++ openacs-4/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.5.2.4 @@ -10,7 +10,7 @@ Neue Frage hinzuf�gen Diese Evaluation verwalten Teilnahme mehrmals m�glich - Umfrage starten + Evaluation starten Antworttext sind Unterhalb der Frage @@ -99,7 +99,7 @@ Geben Sie hier die<br>m�glichen Antworten ein,<br>eine pro Zeile. gab in %survey_name% folgende Antworten: Die Beschreibung der Evaluation wird wie folgt angezeigt: - <img src="graphics/Verwalten.gif" border="0" alt="Umfrage verwalten"> + <img src="graphics/Verwalten.gif" border="0" alt="Evaluationen verwalten"> <img src="graphics/Verwalten.gif" border="0" alt="Verwalten"> Evaluationen verwalten Den Text einer Frage �ndern @@ -131,7 +131,7 @@ Zur�ck zu Evaluationen verwalten Der Abschnitt %section_id% ist nicht vorhanden. E-Mail senden bez�glich %survey_name% - Umfragen verwalten + Evaluationen verwalten Evaluationen verwalten: Neue Frage hinzuf�gen (Forts.) Evaluationen verwalten: Neue Evaluation erstellen %survey_info.name%: Neue Frage @@ -163,7 +163,7 @@ Dieser Evaluationstyp erm�glicht es, den Fragetyp festzulegen. W�hlen Sie diese Option, wenn die Teilnehmer nicht nur zwischen vordefinierten Antworten ausw�hlen, sondern auch freie Antworten eigeben k�nnen sollen oder wenn Sie verschiedene Fragentypen wie Multiple Choice oder Freie Antwort innerhalb einer Evaluation kombinieren wollen. Diese Evaluation kann nicht bearbeitet werden. Bei diesem Vorgang werden %response_count% R�ckantworten gel�scht. - zur Umfrage�bersicht + zur Evaluations�bersicht Benutzer k�nnen Ihre R�ckantworten nachtr�glich bearbeiten. Teilnehmer k�nnen ihre R�ckantworten nicht nachtr�glich bearbeiten M�gliche Antworten (eine pro Zeile) @@ -184,12 +184,11 @@ Mehrere Antworten zur Auswahl: Mehrfachantworten Bezeichnung - Neue Umfrage erstellen + Neue Evaluation erstellen Nein Es wurden keine Daten gefunden. Keine R�ckantworten vorhanden Keine aktivierten Komplexaufgaben vorhanden - Keine Umfragen, die noch nicht beantwortet wurden. nicht Nicht gefunden Zahl @@ -228,10 +227,9 @@ Abschicken R�ckantwort abschicken �bersicht - Umfragen Beschreibung der Evaluation Bezeichnung der Evaluation: - Bezeichnung der Umfrage + Bezeichnung der Evaluation Bezeichnung der Evaluation: Komplexaufgaben Tabelle @@ -242,8 +240,6 @@ Zul�ssige Werte Hochgeladene Datei: Anzeigen - Bisherige Angaben anschauen/bearbeiten - Bisherige Angaben f�r Umfragen in dieser Gruppe anschauen/bearbeiten R�ckantwort anzeigen R�ckantworten anzeigen: R�ckantworten anzeigen Index: openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml,v diff -u -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:31 -0000 1.12.2.3 +++ openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.12.2.4 @@ -215,7 +215,6 @@ No data found No Responses No surveys active - No unanswered surveys non- Not Found Number @@ -270,8 +269,6 @@ Type of Response Uploaded file: View - view/edit previous responses - view/edit previous responses for surveys in this group View Response View Responses: View responses Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/survey-portlet/catalog/survey-portlet.de_DE.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/survey-portlet/catalog/survey-portlet.en_US.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/survey-portlet/www/survey-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/www/survey-portlet.adp,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/survey-portlet/www/survey-portlet.adp 20 Nov 2006 20:00:31 -0000 1.3.2.1 +++ openacs-4/packages/survey-portlet/www/survey-portlet.adp 22 Nov 2006 10:03:26 -0000 1.3.2.2 @@ -18,36 +18,23 @@ %> - - - @surveys.parent_name@ - +
    view/edit previous responses for surveys in this group

    +     - #survey.No_unanswered_surveys# + No unanswered surveys     - - #new-portal.when_portlet_shaded# - Index: openacs-4/packages/theme-selva/catalog/theme-selva.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/catalog/theme-selva.de_DE.ISO-8859-1.xml,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/theme-selva/catalog/theme-selva.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:31 -0000 1.1.2.2 +++ openacs-4/packages/theme-selva/catalog/theme-selva.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:26 -0000 1.1.2.3 @@ -1,5 +1,5 @@ - + Mitgliedschaften Eigene Einstellungen Index: openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.de_DE.ISO-8859-1.xml 20 Nov 2006 20:00:31 -0000 1.1.2.2 +++ openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.de_DE.ISO-8859-1.xml 22 Nov 2006 10:03:27 -0000 1.1.2.3 @@ -1,10 +1,10 @@ - + Eintrag hinzuf�gen Verwalte Weblogger Weblogger-Verwaltung - Entw�rfe + Entw�rfe Vollansicht nach %entries.poster_first_names% %entries.poster_last_name% Index: openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.1.4.5 -r1.1.4.6 --- openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.en_US.ISO-8859-1.xml 20 Nov 2006 20:00:31 -0000 1.1.4.5 +++ openacs-4/packages/weblogger-portlet/catalog/weblogger-portlet.en_US.ISO-8859-1.xml 22 Nov 2006 10:03:27 -0000 1.1.4.6 @@ -1,5 +1,5 @@ - + Add entry Administer Weblogger Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp,v diff -u -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp 20 Nov 2006 20:00:31 -0000 1.6.2.3 +++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp 22 Nov 2006 10:03:27 -0000 1.6.2.4 @@ -1,9 +1,39 @@ - + + + + @entries.parent_name@ +
      + + +
    • +

      + @entries.title@
      + @entries.content;noquote@ +
      #weblogger-portlet.lt_by_entriesposter_firs# + (@entries.posted_time_pretty@) +

      +
      • +       +       +
    + +

    + #weblogger-portlet.raquo# #weblogger-portlet.Add_entry# +

    +     +

    + #weblogger-portlet.raquo# #weblogger-portlet.FullView# +

    +     +     + + #weblogger-portlet.No_Entries# +     - #new-portal.when_portlet_shaded# +       Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl 20 Nov 2006 20:00:31 -0000 1.5.2.1 +++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl 22 Nov 2006 10:03:27 -0000 1.5.2.2 @@ -35,31 +35,6 @@ } } -template::list::create -name blogs -multirow entries -key entry_id -pass_properties { -} -elements { - item { - label "" - display_template { - @entries.parent_name@
    - - - » @entries.title@ - @entries.content;noquote@ - (@entries.posted_time_pretty@)
    -     -     - } - } - actions { - label "" - display_template { - #weblogger-portlet.Add_entry# - | - \#weblogger-portlet.FullView\# - } - } -} - db_multirow -extend { view_url add_url } entries entries {} { if { !$package_read_p($package_id) } { continue Index: openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql 20 Nov 2006 20:00:31 -0000 1.14.2.1 +++ openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql 22 Nov 2006 10:03:27 -0000 1.14.2.2 @@ -176,17 +176,7 @@ -- Adding unique constraint on workflow fsm enabled in actions -- This could cause upgrades to fail, if there are in fact duplicates, so let's pray that there aren't --- Nima: Therefore we remove duplicates -delete from workflow_fsm_action_en_in_st - where oid in ( - select w1.oid from workflow_fsm_action_en_in_st w1, workflow_fsm_action_en_in_st w2 - where w1.action_id = w2.action_id and - w1.state_id = w2.state_id and - w1.oid <> w2.oid and - w1.assigned_p = 'f' - ); --- Nima: and now we uncomment this: -alter table workflow_fsm_action_en_in_st add constraint workflow_fsm_action_en_in_st_pk primary key (action_id, state_id); +-- alter table workflow_fsm_action_en_in_st add constraint workflow_fsm_action_en_in_st_pk primary key (action_id, state_id); -- Workflow deputies should use timestamp, not date alter table workflow_deputies rename column start_date to start_date_old; Index: openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql,v diff -u -r1.8.6.1 -r1.8.6.2 --- openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql 20 Nov 2006 20:00:32 -0000 1.8.6.1 +++ openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql 22 Nov 2006 10:03:27 -0000 1.8.6.2 @@ -10,8 +10,8 @@ w.object_id, w.package_key, w.object_type, - a.description, - a.description_mime_type, + w.description, + w.description_mime_type, a.short_name as initial_action, a.action_id as initial_action_id from workflows w left outer join