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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-authentication" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="acs-authentication" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Invalid_username_or_password">Benutzeridentifikation oder Passwort ist falsch</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-authentication" package_version="5.2.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="acs-authentication" package_version="5.2.3b2" locale="en_US" charset="ISO-8859-1"> <msg key="Invalid_username_or_password">Invalid username or password</msg> </message_catalog> 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 @@ <pretty-plural>Content Repository Services</pretty-plural> <initial-install-p>t</initial-install-p> <singleton-p>t</singleton-p> - + <version name="5.2.3" url="http://openacs.org/repository/download/apm/acs-content-repository-5.2.3.apm"> <owner url="http://openacs.org">OpenACS</owner> + <summary>The canonical repository for OpenACS content.</summary> <release-date>2006-05-25</release-date> + <maturity>3</maturity> <vendor url="http://openacs.org">OpenACS</vendor> + <license url="http://www.gnu.org/copyleft/gpl.html">GPL</license> + <maturity>3</maturity> <description format="text/html">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. </description> - <license>GPL</license> - <maturity>3</maturity> <provides url="acs-content-repository" version="5.2.3"/> <requires url="acs-kernel" version="5.2.3b1"/> @@ -27,9 +29,8 @@ <callbacks> </callbacks> <parameters> - <parameter datatype="string" min_n_values="1" max_n_values="1" name="CRFileLocationRoot" default="content-repository-content-files" description="The directory to which files are published and from where they are retrieved when a files is served. It is taken to be relative to [acs_root_dir]." section_name="files"/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="TemplateRoot" default="templates" description="The directory to which templates are published and from where they are retrieved when a page is served. If the value does not start with a '/', it is taken to be relative to [acs_root_dir]. Packages that use the content-repository can override this setting by defining their own TemplateRoot parameter." section_name="templates"/> - <parameter datatype="number" min_n_values="1" max_n_values="1" name="UseBackgroundDeliveryP" default="0" description="Use background delivery for file downloads" section_name="files"/> + <parameter datatype="string" min_n_values="1" max_n_values="1" name="CRFileLocationRoot" default="content-repository-content-files" description="The directory to which files are published and from where they are retrieved when a files is served. It is taken to be relative to [acs_root_dir]." section_name="files"/> </parameters> </version> 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]</font></td></tr> <tr><td align=center><br> <form method=get action=$base_url> - <INPUT TYPE=text name=date size=10><INPUT type=image src=\"/resources/acs-subsite/go.gif\" alt=\"Go\" border=0> <br><font size=-2>Date as YYYYMMDD</font> + <INPUT TYPE=text name=date size=10> <INPUT type=image src=\"/resources/acs-subsite/go.gif\" alt=\"Go\" border=0><br><font size=-2>Date as YYYYMMDD</font> <INPUT TYPE=hidden name=view value=day> " 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-kernel" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="acs-kernel" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Administrator">Administrator</msg> <msg key="Administrators">Administratoren </msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-lang" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="acs-lang" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="available-in-this-language">Deutsche Version verf�gbar</msg> <msg key="change-locale">Sprache wechseln</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-lang" package_version="5.2.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="acs-lang" package_version="5.2.3b2" locale="en_US" charset="ISO-8859-1"> <msg key="available-in-this-language">Available in English</msg> <description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of "English".</description> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-subsite" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="acs-subsite" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="_or"> oder</msg> <msg key="_Update_Basic_Information">Die Allgemeinen Informationen aktualisieren</msg> @@ -196,7 +196,7 @@ <msg key="lt_Privileges_higher_implied">H�here Rechte schlie�en niedrigere Rechte mit ein. Wenn Sie etwa Verwaltungsrechte erteilen, werden automatisch auch Lese- und Schreibrechte gew�hrt.</msg> <msg key="lt_Problem_with_authenti">Es ist ein Authentifizierungsproblem aufgetreten.</msg> <msg key="lt_Registration_informat">Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet.</msg> - <msg key="lt_Registration_informat_1">Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet. + <msg key="lt_Registration_informat_1">Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet. </msg> <msg key="lt_registration_request_submitted">Ihr Registrierungsantrag wurde an den Administrator von %system_name% �bermittelt. Sie wurden noch nicht freigeschaltet.</msg> <msg key="lt_Saving_email_address_">E-Mail-Adresse und Passwort werden gespeichert.</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-subsite" package_version="5.2.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="acs-subsite" package_version="5.2.3b2" locale="en_US" charset="ISO-8859-1"> <msg key="_or">, or</msg> <msg key="_Update_Basic_Information">Update Basic Information</msg> @@ -275,14 +275,14 @@ <msg key="lt_This_user_doesnt_have">This user doesn't have a portrait yet. You can</msg> <msg key="lt_This_user_is_deleted">This user is deleted and banned from the community.</msg> <msg key="lt_To_confirm_your_regis">To confirm your registration, please go to %confirmation_url%</msg> - <msg key="lt_Upload_your_favorite">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 + <msg key="lt_Upload_your_favorite">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).</msg> <msg key="lt_Uploaded_pretty_date">Uploaded: %pretty_date%</msg> <msg key="lt_Uploaded_publish_date">Uploaded: %publish_date%</msg> <msg key="lt_Use_the_Browse_button">Use the "Browse..." button to locate your file, then click "Open".</msg> <msg key="lt_User_has_portrait_title">This user has a entered a biography or uploaded a portrait</msg> - <msg key="lt_We_cant_find_you">We can't find you (user %user_id%) in the users table. Probably your + <msg key="lt_We_cant_find_you">We can't find you (user %user_id%) in the users table. Probably your account was deleted for some reason.</msg> <msg key="lt_We_had_a_problem_proc">We had a problem processing your entry.</msg> <msg key="lt_We_were_not_awaiting_">We were not awaiting your email. There must be some mistake.</msg> @@ -422,7 +422,7 @@ <msg key="This_group_is_closed">This group is closed. New members can only get access by invitation.</msg> <msg key="this_subsite">this subsite</msg> <msg key="This_user_has_left_the">This user has left the community.</msg> - <msg key="To_log_in_visit_the"> Please check your inbox. Within the next few minutes, you should find a message from %system_owner% with instructions on + <msg key="To_log_in_visit_the"> Please check your inbox. Within the next few minutes, you should find a message from %system_owner% with instructions on </msg> <msg key="Topic">Topic</msg> <msg key="type_specific_info">type-specific info</msg> 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 </querytext> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-tcl" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="acs-tcl" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="a_problem">Ein Problem</msg> <msg key="approve">Freischalten</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-tcl" package_version="5.2.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="acs-tcl" package_version="5.2.3b2" locale="en_US" charset="ISO-8859-1"> <msg key="a_problem">a problem</msg> <msg key="approve">approve</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-templating" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="acs-templating" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="12-Hour">12-st�ndig</msg> <msg key="24-Hour">24-st�ndig</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="acs-templating" package_version="5.2.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="acs-templating" package_version="5.2.3b2" locale="en_US" charset="ISO-8859-1"> <msg key="12-Hour">12-Hour</msg> <msg key="24-Hour">24-Hour</msg> 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 @@ <msg key="all">Alle</msg> <msg key="Allow_Random">Erlaube Randomisierung</msg> <msg key="Anonymous_Responses">Anonyme Antworten</msg> - <msg key="Applet">Assessment</msg> <msg key="approve">Genehmigen</msg> <msg key="approve_actions">Aktionen genehmigen</msg> <msg key="approved">Genehmigt</msg> @@ -60,10 +59,8 @@ <msg key="as_time_help">Wieviele Minuten darf der User f�r die Beantwortung des gesamten Assessments ben�tigen. leeres Feld f�r unbefristet.</msg> <msg key="as_Title_help">Hilfetext f�r den Titel des Assessments</msg> <msg key="Assessment">Assessment </msg> - <msg key="Assessment_Administration">Assessment Administration</msg> <msg key="assessment_Name_help">Dies erlaubt es Ihnen, Ihrem Assessment einen speziellen einzigartigen Indentifikator zuzuweisen z.B. einen Code.</msg> <msg key="Assessment_Title">Titel</msg> - <msg key="Assessments">Assessments</msg> <msg key="By_user">Nach User</msg> <msg key="Change_multiple_timings">Zeitliche Verf�gbarkeit �ndern (alle)</msg> <msg key="Change_timings">Zeitliche Verf�gbarkeit �ndern</msg> @@ -104,7 +101,6 @@ <msg key="One_Assessment_data">Ein Assessment/Test: %assessment_data.title%</msg> <msg key="Only_correct">Nur bei korrekten Antworten</msg> <msg key="Only_incorrect">Nur bei falschen Antworten</msg> - <msg key="open_assessments">Assessment �ffnen</msg> <msg key="parameter_description">Beschreibung</msg> <msg key="performed">ausgef�hrt</msg> <msg key="permissions">Zugriffsberechtigungen</msg> @@ -118,7 +114,6 @@ <msg key="Section_Navigation">Navigation ausw�hlen</msg> <msg key="Sections">Abschnitte</msg> <msg key="Secure_Access_1">Secure Access ben�tigt</msg> - <msg key="Sessions">Sessions</msg> <msg key="Show_Feedback">Feedback anzeigen</msg> <msg key="Show_Item_Name_1">Namen der Frage anzeigen</msg> <msg key="specific_date">Spezifisches Datum</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="assessment-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="assessment-portlet" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="assessment_admin">assessment admin</msg> <msg key="error_one_assessment">There should be only one instance of assessment for admin purpose</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="bm-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="bm-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="New_spam_name">Neue %spam_name% verfassen</msg> <msg key="pretty_name">Gruppen-E-Mails</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="bm-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="bm-portlet" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="New_spam_name">New %spam_name%</msg> <description key="New_spam_name">The text in the link for creating a new bulk mailing.</description> 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 @@ %> -<if @config.shaded_p@ ne "t"> <ul> <li><a href="@spam_url@">#bm-portlet.spam_name_History#</a></li> <li><a href="spam-recipients?referer=one-community-admin">#bm-portlet.New_spam_name#</a></li> </ul> -</if> -<else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> 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 @@ <release-date>2004-03-04</release-date> <vendor url="http://openacs.org">OpenACS</vendor> <description format="text/html">Manage group and shared calendars with download.</description> - <maturity>0</maturity> <provides url="calendar" version="2.1.0b5"/> <requires url="acs-datetime" version="4.0"/> @@ -22,15 +21,14 @@ <requires url="notifications" version="5.0.0b4"/> <requires url="ref-timezones" version="5.0.0b4"/> - <callbacks> + <callbacks> <callback type="after-install" proc="calendar::install::package_install"/> <callback type="before-uninstall" proc="calendar::install::package_uninstall"/> <callback type="before-upgrade" proc="calendar::install::package_upgrade"/> </callbacks> + <parameters> <parameter datatype="number" min_n_values="1" max_n_values="1" name="Attachments" default="0" description="Allow Files to be Uploaded"/> - <parameter datatype="number" min_n_values="1" max_n_values="1" name="DefaultPeriodDays" default="30" description="Period of time that is shown in the calendar by default [in days]. Can be changed by admin for each community. -Defaults to 30."/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultView" default="day" description="The default list for this instance of calendar: one of day, list, week, month. Defaults to day."/> </parameters> 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 @@ <msg key="Add">Hinzuf�gen</msg> <msg key="add">Hinzuf�gen</msg> <msg key="Add_a_new_Audience">Neue Zielgruppe hinzuf�gen</msg> - <msg key="Add_all_day_event">Ganzt�giges Ereignis hinzuf�gen</msg> <msg key="add_an_event">Neuen Eintrag hinzuf�gen</msg> <msg key="Add_an_item">Einen Eintrag hinzuf�gen</msg> <msg key="Add_Item">Eintrag hinzuf�gen</msg> @@ -46,8 +45,6 @@ <msg key="Events_over_a">Ereignisse innerhalb eines Zeitraums von</msg> <msg key="Friday">Freitag</msg> <msg key="from">von</msg> - <msg key="go_graphic">/resources/acs-subsite/go_de_DE.gif</msg> - <msg key="Go_to_date">Gehe zum Datum</msg> <msg key="Go_to_monthsname">Gehe zu %months.name%</msg> <msg key="Go_to_year_next_year">Gehe zum Jahr %next_year%</msg> <msg key="Go_to_year_prev_year">Gehe zum Jahr %prev_year%</msg> @@ -88,7 +85,6 @@ <msg key="lt_You_have_no_party_wid">You have no party wide calendars</msg> <msg key="Monday">Montag</msg> <msg key="New_Type">Neue Eintragskategorie:</msg> - <msg key="next_day">n�chster Tag</msg> <msg key="next_month">Next Month</msg> <msg key="next_year">Next Year</msg> <msg key="No">Nein</msg> @@ -98,7 +94,6 @@ <msg key="Note">Hinweis</msg> <msg key="of_the_month">des Monats</msg> <msg key="of_the_week">&nbsp;</msg> - <msg key="prev_day">Vortag</msg> <msg key="prev_month">Previous Month</msg> <msg key="prev_year">Previous Year</msg> <msg key="Private">Privat:</msg> 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 @@ <msg key="Events_over_a">Events over a</msg> <msg key="Friday">Friday</msg> <msg key="from">from</msg> - <msg key="go_graphic">/resources/acs-subsite/go.gif</msg> <msg key="Go_to_date">Go to date</msg> <msg key="Go_to_monthsname">Go to %months.name%</msg> <msg key="Go_to_year_next_year">Go to year %next_year%</msg> 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 @@ <if @calendars:rowcount@ gt 0> <p> +#calendar.Calendars#: <ul> <multiple name="calendars"> <li> @calendars.calendar_name@ <if @calendars.calendar_admin_p@ true> <br> - <font size=-2>[<ahref="@base_url@calendar-item-types?calendar_id=@calendars.calendar_id@"> - #calendar-portlet.Manage_Item_Types#</a>]</font> + <font size=-2>[<a href="@base_url@calendar-item-types?calendar_id=@calendars.calendar_id@">Manage Types</a>]</font> </if> </multiple> </ul> 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 @@ <form method=get action=@base_url@> <input type="text" name="date" size="10"> - <input type="image" src="#calendar.go_graphic#" name="#calendar.Go_to_date#" alt="#calendar.Go_to_date#" border="0"> + <input type="image" src="/resources/acs-subsite/go.gif" name="#calendar.Go_to_date#" alt="#calendar.Go_to_date#" border="0"> <br>#acs-datetime.Date_as_YYYYMMDD# <input type="hidden" name="view" value="day"> @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@> </if> + <if @view@ eq "day"> <include src="view-one-day-display" date="@date@" start_hour=0 end_hour=23 return_url="@return_url@" 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="calendar-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="calendar-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Add_an_item">Eintrag hinzuf�gen</msg> <msg key="admin_pretty_name">Kalender verwalten</msg> <msg key="Create_a_new_Event">Neuen Eintrag hinzuf�gen</msg> <msg key="full_portlet_pretty_name">Kalender</msg> <msg key="lt_Manage_Calendar_Event">Eintragskategorien �ndern</msg> <msg key="Manage_Item_Types">Eintragskategorien �ndern</msg> - <msg key="Parameter_Period_Days">Angezeigter Zeitraum (in Tagen):</msg> <msg key="pretty_name">Kalender</msg> <msg key="Schedule">Tagesplan</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="calendar-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="calendar-portlet" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Add_an_item">Add an item</msg> <msg key="admin_pretty_name">Calendar Administration</msg> <msg key="Create_a_new_Event">Create a new Event</msg> <msg key="full_portlet_pretty_name">Full Calendar</msg> <msg key="lt_Manage_Calendar_Event">Manage Calendar Event Types</msg> <msg key="Manage_Item_Types">Manage Item Types</msg> - <msg key="Parameter_Period_Days">Default period shown (in days):</msg> <msg key="pretty_name">Calendar</msg> <msg key="Schedule">Schedule</msg> </message_catalog> 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 @@ <ul> -<li> <a href="@url@?action=add&show_cal_nav=0&force_calendar_id=@calendar_id@">#calendar-portlet.Create_a_new_Event#</a> -<li> <a href="@url@calendar-item-types?calendar_id=@calendar_id@">#calendar-portlet.lt_Manage_Calendar_Event#</a> -<li> <form name="PeriodDays"> - <p> - #calendar-portlet.Parameter_Period_Days# - <input name="period_days" type="text" size="3" maxlength="3" id="period_days" value="@period_days@"> - </form> +<li> <a href="@url@?calendar_id=@calendar_id@">#calendar-portlet.Create_a_new_Event#</a></li> +<li> <a href="@url@calendar-item-types?calendar_id=@calendar_id@">#calendar-portlet.lt_Manage_Calendar_Event#</a></li> </ul> + 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 @@ </table> </if> <else> - <small> - #new-portal.when_portlet_shaded# - </small> + <br> </else> + + 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@> </if> <else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> \ No newline at end of file + <br> +</else> 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 @@ </switch> </if> <else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> \ No newline at end of file + +</else> 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 @@ <else> <li> - @community_name@: #curriculum.lt_No_published_curricul# + #curriculum.lt_No_published_curricul# </li> </else> 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 @@ </if> <else> - #new-portal.when_portlet_shaded# + </else> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="A_copy_of">Eine Kopie von</msg> <msg key="Access">Zugriff</msg> @@ -34,7 +34,6 @@ <msg key="admin_pages_navbar_name">Verwalten</msg> <msg key="Administer">Verwalten</msg> <msg key="administer_link"><img border=0 valign="bottom" src="/resources/dotlrn/admin.gif" alt="Verwalten"> </msg> - <msg key="Administration">Administration</msg> <msg key="Administration_Cockpit">.LRN-Administration</msg> <msg key="Administrator">Administrator</msg> <msg key="Administrators">Administratoren</msg> @@ -200,11 +199,9 @@ <msg key="From">Von</msg> <msg key="fuchsia">Fuchsie</msg> <msg key="Full">Unbeschr�nkt</msg> - <msg key="full">voll</msg> <msg key="Full_Access">Unbeschr�nkter Zugriff</msg> <msg key="General_Information">Allgemeine Informationen</msg> <msg key="General_Site_Help">Hilfe</msg> - <msg key="goto_communities_pretty_name_portal">Link zu %communities.pretty_name% </msg> <msg key="Grant_site_wide_admin">Systemadministrationsrechte erteilen</msg> <msg key="gray">Grau</msg> <msg key="green">Gr�n</msg> @@ -225,7 +222,6 @@ <msg key="Header_Logo_Item_ID">Kopfzeilenlogo-ID</msg> <msg key="help">Hilfe</msg> <msg key="hide_lrn_toolbar">.LRN toolbar verstecken</msg> - <msg key="Home">Home</msg> <msg key="HTML">HTML</msg> <msg key="ID">Interne ID</msg> <msg key="ID_1">ID</msg> @@ -263,7 +259,6 @@ <msg key="lt_Are_you_sure_you_want_nuke_users">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.</msg> - <msg key="lt_Are_you_sure_you_want_to_send">Sind Sie sicher, dass Sie die nachfolgende Email verschicken wollen?</msg> <msg key="lt_Be_sure_that_the_pers">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>. </msg> <msg key="lt_Class_Key_a_short_nam">Kursschl�ssel (eine kurze Bezeichnung ohne Leerzeichen)</msg> <msg key="lt_Communitys_Web_Addres">Web-Adresse der Gruppe</msg> @@ -493,9 +488,6 @@ <msg key="Send_Date">Versenden am</msg> <msg key="send_email">E-Mail senden</msg> <msg key="Send_to_all">An die ganze Gruppe senden</msg> - <msg key="Send_to_the_following_members">An die folgenden Mitglieder senden:</msg> - <msg key="Send_to_the_following_roles">An die folgenden Gruppen senden:</msg> - <msg key="set_all_screennames_where_null">Setze f�r alle Benutzer screennames, die noch keinen haben</msg> <msg key="Shared_Files">Freigegebene Dateien</msg> <msg key="show_lrn_toolbar">.LRN Toolbar anzeigen</msg> <msg key="silver">Silber</msg> @@ -521,7 +513,6 @@ <msg key="Site_Templates_Template_AdminParams">Administration der Parameter</msg> <msg key="Small">Klein</msg> <msg key="Sorry">&nbsp;</msg> - <msg key="Spam">Rundmail</msg> <msg key="Spam_">Gruppen-E-Mail...</msg> <msg key="Spam_Community">Gruppen-E-Mail senden</msg> <msg key="Spam_Users">Gruppen-E-Mail an Benutzer senden</msg> @@ -594,9 +585,7 @@ <msg key="Yes">Ja</msg> <msg key="yes">Ja</msg> <msg key="Yes_delete">Ja, l�schen</msg> - <msg key="Yes_delete_members">Ja, Mitgliedschaften l�schen</msg> <msg key="Yes_Im_sure">Ja, wirklich</msg> - <msg key="Yes_keep_members">Ja, Mitgliedschaften beibehalten</msg> <msg key="You_can_specify_colors_by_name">Sie k�nnen Farben mit Hilfe von Farbnamen</msg> <msg key="you_need_to_create_terms_to_create_classes"><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.</msg> <msg key="your_icon_is_too_large">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 </msg> 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 @@ <msg key="From">From</msg> <msg key="fuchsia">fuchsia</msg> <msg key="Full">Full</msg> - <msg key="full">full</msg> <msg key="Full_Access">Full Access</msg> <msg key="General_Information">General Information</msg> <msg key="General_Site_Help">General Site Help</msg> @@ -550,9 +549,6 @@ <msg key="Send_Date">Send Date</msg> <msg key="send_email">Send Email</msg> <msg key="Send_to_all">Send to everyone in the group</msg> - <msg key="Send_to_the_following_members">In addition, send to the following people (if you have not selected "Send to Everyone" above):</msg> - <msg key="Send_to_the_following_roles">Send to the following roles:</msg> - <msg key="set_all_screennames_where_null">Set all screenames where no screenname is set</msg> <msg key="Shared_Files">Shared Files</msg> <msg key="show_lrn_toolbar">.LRN Toolbar anzeigen</msg> <msg key="silver">silver</msg> @@ -578,7 +574,6 @@ <msg key="Site_Templates_Template_AdminParams">Parameters Administration</msg> <msg key="Small">Small</msg> <msg key="Sorry">Sorry!</msg> - <msg key="Spam">Spam</msg> <msg key="Spam_">Spam ...</msg> <msg key="Spam_Community">Spam Community</msg> <msg key="Spam_Users">Spam Users</msg> @@ -655,9 +650,7 @@ <msg key="Yes">Yes</msg> <msg key="yes">yes</msg> <msg key="Yes_delete">Yes, delete</msg> - <msg key="Yes_delete_members">Yes, delete memberships</msg> <msg key="Yes_Im_sure">Yes, I'm sure.</msg> - <msg key="Yes_keep_members">Yes, keep memberships</msg> <msg key="You_can_specify_colors_by_name">You can specify colors by name</msg> <msg key="you_need_to_create_terms_to_create_classes"><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%.</msg> <msg key="your_icon_is_too_large">Your icon is too large. The publisher of %system_name% has chosen to limit attachments to %max_attachments_bytes% bytes.\n</msg> 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 "<a href=\"${parent_url}${join_target}?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">[_ dotlrn.Request_Membership]</a>\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 "(<a href=\"${parent_url}${join_target}\?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">[_ dotlrn.Join]</a>)\n" - } + append chunk "(<a href=\"${parent_url}${join_target}\?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">[_ dotlrn.Join]</a>)\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 @@ </querytext> </fullquery> - <fullquery name="dotlrn_community::members_count.select_count"> - <querytext> - select count(*) from dotlrn_member_rels_approved where community_id - = :community_id - </querytext> - </fullquery> - <fullquery name="dotlrn_community::member_p.select_count_membership"> <querytext> select count(*) @@ -209,20 +202,6 @@ </querytext> </fullquery> - <fullquery name="dotlrn_community::max_members_p.select_max_members"> - <querytext> - select max_members from dotlrn_communities_all - where community_id = :community_id - </querytext> - </fullquery> - - <fullquery name="dotlrn_community::max_members.select_max_members"> - <querytext> - select max_members from dotlrn_communities_all - where community_id = :community_id - </querytext> - </fullquery> - <fullquery name="dotlrn_community::member_pending_p.is_pending_membership"> <querytext> 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 @@ </multiple> </if> <if @bio@ not nil> - <p> <em>#dotlrn.Biography#</em> @bio;noquote@ + <p> <em>#dotlrn.Biography#</em> @bio@ </if> </ul> </if> 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 @@ <div class="portlet-wrapper"> <div class="portlet-title"> - <span><h3> #acs-subsite.My_Account# </h3></span> + <span><h2> #acs-subsite.My_Account# </h2></span> </div> <div class="portlet"> <include src="/packages/acs-subsite/lib/user-info" /> @@ -63,7 +63,7 @@ <if @portrait_state@ eq upload> <div class="portlet-wrapper"> <div class="portlet-title"> - <span><h3>#acs-subsite.Your_Portrait#</h3></span> + <span><h2>#acs-subsite.Your_Portrait#</h2></span> </div> <div class="portlet"> <p> @@ -76,7 +76,7 @@ <if @portrait_state@ eq show> <div class="portlet-wrapper"> <div class="portlet-title"> - <span><h3>#acs-subsite.Your_Portrait#</h3></span> + <span><h2>#acs-subsite.Your_Portrait#</h2></span> </div> <div class="portlet"> <p> @@ -96,9 +96,9 @@ <div class="portlet-wrapper"> <div class="portlet-title"> - <span><h3>#acs-subsite.Privacy#<h3></span> + <span><h2>#acs-subsite.Privacy#<h2></span> </div> - <div class="portlet"><small> + <div class="portlet"> <ul> <li><a href="@whos_online_url@">#acs-subsite.Whos_Online_link_label#</a></li> <li><a href="../user/email-privacy-level">#acs-subsite.Change_my_email_P#</a></li> @@ -115,19 +115,19 @@ <ul> <li><a href="@make_invisible_url@">#acs-subsite.Make_yourself_invisible_label#</a></li> </ul> - </else></small> + </else> </div> </div> <div class="portlet-wrapper"> <div class="portlet-title"> - <span><h3>#dotlrn.General_Site_Help#</h3></span> + <span><h2>#dotlrn.General_Site_Help#</h2></span> </div> - <div class="portlet"><small> + <div class="portlet"> <ul> <li><a href="@dotlrn_url@/help">#dotlrn.help#</a></li> <li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@">@system_owner@</a></li> - </ul></small> + </ul> </div> </div> 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 </querytext> </fullquery> 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 @@ <if @communities:rowcount@ gt 0> <multiple name="communities"> -<small> @communities.previous_type_ul_tags;noquote@ <ul class="mktree" style="padding-left: 5px;"><li id="dotlrn-main-@communities.simple_community_type@" remember="1"> @@ -63,7 +62,7 @@ </group> </li></ul></li></ul> -</small> + </multiple> @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 @@ <p></p> -@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 @@ </querytext> </fullquery> - <fullquery name="select_max_members"> - <querytext> - select max_members - from dotlrn_communities_all - where community_id = :community_id - </querytext> - </fullquery> - -</queryset> \ No newline at end of file +</queryset> 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 @@ <input type=checkbox name=spam_all> #dotlrn.Send_to_all# <p> -#dotlrn.Send_to_the_following_roles# <p> +Send to the following roles: <p> @rel_types_html;noquote@ <p> -#dotlrn.Send_to_the_following_members#:<p> +In addition, send to the following people (if you have not selected "Send to Everyone" above):<p> <table width="85%" class="table-display" cellpadding="5" cellspacing="0"> <tr class="table-header"> 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 @@ </table> <br> + <form action="class" method="GET"> - #dotlrn.Search_classes_with# - #dotlrn.Please_type_a_keyword# + Search classes with : + <input name="keyword" onfocus="if(this.value=='Please type a keyword')this.value='';" onblur="if(this.value=='')this.value='Please type a keyword';" value="Please type a keyword" /> <input type="hidden" name="class_key" value="@class_key@" /> <input type="hidden" name="term_id" value="@term_id@" /> - <input type="submit" value="#dotlrn.Go#" /> + <input type="submit" value="Go" /> </form> <if @class_instances:rowcount@ gt 0> 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 @@ <div style="text-align:center;"> <form action="classes" method="GET"> - #dotlrn.Search_subjects_with# - #dotlrn.Please_type_a_keyword# + Search subjects with : + <input name="keyword" onfocus="if(this.value=='Please type a keyword')this.value='';" onblur="if(this.value=='')this.value='Please type a keyword';" value="Please type a keyword" /> <input type="hidden" name="department_key" value="@department_key@" /> <input type="hidden" name="page" value="@page@" /> - <input type="submit" value="#dotlrn.Go#" /> + <input type="submit" value="Go" /> </form> </div> 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 @@ # %> - + <master src="dotlrn-admin-master"> <property name="title">@title@</property> <property name="context_bar">@context_bar@</property> <center> <form action="departments" method="GET"> - #dotlrn.Search_departments_with# - #dotlrn.Please_type_a_keyword# - <input type="submit" value="#dotlrn.Go#"> + Search departments with : + <input name="keyword" onfocus="if(this.value=='Please type a keyword')this.value='';" onblur="if(this.value=='')this.value='Please type a keyword';" value="Please type a keyword" /> + <input type="submit" value="Go"> </form> </center> <if @departments:rowcount@ gt 0> 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 { <if @dotlrn_admins.no_auto_remove@ true><center><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0"></center></if> } \ 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 @@ <div style="text-align:center;"> <form action="term" method="GET"> - #dotlrn.Search_classes_with# - #dotlrn.Please_type_a_keyword# + Search classes with : + <input name="keyword" onfocus="if(this.value=='Please type a keyword')this.value='';" onblur="if(this.value=='')this.value='Please type a keyword';" value="Please type a keyword" /> <input type="hidden" name="term_id" value="@term_id@" /> <input type="hidden" name="department_key" value="@department_key@" /> - <input type="submit" value="#dotlrn.Go#" /> + <input type="submit" value="Go" /> </form> </div> 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 @@ <strong>@screen_name@</strong> <if @oacs_site_wide_admin_p@ true> [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>] - [<small> <a href="update-screennames?@export_edit_vars@">#dotlrn.set_all_screennames_where_null#</a> </small>] </if> </li> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-calendar" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-calendar" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Day_Summary">Tagesplan</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-calendar" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-calendar" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Day_Summary">Day Summary</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-dotlrn" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-dotlrn" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Core_DotLRN_Applets">Kernanwendungen von dotLRN</msg> <msg key="Group_Members_Info">Liste der Teilnehmer</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-dotlrn" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-dotlrn" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Core_DotLRN_Applets">Core DotLRN Applets</msg> <msg key="Group_Members_Info">Group Members Info</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-evaluation" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-evaluation" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Evaluation_">Evaluierung</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-evaluation" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-evaluation" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Evaluation_">Evaluation </msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-forums" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-forums" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="administer">verwalten</msg> <msg key="All_forums">Alle Foren</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-forums" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-forums" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="administer">administer</msg> <msg key="All_forums">All forums</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-fs" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-fs" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="All">Alle</msg> <msg key="All_items">Alle Inhalte</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-fs" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-fs" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="All">All</msg> <msg key="All_items">All items</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-homework" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-homework" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Action">Aktion</msg> <msg key="Alert">Warnung</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-homework" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-homework" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Action">Action</msg> <msg key="Alert">Alert</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-news" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-news" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="pretty_name">Ank�ndigungen</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-news" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-news" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="pretty_name">News</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="admin_pretty_name">Gruppe verwalten</msg> <msg key="Administer">Verwalten</msg> @@ -16,9 +16,6 @@ <msg key="Edit_Welcome_Message">Begr��ungsnachricht editieren</msg> <msg key="Email_Members">E-Mail an Teilnehmer senden</msg> <msg key="Enabled">Eingeschaltet</msg> - <msg key="goto_admin_pretty_name">Zur %admin_pretty_name% gehen</msg> - <msg key="goto_Administrator_FAQ">Zur Administratoren-FAQ gehen</msg> - <msg key="goto_Manage_Membership">Zur Teilnehmerverwaltung gehen</msg> <msg key="lt_AddRemove_pretty_name">Bei "%pretty_name%" Teilnehmer hinzuf�gen/entfernen</msg> <msg key="lt_can_send_bulk_mail_to">k�nnen Gruppen-E-Mails an diese Gruppe senden.</msg> <msg key="lt_Change_Bulk_Mail_Poli">Gruppen-E-Mail-Optionen �ndern</msg> @@ -48,9 +45,6 @@ <msg key="no_teaching_assistant_members">Keine %teaching_assistant_role_pretty_plural% vorhanden</msg> <msg key="Only_admins">Nur Administratoren</msg> <msg key="Open">Selbstregistrierung</msg> - <msg key="Size">Gr��e:</msg> <msg key="Sort">Sortieren</msg> <msg key="Sortmanage">Sortieren/Verwalten</msg> - <msg key="Toggle_privacy_policy_to_no">Verhindern, dass Gastnutzern Informationen zu Gruppenmitgliedschaften sehen.</msg> - <msg key="Toggle_privacy_policy_to_yes">Gastnutzern erlauben Information zu Gruppenmitgliedschaften zu sehen</msg> </message_catalog> 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 @@ <msg key="no_teaching_assistant_members">No %teaching_assistant_role_pretty_plural%</msg> <msg key="Only_admins">Only admins</msg> <msg key="Open">Open</msg> - <msg key="Size">Size:</msg> <msg key="Sort">Sort</msg> <msg key="Sortmanage">Sort/manage</msg> <msg key="Toggle_privacy_policy_to_no">Change privacy policy so guest users can not view group membership information. </msg> 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 @@ <ul> <if @customize_portal_layout_p@ eq 1 or @dotlrn_admin_p@ eq 1 > <li><a href="one-community-portal-configure">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li> - <li><if @subcommunity_p@ eq 1 and @join_policy@ eq "open"><form name="sizeForm">#dotlrn-portlet.Size# <input name="size" type="text" size="3" maxlength="3" id="size" value="@max_members@"><input type="Submit" value="OK"/></form></li></if> <li><a href="element-list">#dotlrn-portlet.lt_Change_Name_Portlet#</a></li> </if> <li><a href="change-site-template?referer=@referer@">#dotlrn.Customize_Template#</a></li> 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 @@ <queryset> - <fullquery name="update_max_members"> - <querytext> - update dotlrn_communities_all set - max_members = :size - where community_id = :community_id - </querytext> - </fullquery> - <fullquery name="select_community_info"> <querytext> 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 @@ <td headers="name"> <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> </td> - <td> - <a href="mailto:@users.email@">@users.email;noquote@</a> + <td headers="email"> + @users.email;noquote@ </td> <td headers="role"> <i>@users.role@</i> @@ -78,5 +78,6 @@ </else> </if> <else> - <small>#new-portal.when_portlet_shaded#</small> + <% # The portal is shaded - should not be displayed %> + <br> </else> 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 @@ %> -<if @config.shaded_p@ ne "t"> +<!-- aks: shading is broken for this portlet --> <if @community_id@ eq 0> <small>#dotlrn-portlet.lt_No_community_was_spec#</small> @@ -39,9 +39,12 @@ </multiple> </if> <else> - <small>#dotlrn-portlet.no_instructor_members#</small> + <li><small>#dotlrn-portlet.no_instructor_members#</small></li> </else> - </ul></br> + </ul> + +<p> + <if @n_tas@ gt 0> <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_ta_rel] %>: <ul> @@ -55,9 +58,11 @@ </li> </if> </multiple> - </ul></br> + </ul> </if> +<p> + <if @n_cas@ gt 0> <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_ca_rel] %>: <ul> @@ -75,7 +80,7 @@ </if> <if @read_private_data_p@> - </br> + <br> <a href="members">#dotlrn-portlet.Member_List#</a> </if> <else> @@ -84,10 +89,4 @@ </ul> </else> -</if> -<else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> 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 @@ </if> <else> - <small>#new-portal.when_portlet_shaded#</small> + <br> </else> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-static" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-static" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="class_info_portlet_pretty_name">Kurs-Information</msg> <msg key="community_info_portlet_pretty_name">Community-Information </msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-static" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-static" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="class_info_portlet_pretty_name">Class Info</msg> <msg key="community_info_portlet_pretty_name">Community Info</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-syllabus" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-syllabus" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="admin_pretty_name">Lehrplan verwalten</msg> <msg key="Download">Herunterladen</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="dotlrn-syllabus" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="dotlrn-syllabus" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="admin_pretty_name">Syllabus Administration</msg> <msg key="Download">Download</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="edit-this-page-portlet" package_version="2.0.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="edit-this-page-portlet" package_version="0.1a" locale="en_US" charset="ISO-8859-1"> - <msg key="admin_edit-this-page">Administer ETP</msg> <msg key="admin_pretty_name">ETP Administration</msg> <msg key="Disable">Disable</msg> <msg key="Disabled">Disabled</msg> <msg key="Enable">Enable</msg> - <msg key="fs_edit-this-page">ETP File Storage</msg> <msg key="group">Group</msg> <msg key="name">Name</msg> - <msg key="noentry_edit-this-page">no entry</msg> + <msg key="admin_edit-this-page">Administer ETP</msg> + <msg key="fs_edit-this-page">ETP File Storage</msg> <msg key="one_admin_edit-this-page">There should be only one instance of ETP for admin purposes</msg> <msg key="pretty_name">ETP</msg> + <msg key="noentry_edit-this-page">no entry</msg> </message_catalog> 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 @@ </multiple> </if> <else> - <small>#edit-this-page-portlet.noentry_edit-this-page#</small> + #edit-this-page-portlet.noentry_edit-this-page# </else> </if> <else> - <small> - #new-portal.when_portlet_shaded# - </small> + </else> \ 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 @@ <msg key="lt_Weight_over_grade_wei">Gewichtung innerhalb der <br /> gesamt zu erreichenden %grade_weight%% <br /> f�r "%grade_plural_name%" </msg> <msg key="lt_Weight_over_grade_wei_1">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.</msg> <msg key="lt_Weight_over_grade_wei_2">Gewichtung in den %grade_weight%% von %grade_plural_name%</msg> - <msg key="lt_Weight_used_in_grade_">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.</msg> + <msg key="lt_Weight_used_in_grade_">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.</msg> <msg key="lt_Weight_used_in_grade__1">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.</msg> <msg key="lt_Weight_used_in_grade__2">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.</msg> <msg key="lt_Will_the_student_be_a">Soll der Student dazu in der Lage sein, die Benotung einzusehen? (1 = JA, 2 = NEIN)</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="evaluation-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="evaluation-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Add_grade_name_">Hinzuf�gen %grade_name%</msg> <msg key="Addedit_answer_">Antwort hinzuf�gen/ver�ndern</msg> @@ -19,7 +19,7 @@ <msg key="lt_Administer_Evaluation">Evaluierung administrieren</msg> <msg key="lt_Edit_grades_distribut">Gewichtungsverteilung von "%grade_plural_name%" ver�ndern</msg> <msg key="lt_Evaluation_Admin_Port">Admin Portlet f�r Bewertungen </msg> - <msg key="lt_Evaluation_Administra">Evaluierung administrieren</msg> + <msg key="lt_Evaluation_Administra">Bewertungen administrieren</msg> <msg key="lt_Evaluation_Assignment">Admin Portlet f�r Aufgabenzuweisungen</msg> <msg key="lt_Groups_administration">Gruppen administrieren</msg> <msg key="lt_smallTotal_points_in_"><small>Gesamtpunkte in dieser Kategorie: %total_grade%/%max_grade%<br /> Diese Bewertungskategorie macht %grade_weight%% von 100% der Gesamtklassenleistung aus</small> </msg> @@ -36,7 +36,6 @@ <msg key="No_group_for_task_">Keine Gruppe f�r diese Aufgabe</msg> <msg key="Not_available_">nicht vorhanden</msg> <msg key="Not_evaluated_">nicht bewertet</msg> - <msg key="select_version">Portlet-Darstellung</msg> <msg key="submit_answer_">Anwort abschicken</msg> <msg key="submit_answer_again_">Antwort nochmal abschicken</msg> <msg key="task_name_No_data_">%task_name% (keine Daten) </msg> 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 @@ <fullquery name="get_grade_info"> <querytext> - 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 </querytext> </fullquery> 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 @@ <msg key="administer">Verwalten</msg> <msg key="All_QA">Alle F&amp;As</msg> <msg key="Answer">Antwort</msg> - <msg key="Answer_text_in_html">Antwort im HTML-Format</msg> <msg key="Back_to_FAQs">Zur�ck zu FAQs</msg> - <msg key="Change_settings">&Auml;nderungen &uuml;bernehmen</msg> <msg key="Configure">Konfigurieren</msg> <msg key="Create_a_new_FAQ">Neues FAQ erstellen</msg> <msg key="Create_an_FAQ">Neues FAQ erstellen</msg> @@ -39,13 +37,11 @@ <msg key="One_Question">Eine Frage</msg> <msg key="Plain">Einfacher Text</msg> <msg key="Preformatted">Vorformatierter Text</msg> - <msg key="pretty_name">FAQ</msg> <msg key="preview">Vorschau</msg> <msg key="Q">F:</msg> <msg key="QA_On_Separate_Pages">F&A auf getrennten Seiten?</msg> <msg key="QA_on_Separate_Pages">F&A auf getrennten Seiten?</msg> <msg key="Question">Frage</msg> - <msg key="Question_text_in_html">Frage im HTML-Format</msg> <msg key="swap_with_next">Um eins nach unten verschieben</msg> <msg key="Text_type">Format</msg> <msg key="Title">Titel:</msg> 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 @@ <msg key="One_Question">One Question</msg> <msg key="Plain">Plain</msg> <msg key="Preformatted">Preformatted</msg> - <msg key="pretty_name">FAQ</msg> <msg key="preview">preview</msg> <msg key="Q">Q:</msg> <msg key="QA_On_Separate_Pages">Q&A On Separate Pages?</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="faq-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="faq-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="admin_pretty_name">FAQs verwalten</msg> <msg key="Disable">Deaktivieren</msg> 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 @@ %> <if @shaded_p@ false> - <if @faqs:rowcount@ eq 1> - <a href="@faq_url@one-faq?faq_id=@faq_id@">@faq_name@</a> - <ul> - <multiple name="questions"> - <li><a href="@faq_url@one-question?entry_id=@questions.entry_id@">@questions.question;noquote@</a></li> - </multiple> - </ul> + + <if @faqs:rowcount@ gt 1> + +<% + set new_package_id "" + set old_package_id "" +%> + + <if @one_instance_p@ false> + <table border="0" bgcolor="white" cellpadding="2" cellspacing="0" width="100%"> + <tr class="table-header"> + <td><strong class="table-header">#faq-portlet.name#</strong></td> + <td><strong class="table-header">#dotlrn.clubs_pretty_name#</strong></td> + </tr> + </if> + <else> + <ul> + </else> + +<multiple name="faqs"> + +<% set new_package_id $faqs(package_id) %> + + <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@> + <tr> + </if> + + <if @one_instance_p@> + <li> + <a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@" title="#faq-portlet.goto_faqs_faq_name#">@faqs.faq_name@</a> + </li> + </if> + <else> + <if @faqs.rownum@ odd> + <tr class="odd"> </if> - <if @faqs:rowcount@ eq 0> - <small>#faq-portlet.no_faqs#</small> - </if> - <if @faqs:rowcount@ gt 1> - <listtemplate name="faqs" style="groups"></listtemplate> - </if> + <else> + <tr class="even"> + </else> + <td><a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@" title="#faq-portlet.goto_faqs_faq_name#">@faqs.faq_name@</a></td> + <td>@faqs.parent_name@</td> + </tr> + </else> + +<% set old_package_id $new_package_id %> + + <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@> + </tr> + </if> +</multiple> + + <if @one_instance_p@ false> + </table> + </if> + <else> + </ul> + </else> + + </if> + <else> + <if @faqs:rowcount@ eq 1> + <a href="@faq_url@one-faq?faq_id=@faq_id@" title="#faq-portlet.goto_faq_name#">@faq_name@</a> + <ul> +<multiple name="questions"> + <li><a href="@faq_url@one-question?entry_id=@questions.entry_id@">@questions.question;noquote@</a></li> +</multiple> + </ul> + </if> + <else> + <small>#faq-portlet.no_faqs#</small> + </else> + </else> + </if> <else> - <small> - #new-portal.when_portlet_shaded# - </small> + </else> \ 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 { - <b>@faqs.parent_name@</b></br> - <group column="package_id"> - » <a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a></br> - </group> - } - } -} - 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="file-storage" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="file-storage" package_version="5.2.2" locale="de_DE" charset="ISO-8859-1"> <msg key="_Upload">�nderung</msg> <msg key="Action">Aktion</msg> <msg key="Actions">Aktionen:</msg> <msg key="Actions_1">Aktionen</msg> - <msg key="Add_Dup_As_New_File">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.</msg> <msg key="Add_File">Datei hochladen</msg> <msg key="Add_pretty_name">%pretty_name% hinzuf�gen</msg> <msg key="Author">Autor</msg> @@ -53,7 +52,6 @@ <msg key="Folder_ID">Ordner-ID</msg> <msg key="Folder_Name">Ordnername:</msg> <msg key="folder_type_pretty_name">Ordner</msg> - <msg key="Important">Warnung!</msg> <msg key="index_page_navigate_up_folder">Eine Ebene nach oben zu %up_name%</msg> <msg key="item">Element</msg> <msg key="items">Elemente</msg> @@ -136,7 +134,6 @@ <msg key="no_such_URL">URL nicht gefunden</msg> <msg key="PDF">PDF</msg> <msg key="Permissions">Berechtigungen</msg> - <msg key="pretty_name">Dateisystem</msg> <msg key="properties">Eigenschaften</msg> <msg key="Rename">Umbenennen</msg> <msg key="Rename_File">Datei umbenennen</msg> @@ -168,7 +165,6 @@ <msg key="Uploaded_by_ownern">Hochgeladen von: %owner%</msg> <msg key="URL">URL:</msg> <msg key="URL_deleted">URL gel�scht</msg> - <msg key="Use_this_form_to_upload_a_ZIP">Verwenden Sie dieses Formular, um eine ZIP-Datei hochzuladen. Der Inhalt wird in ein Verzeichnis mit obigem Namen oder dem der ZIP-Datei entpackt.</msg> <msg key="version_add_page_title">Neue Version von "%title%" hochladen</msg> <msg key="version_delete_page_title">"%version_name%" l�schen</msg> <msg key="Version_filename">Dateiname der Version</msg> 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 @@ <msg key="Actions_1">Actions</msg> <msg key="Add_Dup_As_New_File">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></msg> <msg key="Add_File">Add File</msg> + <msg key="Add_Revision">Add Revision</msg> <msg key="Add_folder_from_fs">Add folder from file system</msg> <msg key="Add_pretty_name">Add %pretty_name%</msg> - <msg key="Add_Revision">Add Revision</msg> <msg key="Author">Author</msg> <msg key="back_to_folder_view">Back to folder view</msg> <msg key="back_to_project">Back to project</msg> @@ -56,7 +56,6 @@ <msg key="Folder_ID">Folder ID</msg> <msg key="Folder_Name">Folder Name:</msg> <msg key="folder_type_pretty_name">folder</msg> - <msg key="Important">Important!</msg> <msg key="index_page_navigate_up_folder">Up to %up_name%</msg> <msg key="item">item</msg> <msg key="items">items</msg> @@ -145,7 +144,6 @@ <msg key="No_valid_destination_folders_exist">No valid destination folder exists</msg> <msg key="PDF">PDF</msg> <msg key="Permissions">Permissions</msg> - <msg key="pretty_name">File-Storage</msg> <msg key="properties">properties</msg> <msg key="Rename">Rename</msg> <msg key="Rename_File">Rename File</msg> @@ -179,7 +177,6 @@ <msg key="Uploaded_by_ownern">Uploaded by: %owner%</msg> <msg key="URL">URL:</msg> <msg key="URL_deleted">URL deleted</msg> - <msg key="Use_this_form_to_upload_a_ZIP">Use this form to upload a ZIP file (its contents will be extracted into a folder with the title you enter above).</msg> <msg key="version_add_page_title">Upload New Version of %title%</msg> <msg key="version_delete_page_title">Delete %version_name%</msg> <msg key="Version_filename">Version filename</msg> 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 @@ <provides url="forums" version="1.3d1"/> <requires url="acs-kernel" version="5.2.2"/> - <requires url="acs-mail-lite" version="0.1d"/> <requires url="acs-subsite" version="5.2.2"/> + <requires url="acs-mail-lite" version="0.1d"/> <requires url="attachments" version="0.5"/> <requires url="notifications" version="5.1.1"/> @@ -34,7 +34,6 @@ <parameter datatype="number" min_n_values="1" max_n_values="1" name="table_border_color" default="#dddddd" description="The color of the table borders and between the cells, try #ffffff for a cool look"/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="table_other_bgcolor" default="#d9e4f9" description="The bgcolor for the other table rows"/> <parameter datatype="number" min_n_values="1" max_n_values="1" name="UseIntermediaForSearchP" default="0" description="Should we use intermedia for searching forums? Intermedia is more scalable, but interprets searches differently from standard search."/> - <parameter datatype="number" min_n_values="1" max_n_values="1" name="UseScreenNameP" default="0" description="Should we hide users real name by using the screen name? Defaults to 0 (no) "/> </parameters> </version> 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 @@ <msg key="Administer">Forum verwalten</msg> <msg key="Administration">Diskussionsforen verwalten</msg> - <msg key="anonymious_posts_are_allowed">Sie koennen in diesem Forum Ihre Nachricht auch anonym senden.</msg> <msg key="Anonymous">Anonym</msg> <msg key="approve">Freigeben</msg> <msg key="Are_you_sure_you_want_to_delete_lt">Wollen Sie diesen Beitrag und <strong>alle zugeh�rigen Antworten </strong> wirklich l�schen?</msg> <msg key="Attach">Anh�ngen?</msg> <msg key="Attachments">Anh�nge:</msg> <msg key="Author">Verfasser</msg> - <msg key="Available_Forums">Verf�gbare Foren</msg> <msg key="Back_to_thread_label">Zur�ck zu %forum.name%</msg> <msg key="Back_to_thread_link"><a href="%thread_url%">Zur�ck</a> zu %forum.name%</msg> <msg key="Body">Text</msg> <msg key="by_Date">nach Datum</msg> <msg key="by_Forum">nach Forum</msg> <msg key="Charter">Beschreibung</msg> <msg key="closed">Geschlossen</msg> - <msg key="collapse">zuklappen</msg> <msg key="Confirm">Best�tigen</msg> <msg key="Confirm_Delete">L�schen best�tigen:</msg> - <msg key="Confirm_Move_to">Verschieben best�tigen</msg> <msg key="Confirm_Post_to_Forum">Forumsbeitrag best�tigen:</msg> <msg key="Create_a_New_Forum">Neues Forum erstellen</msg> <msg key="Create_New_Forum">Neues Forum erstellen</msg> <msg key="delete">L�schen</msg> - <msg key="direct_link_to_this_post">Direkter Link zu dieser Nachricht</msg> <msg key="disable">Deaktivieren</msg> <msg key="disable_it">deaktivieren</msg> <msg key="disabled">Deaktiviert</msg> - <msg key="display_as">Anzeige anpassen: </msg> - <msg key="display_full_posts">Zeige vollstaendige Nachrichten</msg> <msg key="Edit">Bearbeiten</msg> <msg key="edit">Bearbeiten</msg> <msg key="Edit_again">Erneut bearbeiten</msg> @@ -45,10 +38,8 @@ <msg key="enable_it">aktivieren</msg> <msg key="enabled">aktiviert</msg> <msg key="Entire_Thread">Gesamter Thread</msg> - <msg key="expand">aufklappen</msg> <msg key="First_Post">Erster Beitrag</msg> <msg key="Flat">Chronologisch geordnet</msg> - <msg key="flat">flach</msg> <msg key="Format">Format</msg> <msg key="Forum">Forum</msg> <msg key="Forum_1">Forum:</msg> @@ -62,11 +53,8 @@ <msg key="forward">Weiterleiten</msg> <msg key="Fwd">Fwd:</msg> <msg key="html">HTML</msg> - <msg key="in_this_forum_your_screename_is_used">In diesem Forum wird anstatt ihres Namens ihr Alias angezeigt:</msg> - <msg key="just_display_subjects">Zeige nur die Ueberschriften</msg> <msg key="Last_Post">Letzter Beitrag</msg> <msg key="Last_post_in_subject">Letzter Beitrag zum Thema</msg> - <msg key="link_to_this_post_on_a_separate_page">Link zu dieser Nachricht in einem neuen Fenster</msg> <msg key="lt_Email_a_copy_of_the_f">Eine Kopie des folgenden Beitrags per E-Mail versenden:</msg> <msg key="lt_First_post_in_subject">Erster Beitrag zum Thema</msg> <msg key="lt_Forums_Administration">Diskussionsforen verwalten</msg> @@ -86,29 +74,13 @@ <msg key="Message_ID">Beitrags-ID</msg> <msg key="Moderate">Moderieren</msg> <msg key="moderated">Moderiert</msg> - <msg key="Move_message">Verschiebe Nachricht</msg> - <msg key="Move_message_to_forum">Verschiebe Nachricht in Forum::</msg> - <msg key="Move_message_to_message">Verschiebe Nachricht zu Nachricht</msg> - <msg key="Move_thread">Verschiebe Thread</msg> - <msg key="Move_thread_to_forum">Verschiebe Thread in Forum</msg> - <msg key="Move_thread_to_message">Verschiebe Nachricht zu anderer Nachricht</msg> - <msg key="Move_thread_to_other_forum">Verschiebe Thread in ein anderes Forum</msg> - <msg key="Move_thread_to_other_thread">Verschiebe Thread in anderen Thread</msg> - <msg key="Move_thread_to_the_thread">Verschiebe den Thread in den Thread</msg> - <msg key="Move_thread_to_thread">Verschiebe Thread in den Thread</msg> - <msg key="Move_to">Verschiebe nach</msg> - <msg key="Move_to_other_thread">Verschiebe in einen anderen Thread</msg> <msg key="Name">Name</msg> - <msg key="nested">einger�ckt</msg> <msg key="New_Forum">Neues Forum erstellen</msg> <msg key="No">Nein</msg> <msg key="No_Forums">Keine Diskussionsforen vorhanden</msg> - <msg key="no_indentation_for_replies">Zeige Nachrichten nicht eingerueckt</msg> <msg key="No_Messages">Keine Beitr�ge vorhanden</msg> <msg key="No_Postings">Keine Beitr�ge vorhanden</msg> <msg key="None">Kein Forum vorhanden</msg> - <msg key="not_allowed">Entschuldigung, aber es scheint, dass Sie nicht die benoetigten Rechten besitzen.</msg> - <msg key="on">am</msg> <msg key="One_Message">Einzelner Beitrag</msg> <msg key="One_Thread">Einzelner Thread</msg> <msg key="open">Offen</msg> @@ -128,10 +100,7 @@ <msg key="Posting_history_for">Verlauf der Beitr�ge f�r</msg> <msg key="Posting_Policy">Teilnahmeregelung</msg> <msg key="Presentation">Darstellungsform</msg> - <msg key="pretty_name">Foren</msg> <msg key="Preview">Vorschau</msg> - <msg key="print">drucken</msg> - <msg key="printable_view">Druckansicht</msg> <msg key="Re">Re:</msg> <msg key="reject">Ablehnen</msg> <msg key="Rejected">Abgelehnt</msg> @@ -143,15 +112,13 @@ <msg key="Search_1">Suche</msg> <msg key="Search_colon">Suche:</msg> <msg key="Search_Forums">In Foren suchen</msg> - <msg key="Sorry_you_can_not_move_this_thread_There_are_no_other_forums">Entschuldigen Sie, aber es gibt kein anderes Forum, in welches dieser Thread geschoben werden k�nnte.</msg> <msg key="Subject">Betreff</msg> <msg key="Subscribe">Benachrichtigungsfunktion aktivieren?</msg> <msg key="text">Einfacher Text</msg> <msg key="This_forum_is">Dieses Forum ist</msg> <msg key="Threaded">Strukturiert</msg> <msg key="Threads">Diskussionsthemen</msg> <msg key="View">Ansicht</msg> - <msg key="with_indentation_of_replies">Zeige Nachrichten eingerueckt</msg> <msg key="Yes">Ja</msg> <msg key="You_may">Sie k�nnen es</msg> <msg key="Your_Note">Ihr Kommentar</msg> 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 @@ <msg key="Admin_for_all">Administrative options for all forums.</msg> <msg key="Administer">Administer</msg> <msg key="Administration">Administration</msg> - <msg key="anonymious_posts_are_allowed">You can post in this forum anonymiously.</msg> <msg key="Anonymous">Anonymous</msg> <msg key="approve">approve</msg> <msg key="Are_you_sure_you_want_to_delete_lt">Are you sure you want to delete this message and <strong>all replies to it</strong>?</msg> @@ -13,7 +12,6 @@ <msg key="Attach">Attach?</msg> <msg key="Attachments">Attachments:</msg> <msg key="Author">Author</msg> - <msg key="Available_Forums">Available Forums</msg> <msg key="Back_to_thread_label">Back to %forum.name%</msg> <msg key="Back_to_thread_link"><a href="%thread_url%">Back</a> to %forum.name%</msg> <msg key="Body">Body</msg> @@ -22,20 +20,16 @@ <msg key="Charter">Charter</msg> <msg key="charter_max_chars">Charter exceeds maximum length (4000 characters)</msg> <msg key="closed">closed</msg> - <msg key="collapse">Collapse</msg> <msg key="Confirm">Confirm?</msg> <msg key="Confirm_Delete">Confirm Delete:</msg> <msg key="Confirm_Move_to">Confirm Move to</msg> <msg key="Confirm_Post_to_Forum">Confirm Post to Forum:</msg> <msg key="Create_a_New_Forum">Create a New Forum</msg> <msg key="Create_New_Forum">Create New Forum</msg> <msg key="delete">Delete</msg> - <msg key="direct_link_to_this_post">Direct link to this post</msg> <msg key="disable">disable</msg> <msg key="disable_it">disable it</msg> <msg key="disabled">disabled</msg> - <msg key="display_as">Display as: </msg> - <msg key="display_full_posts">Display full posts</msg> <msg key="Edit">Edit</msg> <msg key="edit">Edit</msg> <msg key="Edit_again">Edit again</msg> @@ -51,10 +45,8 @@ <msg key="enabled">enabled</msg> <msg key="Enter_a_list_of_email">Enter a list of email addresses, optionally with first and last names. They will be subscribed to this forum. As an example:</msg> <msg key="Entire_Thread">Entire Thread</msg> - <msg key="expand">Expand</msg> <msg key="First_Post">First Post</msg> <msg key="Flat">Flat</msg> - <msg key="flat">Flat</msg> <msg key="Format">Format</msg> <msg key="Forum">Forum</msg> <msg key="Forum_1">Forum:</msg> @@ -74,11 +66,8 @@ <msg key="help_presentation"><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.</msg> <msg key="html">HTML</msg> <msg key="If_checked_create_users">If checked, create users that don't exist:</msg> - <msg key="in_this_forum_your_screename_is_used">In this forum your screenname is used instead of your realname as follows:</msg> - <msg key="just_display_subjects">Just display subjects</msg> <msg key="Last_Post">Last Post</msg> <msg key="Last_post_in_subject">Last post in subject</msg> - <msg key="link_to_this_post_on_a_separate_page">Link to this post on a separate page</msg> <msg key="List_of_users_that_wrote_in_the_forum">List of users that wrote in the forum:</msg> <msg key="lt_Email_a_copy_of_the_f">Email a copy of the following message:</msg> <msg key="lt_First_post_in_subject">First post in subject</msg> @@ -115,18 +104,14 @@ <msg key="Name">Name</msg> <msg key="name">Name</msg> <msg key="Name_of_forum">Forum Name</msg> - <msg key="nested">Nested</msg> <msg key="New_Forum">New Forum</msg> <msg key="No">No</msg> <msg key="No_Forums">No Forums</msg> - <msg key="no_indentation_for_replies">No indentation for replies</msg> <msg key="No_Messages">No Messages</msg> <msg key="No_Postings">No Postings.</msg> <msg key="None">None</msg> - <msg key="not_allowed">We're sorry, but it appears that you do not have the permission to perform this operation.</msg> <msg key="Number_of_Posts">Number of Posts</msg> <msg key="of_forum">of forum</msg> - <msg key="on">on</msg> <msg key="One_Message">One Message</msg> <msg key="One_Thread">One Thread</msg> <msg key="open">open</msg> @@ -148,10 +133,7 @@ <msg key="Posting_history_for">Posting history for</msg> <msg key="Posting_Policy">Posting Policy</msg> <msg key="Presentation">Presentation</msg> - <msg key="pretty_name">Forums</msg> <msg key="Preview">Preview</msg> - <msg key="print">Print</msg> - <msg key="printable_view">Printable view</msg> <msg key="Re">Re:</msg> <msg key="reject">reject</msg> <msg key="Rejected">Rejected</msg> @@ -182,7 +164,6 @@ <msg key="User">User</msg> <msg key="Users_that_wrote_in_the_forum">Users that wrote in the forum</msg> <msg key="View">View</msg> - <msg key="with_indentation_of_replies">With indentation of replies</msg> <msg key="Yes">Yes</msg> <msg key="You_may">You may</msg> <msg key="Your_Note">Your Note</msg> 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 @@ <td align="left"> <a href="message-view?message_id=@messages.message_id@">@messages.subject@</a> </td> - <td align="left"><if @useScreenNameP@ >@messages.screen_name@</if><else><a href="user-history?user_id=@messages.user_id@">@messages.user_name@</a></else></td> + <td align="left"><a href="user-history?user_id=@messages.user_id@">@messages.user_name@</a></td> <td align="center">@messages.posting_date@</td> </tr> 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 @@ <include src="row" &message="parent_message" preview="1"> </div> </if> -<if @useScreenNameP@>#forums.in_this_forum_your_screename_is_used# "<a href="@pvt_home@">@screen_name@</a>"</if><br> -<if @anonymous_allowed_p@>#forums.anonymious_posts_are_allowed#</if> + <formtemplate id="message"></formtemplate> 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 @@ <if @display_subject_p@ true> <if @preview@ nil> <div class="subject"> - <a href="@message.direct_url@" title="#forums.direct_link_to_this_post#" class="reference">@message.number@</a>: - <a href="message-view?message_id=@message.message_id@" title="#forums.link_to_this_post_on_a_separate_page#" class="alone">@message.subject@</a> + <a href="@message.direct_url@" title="Direct link to this post" class="reference">@message.number@</a>: + <a href="message-view?message_id=@message.message_id@" title="Link to this post on a separate page" class="alone">@message.subject@</a> </if> <else> <div class="subject">@message.subject@ </else> </if> <else> - <div class="subject"><a href="@message.direct_url@" title="#forums.direct_link_to_this_post#" class="reference">@message.number@</a> + <div class="subject"><a href="@message.direct_url@" title="Direct link to this post" class="reference">@message.number@</a> </else> <if @message.parent_number@ not nil> <span class="response">(response to <a href="@message.parent_direct_url@" class="reference">@message.parent_number@</a>)</span> </if> </div> - <div class="attribution"> - #forums.Posted_by# - <if @useScreenNameP@>@message.screen_name@</if> - <else><a - href="user-history?user_id=@message.user_id@">@message.user_name@</a></else> #forums.on# <span class="post-date">@message.posting_date_pretty@</span> + <div class="attribution">#forums.Posted_by# <a href="user-history?user_id=@message.user_id@">@message.user_name@</a> on <span class="post-date">@message.posting_date_pretty@</span></div> </div> - </div> <div class="content"> <div id="content@message.message_id@" class="dynexpanded">@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 @@ <querytext> 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 </querytext> </fullquery> <fullquery name="select_message_responses_attachments"> <querytext> 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 </querytext> </fullquery> 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 </querytext> </fullquery> @@ -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 </querytext> </fullquery> 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: <a href=\"${url}forum-view?forum_id=$message(forum_id)\">$message(forum_name)</a><br>\n" append html_version "Thread: <a href=\"${url}message-view?message_id=$message(root_message_id)\">$message(root_subject)</a><br>\n" - if {$useScreenNameP == 0} { - append html_version "Author: <a href=\"mailto:$message(user_email)\">$message(user_name)</a><br>\n" - } else { - append html_version "Author: $message(screen_name)<br>\n" - } + append html_version "Author: $message(user_name)<br>\n" append html_version "Posted: $message(posting_date)<br>" append html_version "\n<br>\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 @@ </if> <if @forum.presentation_type@ ne "flat"> <div class="displayLinks" style="float: right;"> - #forums.display_as# <a href="#" onclick="setActiveStyleSheet('flat'); return false;" title="#forums.no_indentation_for_replies#" class="button">#forums.flat#</a> - <a href="#" onclick="setActiveStyleSheet('default'); return false;" title="#forums.with_indentation_of_replies#" class="button">#forums.nested#</a> - <a href="#" onclick="setActiveStyleSheet('collapse'); return false;" title="#forums.just_display_subjects#" class="button">#forums.collapse#</a> - <a href="#" onclick="setActiveStyleSheet('expand'); return false;" title="'#forums.display_full_posts#" class="button">#forums.expand#</a> - <a href="#" onclick="setActiveStyleSheet('print'); return false;" title="#forums.printable_view#" class="button">#forums.print#</a> + Display as: <a href="#" onclick="setActiveStyleSheet('flat'); return false;" title="No indentation for replies" class="button">Flat</a> + <a href="#" onclick="setActiveStyleSheet('default'); return false;" title="With indentation of replies" class="button">Nested</a> + <a href="#" onclick="setActiveStyleSheet('collapse'); return false;" title="Just display subjects" class="button">Collapse</a> + <a href="#" onclick="setActiveStyleSheet('expand'); return false;" title="Display full posts" class="button">Expand</a> + <a href="#" onclick="setActiveStyleSheet('print'); return false;" title="Printable view" class="button">Print</a> </div> </if> <ul class="action-links"> 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 @@ <property name="title">Action Not Allowed</property> <property name="context">@context;noquote@</property> -#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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="forums-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="forums-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="admin_pretty_name">Diskussionsforen verwalten</msg> <msg key="disabled">Deaktiviert</msg> @@ -9,6 +9,4 @@ <msg key="New_Forum">Neues Forum erstellen</msg> <msg key="No_Forums">Keine Diskussionsforen vorhanden</msg> <msg key="pretty_name">Diskussionsforen</msg> - <msg key="resources_acs-subsite_new_gif"><img src="/resources/acs-subsite/new_de_DE.gif" /> -</msg> </message_catalog> 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 @@ <msg key="New_Forum">New Forum</msg> <msg key="No_Forums">No Forums</msg> <msg key="pretty_name">Forums</msg> - <msg key="resources_acs-subsite_new_gif"><img src="/resources/acs-subsite/new.gif" /></msg> </message_catalog> 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 @@ %> -<if @shaded_p@ false> - <listtemplate name="forums" style="groups"></listtemplate> -</if> -<else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> + <if @shaded_p@ false> + <if @forums:rowcount@ gt 0> + <multiple name="forums"> + @forums.parent_name@ + <ul> + <group column="package_id"> + <li> + <a href="@forums.url@forum-view?forum_id=@forums.forum_id@" title="#forums-portlet.goto_forums_name#">@forums.name@</a> + <if @forums.new_p@ eq t> + <span class="new_flag"> + <img src="/resources/acs-subsite/new.gif" align="absmiddle" border="0" alt="#forums-portlet.New#" align="baseline"> + </span> + </if> + </li> + </group> + </ul> + </multiple> + </if> + <else> + <small>#forums-portlet.No_Forums#</small> + </else> + + </if> + <else> + + </else> + + + 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 { - <b>@forums.parent_name@</b></br> - <group column="package_id"> - <if @forums.new_p@ eq t> - » <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a> - <span class="new_flag"> - #forums-portlet.resources_acs-subsite_new_gif#</br> - </span> - </if> - <else> - » <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a></br> - </else> - </group> - } - } -} - 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="fs-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="fs-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="advanced">(<font=red>Fortgeschritten</font>)</msg> <msg key="byte">Byte</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="fs-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="fs-portlet" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="advanced">(<font=red>Advanced</font>)</msg> <msg key="byte">byte</msg> 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 @@ %> -<if @config.shaded_p@ ne "t"> - <include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@root_folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@"> <p>@notification_chunk;noquote@</p> <if @webdav_url@ not nil> <p>#file-storage.Folder_available_via_WebDAV_at#</p> </if> -</if> -<else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> 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 @@ </table> </if> - <listtemplate name="folders"></listtemplate> + <table class="table-display" border="0" cellpadding="3" cellspacing="0" width="100%"> + <multiple name="folders"> + <if @folders.rownum@ odd> + <tr class="odd"> + </if> + <else> + <tr class="even"> + </else> + + <if @folders.type@ eq "folder"> + <td> + <a href="@folders.url@?folder_id=@folders.object_id@"> + <img border="0" src="/resources/file-storage/folder.gif" height="14" width="14"> + </a> + </td> + <td> + <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a> + </td> + <td><small>#file-storage.folder_type_pretty_name#</small></td> + <if @folders.content_size@ eq 0> + <td><small>0 #fs-portlet.items#</small></td> + </if> + <else> + <if @folders.content_size@ gt 1> + <td><small>@folders.content_size@ #fs-portlet.items#</small></td> + </if> + <else> + <td><small>@folders.content_size@ #fs-portlet.item#</small></td> + </else> + <td> </td> + </else> + </if> + <else> + <if @folders.type@ eq "url"> + <td> + <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif"></a> + </td> + <td> + <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a> + </td> + <td><small>@folders.type@</small></td> + <td><small> </small></td> + <td><small> </small></td> + </if> + <else> + <td> + <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@"><img border="0" src="/resources/file-storage/file.gif"></a> + </td> + <td> + <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a> + </td> + <td><small>@folders.type@</small></td> + <td><small>@folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else></small></td> + <td> + <nobr> <small>[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>]</small> + </nobr> + </td> + </else> + </else> + </tr> + </multiple> + </table> + </else> + </if> <else> -<small> - #new-portal.when_portlet_shaded# - </small> + </else> <p>@notification_chunk;noquote@</p> 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 { - <small> - <if @folders.type@ eq "folder"> - <div style="float:left;"> - <a href="@folders.url@?folder_id=@folders.object_id@"> - <img border="0" src="/resources/file-storage/folder.gif" height="14" width="14"> - </a> - <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a> - </div> - <div style="float:right;"> - #file-storage.folder_type_pretty_name# - <if @folders.content_size@ eq 0> - 0 #fs-portlet.items# - </if> - <else> - <if @folders.content_size@ gt 1> - @folders.content_size@ #fs-portlet.items# - </if> - <else> - @folders.content_size@ #fs-portlet.item# - </else> - </else> - </div> - </if> - <else> - <if @folders.type@ eq "url"> - <div style="float:left;"> - <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif"></a> - <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a> - @folders.type@ - </div> - </if> - <else> - <div style="float:left;"> - <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@"> - <img border="0" src="/resources/file-storage/file.gif"></a> - <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a> - </div> - <div style="float:right;"> - @folders.type@ - @folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else> - \[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>\] - </div> - </else> - </else> - </small> - } - } - } - 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 @@ <fullquery name="general_comments_get_comments.get_comments"> <querytext> - + 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 @@ <fullquery name="get_comments.get_comments_deprecated"> <querytext> + 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="new-portal" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="new-portal" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Add_Page">Seite hinzuf�gen</msg> <msg key="Bad_direction">Falsche Richtung:</msg> @@ -46,5 +46,4 @@ <msg key="sloan_theme_name">MIT Sloan</msg> <msg key="transaction_failed">Transaktion fehlgeschlagen</msg> <msg key="Unused_Portlets">Nicht verwendete Portlets</msg> - <msg key="when_portlet_shaded">Maximieren Sie das Fenster, um den Inhalt zu sehen.</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="new-portal" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="new-portal" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Add_Page">Add Page</msg> <msg key="Bad_direction">Bad direction:</msg> @@ -46,5 +46,4 @@ <msg key="sloan_theme_name">Sloan</msg> <msg key="transaction_failed">transaction failed</msg> <msg key="Unused_Portlets">Unused Portlets</msg> - <msg key="when_portlet_shaded">Maximize window to display content</msg> </message_catalog> 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 @@ <msg key="sloan_theme_name">Sloan</msg> <msg key="transaction_failed">Transacci�n fallida</msg> <msg key="Unused_Portlets">Portlets disponibles</msg> - <msg key="when_portlet_shaded">Maximice la ventana para ver el contenido.</msg> </message_catalog> 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 @@ <msg key="simple_3column_layout_name">Trois colonnes</msg> <msg key="simple_red_theme_name">simple</msg> <msg key="Unused_Portlets">Portlets non utilis�s</msg> - <msg key="when_portlet_shaded">Agrandir pour voir le contenue.</msg> </message_catalog> 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 @@ <msg key="Back_to_news_list">Zur�ck zur Auflistung der Ank�ndigungen</msg> <msg key="Body">Text</msg> <msg key="bytes">Bytes</msg> - <msg key="Choose_an_image">W�hlen Sie ein Bild aus...</msg> - <msg key="Choose_an_image_to_upload_and_press">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.</msg> <msg key="Comments">Kommentare</msg> <msg key="Confirm">Best�tigen </msg> @@ -31,12 +29,10 @@ <msg key="Database_Error">Datenbankfehler</msg> <msg key="Delete">L�schen</msg> <msg key="Error">Fehler</msg> - <msg key="File">Datei</msg> <msg key="Go">Los</msg> <msg key="going_live_no_archive">Ver�ffentlichung in %n_days_until_publish% Tagen, kein Archivierungsdatum festgelegt</msg> <msg key="going_live_with_archive">Ver�ffentlichung in %n_days_until_publish% Tagen, Archivierung in %n_days_until_archive% Tagen</msg> <msg key="HTML">HTML</msg> - <msg key="Image_must_be_one_of_the_following_types">Das Bild mu� aus einem der folgenden Formate bestehen: </msg> <msg key="It_will_go_live_on">Das Ver�ffentlichungsdatum ist der</msg> <msg key="It_will_move_into_archive_on">Das Archivierungsdatum ist der</msg> <msg key="Lead">Kurztext</msg> @@ -94,15 +90,12 @@ <msg key="Preview_news_item">Ank�ndigung in der Vorschau anzeigen</msg> <msg key="Publication_Date">Ver�ffentlichungsdatum</msg> <msg key="Publish">Ver�ffentlichen</msg> - <msg key="Publish_archive_dates_incorrect"></msg> <msg key="Published">Ver�ffentlicht</msg> <msg key="published_no_archive">Ver�ffentlicht, kein Archivierungsdatum festgelegt</msg> <msg key="published_scheduled_for_archive">Ver�ffentlicht, Archivierung in %n_days_until_archive% Tagen</msg> <msg key="Release">Freigeben</msg> <msg key="Release_Date">Ver�ffentlichungsdatum</msg> - <msg key="Return_to_edit">Zur�ck, um zu �ndern</msg> <msg key="rev">Vers.</msg> - <msg key="Revise">Bearbeiten</msg> <msg key="revise">Neue Version hinzuf�gen</msg> <msg key="Revision">Version</msg> <msg key="Revision_log">Protokolleintrag</msg> @@ -121,11 +114,6 @@ <msg key="The_text_is_formatted_as">Format:</msg> <msg key="Title">Betreff</msg> <msg key="Unapproved">Nicht freigegeben</msg> - <msg key="Upload">Hochladen</msg> - <msg key="Upload_Image">Bild hochladen</msg> - <msg key="use_preview_to_revise_image">verwenden Sie die Vorschau, um das Bild zu �berpr�fen.</msg> - <msg key="Use_the_following_form_to_define">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.</msg> <msg key="Yes">Ja</msg> - <msg key="You_can_either_upload_a_news_item_or_enter_text_in_the_box_provided_but_not_both">Sie k�nnen entweder eine Textnachricht hochladen oder die Nachricht direkt eingeben, aber nicht beides.</msg> <msg key="Your_news_item">Ihre Ank�ndigung</msg> </message_catalog> 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 @@ <msg key="Back_to_news_list">Back to news list</msg> <msg key="Body">Body</msg> <msg key="bytes">bytes</msg> - <msg key="Choose_an_image">Choose an image...</msg> - <msg key="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.</msg> <msg key="Comments">Comments</msg> <msg key="Confirm">Confirm</msg> <msg key="Confirm_Action">Confirm Action:</msg> @@ -30,13 +28,11 @@ <msg key="Database_Error">Database Error</msg> <msg key="Delete">Delete</msg> <msg key="Error">Error</msg> - <msg key="File">File</msg> <msg key="Go">Go</msg> <msg key="going_live_no_archive">Going live in %n_days_until_publish% days, not scheduled for archive</msg> <msg key="going_live_with_archive">Going live in %n_days_until_publish% days, scheduled for archive in %n_days_until_archive% days</msg> <msg key="History">History</msg> <msg key="HTML">HTML</msg> - <msg key="Image_must_be_one_of_the_following_types">Image must be one of the following types: </msg> <msg key="It_will_go_live_on">It will go live on</msg> <msg key="It_will_move_into_archive_on">It will move into the archive on</msg> <msg key="Lead">Lead</msg> @@ -99,16 +95,13 @@ <msg key="Preview_news_item">Preview news item</msg> <msg key="Publication_Date">Publication Date</msg> <msg key="Publish">Publish</msg> - <msg key="Publish_archive_dates_incorrect"></msg> <msg key="Published">Published</msg> <msg key="published_no_archive">Published, not scheduled for archive</msg> <msg key="published_scheduled_for_archive">Published, archived in %n_days_until_archive% days</msg> <msg key="Release">Release</msg> <msg key="Release_Date">Release Date</msg> - <msg key="Return_to_edit">Return to edit</msg> <msg key="Rev">Rev.</msg> <msg key="rev">rev.</msg> - <msg key="Revise">Revise</msg> <msg key="revise">revise</msg> <msg key="Revision">Revision</msg> <msg key="Revision_history">Revision history</msg> @@ -123,16 +116,11 @@ <msg key="Show_live_news">Show live news</msg> <msg key="Status">Status</msg> <msg key="Submit_a_news_item">Submit a news item</msg> - <msg key="Thank_You">Thank You</msg> + <msg key="Thank_You">Thank You!</msg> <msg key="The_action">The action</msg> <msg key="The_text_is_formatted_as">The text is formatted as</msg> <msg key="Title">Title</msg> <msg key="Unapproved">Unapproved</msg> - <msg key="Upload">Upload</msg> - <msg key="Upload_Image">Upload Image</msg> - <msg key="use_preview_to_revise_image">use 'preview' to revise image</msg> - <msg key="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.</msg> <msg key="Yes">Yes</msg> - <msg key="You_can_either_upload_a_news_item_or_enter_text_in_the_box_provided_but_not_both">You can either upload a news item or enter text in the box provided, but not both.</msg> <msg key="Your_news_item">Your news item</msg> </message_catalog> 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 @@ <master> -<property name="title">#news.Upload_Image#</property> +<property name="title">Upload Image</property> <property name="context"></property> -<p>#news.Choose_an_image_to_upload_and_press#</p> +<p>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.</p> <if @image_url@ not nil><img src="@image_url@"></if> <if @mode@ eq preview> 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 "<a href=\"admin/revision-add?item_id=$item_id\">[_ news.Revise]</a>" + set edit_link "<a href=\"admin/revision-add?item_id=$item_id\">Revise</a>" } 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# </p> -<form action="image-choose" method="post"> - @image_vars;noquote@ - <input type="submit" value="#news.Choose_an_image#"> -</form> - <include src=news publish_body=@publish_body;noquote@ publish_lead=@publish_lead@ publish_image=@publish_image@ @@ -40,7 +35,7 @@ </form> <if @action@ eq "News Item"> @edit_action;noquote@ @image_vars;noquote@ - <input type="submit" value="#news.Return_to_edit#"> + <input type="submit" value="Return to edit"> </if> </p> 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 {<li>Publish/archive dates incorrect</li>} } } 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 @@ </p> </if> </form> - </td></tr></table> </else> 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 @@ <property name="title">@title;noquote@</property> -<p>#news.Use_the_following_form_to_define#</p> +<p>Use the following form to define your news item.Note that the fields marked with <span class="formRequired">*</span> are required. +When you're done click 'Preview' to see how the news item will look and to choose an image for the article.</p> <form action="../preview" method="post" enctype="multipart/form-data"> @hidden_vars;noquote@ @@ -31,7 +32,7 @@ <p class="formLabel">Image</p> <p class="formWidget"><if @image_url@ not nil><img src="@image_url@"></if> - [#news.use_preview_to_revise_image#] + [use 'preview' to revise image] </p> <p class="formLabel">#news.Release_Date#</p> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <message_catalog package_key="news-aggregator" package_version="1.0.2" locale="en_US" charset="ISO-8859-1"> - <msg key="Add">Add</msg> - <msg key="Add_new_weblog">Add new weblog</msg> - <msg key="Blog">Blog</msg> - <msg key="Copy">Copy</msg> - <msg key="Copy_Selected">Copy selected subscriptions to %title%</msg> - <msg key="Description">Description</msg> - <msg key="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.</msg> - <msg key="Export_Subscriptions">Export Subscriptions</msg> - <msg key="Export_your_subscriptions_as_an_OPML_file">Export_your_subscriptions as an OPML file</msg> - <msg key="Feed">Feed</msg> - <msg key="General">General</msg> - <msg key="Help_Msg_aggregator">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.</msg> - <msg key="Last_Scan">Last Scan</msg> - <msg key="Last_Update">Last Update</msg> <msg key="lt_Create_New_Aggregator">Create New Aggregator</msg> - <msg key="lt_Create_new_aggregator">Create new aggregator</msg> - <msg key="lt_Edit_attributes_for_t">Edit attributes for this aggregator:</msg> - <msg key="lt_Manage_detailed_permi">Manage detailed permissions for this aggregator. You can use this form to allow other users to view your personal feeds.</msg> <msg key="lt_Manage_This_Aggregato">Manage This Aggregator</msg> - <msg key="lt_No_weblog_options_ava">No weblog options available!</msg> - <msg key="lt_Posted_itemspub_time_">Posted: %items.pub_time_pretty%</msg> - <msg key="lt_The_following_feeds_w">The following feeds were found in the OPML file at</msg> - <msg key="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.</msg> - <msg key="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.</msg> - <msg key="lt_This_page_lists">This page lists <b>the most recent items</b> from the feeds you've <a href="@url@subscriptions">subscribed</a> to.</msg> - <msg key="lt_Use_tabs_below_to_mod">Use tabs below to modify options for this aggregator. Options for %instance_name% are -available on the</msg> - <msg key="lt_You_can_hit_the_Purge">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.</msg> - <msg key="lt_You_can_import_OPML_e">You can import OPML either from an URL, or by uploading a file.</msg> - <msg key="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.</msg> - <msg key="lt_You_will_not_usually_">You will not usually come back to the aggregator.</msg> - <msg key="Manage">Manage</msg> <msg key="Manage_Subscriptions">Manage Subscriptions</msg> - <msg key="Move">Move</msg> - <msg key="Move_Selected">Move selected subscriptions to %title%</msg> - <msg key="Name">Name</msg> - <msg key="No">No</msg> <msg key="No_items">No items.</msg> - <msg key="Note">Note:</msg> <msg key="Off">Off</msg> <msg key="On">On</msg> - <msg key="page">page.</msg> - <msg key="Permissions">Permissions</msg> <msg key="Post">Post</msg> - <msg key="pretty_name">News Aggregator</msg> - <msg key="Public">Public?</msg> <msg key="Purges">Purges:</msg> <msg key="raquo">&raquo;</msg> - <msg key="Save">Save</msg> - <msg key="settings">settings</msg> - <msg key="Source">Source:</msg> - <msg key="Subscriptions">Subscriptions</msg> - <msg key="Titles_Only">Titles Only?</msg> - <msg key="Toggle">Toggle</msg> - <msg key="Unsave">Unsave</msg> - <msg key="Unsubscribe">Unsubscribe</msg> <msg key="updated_x_time_ago">updated %items.diff%</msg> - <msg key="URL">URL</msg> - <msg key="View_the_XML">View the XML source for this subscriptions</msg> - <msg key="Yes">Yes</msg> - <msg key="You_have_been_unsubscribed">You have been unsubscribed from one source.</msg> - <msg key="You_have_been_unsubscribed_from">You have been unsubscribed from %delete_count% sources.</msg> </message_catalog> 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 @@ <include src="aggregator-tabs" tab="general"> <p> -#news-aggregator.lt_Edit_attributes_for_t# +Edit attributes for this aggregator: -<include src="aggregator"> +<include src="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 @@ -<h2>#news-aggregator.Manage# @ag_info.aggregator_name@</h2> +<h2>Manage @ag_info.aggregator_name@</h2> -#news-aggregator.lt_Use_tabs_below_to_mod# <a href="./settings">#news-aggregator.settings#</a> #news-aggregator.page# +Use tabs below to modify options for this aggregator. Options for @instance_name@ are +available on the <a href="./settings">settings</a> page. <p> @@ -9,27 +10,26 @@ <div id="subnavbar"> <if @tab@ eq "general"> - <div class="tab" id="subnavbar-here">#news-aggregator.General#</div> + <div class="tab" id="subnavbar-here">General</div> </if> <else> - <div class="tab"><a href="aggregator-edit?aggregator_id=@aggregator_id@">#news-aggregator.General#</a></div> + <div class="tab"><a href="aggregator-edit?aggregator_id=@aggregator_id@">General</a></div> </else <if @tab@ eq "subscriptions"> - <div class="tab" id="subnavbar-here">#news-aggregator.Subscriptions#</div> + <div class="tab" id="subnavbar-here">Subscriptions</div> </if> <else> - <div class="tab"><a href="subscriptions?aggregator_id=@aggregator_id@">#news-aggregator.Subscriptions#</a></div> + <div class="tab"><a href="subscriptions?aggregator_id=@aggregator_id@">Subscriptions</a></div> </else> <if @tab@ eq "permissions"> - <div class="tab" id="subnavbar-here">#news-aggregator.Permissions#</div> + <div class="tab" id="subnavbar-here">Permissions</div> </if> <else> - <div class="tab"><a href="permissions?aggregator_id=@aggregator_id@">#news-aggregator.Permissions#</a></div> + <div class="tab"><a href="permissions?aggregator_id=@aggregator_id@">Permissions</a></div> </else> </div> </div> </div> - 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 @@ <else> </div> - #news-aggregator.lt_This_page_lists# - </else> + This page lists <b>the most recent items</b> from the feeds you've <a href="@url@subscriptions">subscribed</a> to. + </else> <div> <if @enable_purge_p@ true and @public_p@ false> - #news-aggregator.lt_You_can_hit_the_Purge# + 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. </if> <if @write_p@ true and @blog_p@ true> Click the <a href="#" class="button">Blog</a> 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 @@ <property name="context">@context@</property> <p> - <h3>#news-aggregator.Source# <a href="@link@">@title@</a></h3> + <h3>Source: <a href="@link@">@title@</a></h3> </p> <p> @@ -13,9 +13,9 @@ <if @weblog_p@ true> <formtemplate id="blog_item"></formtemplate> <p> - <b>#news-aggregator.Note#</b> #news-aggregator.lt_You_will_not_usually_# + <b>Note:</b> You will not usually come back to the aggregator. </p> </if> <else> - #news-aggregator.lt_No_weblog_options_ava# -</else> + No weblog options available! +</else> \ 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 @@ <a href="@items.item_link@" class="na-item">@items.item_title;noquote@</a> </if> </div> - <div class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_# + <div class="na-item-pub-time">Posted: @items.pub_time_pretty@ <if @items.item_link@ not nil and @items.item_guid_link@ not nil> <a href="@items.item_guid_link@" title="Permanent URL for this entry" class="na-item">#</a> </if> @@ -28,14 +28,14 @@ <div class="na-item-button-bar"> <if @write_p@ true> <if @items.save_url@ not nil> - <a href="@items.save_url@" alt="Mark this item as saved" class="button">#news-aggregator.Save#</a> + <a href="@items.save_url@" alt="Mark this item as saved" class="button">Save</a> </if> <if @items.unsave_url@ not nil> - <a href="@items.unsave_url@" alt="Unmark this item as saved" class="button">#news-aggregator.Unsave#</a> + <a href="@items.unsave_url@" alt="Unmark this item as saved" class="button">Unsave</a> </if> </if> <if @blog_p@ true> - <a href="@items.item_blog_url@" alt="Post this item to a Weblog" class="button">#news-aggregator.Blog#</a> + <a href="@items.item_blog_url@" alt="Post this item to a Weblog" class="button">Blog</a> </if> </div> </div> @@ -44,23 +44,23 @@ <div class="na-item-title-only na-item"> <a name="@items.item_id@"> <a href="@items.item_link@" class="na-item-title-only-title">@items.item_title;noquote@</a> - <span class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_#</span> + <span class="na-item-pub-time">Posted: @items.pub_time_pretty@</span> <if @items.item_link@ not nil and @items.item_guid_link@ not nil> <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a> </if> <if @write_p@ true> <if @items.save_url@ not nil> - <a href="@items.save_url@" alt="Save" class="button">#news-aggregator.Save#</a> + <a href="@items.save_url@" alt="Save" class="button">Save</a> </if> <if @items.unsave_url@ not nil> - <a href="@items.unsave_url@" alt="Unsave" class="button">#news-aggregator.Unsave#</a> + <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a> </if> </if> <if @blog_p@ true> - <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">#news-aggregator.Blog#</a> + <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a> </if> </div> </else> </group> </group> - </multiple> + </multiple> \ 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 @@ <property name="context">@context@</property> <p> - #news-aggregator.lt_The_following_feeds_w# <b>@opml_url@</b>: + The following feeds were found in the OPML file at <b>@opml_url@</b>: </p> <listtemplate name="opml_feeds"></listtemplate> - 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 @@ </p> <p> - #news-aggregator.lt_You_can_import_OPML_e# + You can import OPML either from an URL, or by uploading a file. </p> <formtemplate id="opml"></formtemplate> - 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 @@ <include src="aggregator-tabs" tab="permissions"> <p> - #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. <p> <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@aggregator_id@"> - 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 @@ <h2>@page_title@</h2> <p> -#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. <listtemplate name="aggregators"></listtemplate> </p> <p> - <b>»</b> <a href="@aggregator_link@">#news-aggregator.lt_Create_new_aggregator#</a> + <b>»</b> <a href="@aggregator_link@">Create new aggregator</a> </p> <p> </p> <p> -#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. <listtemplate name="weblogs"></listtemplate> </p> <p> - <b>»</b> <a href="@package_url@weblog">#news-aggregator.Add_new_weblog#</a> + <b>»</b> <a href="@package_url@weblog">Add new weblog</a> </p> - 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 @@ <a href="@items.item_link@" class="na-item">@items.item_title;noquote@</a> </if> </div> - <div class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_# + <div class="na-item-pub-time">Posted: @items.pub_time_pretty@ <if @items.item_link@ not nil and @items.item_guid_link@ not nil> <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a> </if> @@ -27,14 +27,14 @@ <div class="na-item-button-bar"> <if @write_p@ true> <if @items.save_url@ not nil> - <a href="@items.save_url@" alt="Save" class="button">#news-aggregator.Save#</a> + <a href="@items.save_url@" alt="Save" class="button">Save</a> </if> <if @items.unsave_url@ not nil> - <a href="@items.unsave_url@" alt="Unsave" class="button">#news-aggregator.Unsave#</a> + <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a> </if> </if> <if @blog_p@ true> - <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">#news-aggregator.Blog#</a> + <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a> </if> </div> </div> @@ -43,22 +43,22 @@ <div class="na-item-title-only na-item"> <a name="@items.item_id@"> <a href="@items.item_link@" class="na-item-title-only-title">@items.item_title;noquote@</a> - <span class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_#</span> + <span class="na-item-pub-time">Posted: @items.pub_time_pretty@</span> <if @items.item_link@ not nil and @items.item_guid_link@ not nil> <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a> </if> <if @write_p@ true> <if @items.save_url@ not nil> - <a href="@items.save_url@" alt="Save" class="button">#news-aggregator.Save#</a> + <a href="@items.save_url@" alt="Save" class="button">Save</a> </if> <if @items.unsave_url@ not nil> - <a href="@items.unsave_url@" alt="Unsave" class="button">#news-aggregator.Unsave#</a> + <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a> </if> </if> <if @blog_p@ true> - <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">#news-aggregator.Blog#</a> + <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a> </if> </div> </else> </group> - </multiple> + </multiple> \ 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 @@ <property name="context">@context@</property> <include src="aggregator-tabs" tab="subscriptions"> - <p>#news-aggregator.Enter_the_URL_of_an_XML_news_feed#</p> + <p> + 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. + </p> <formtemplate id=add_subscription></formtemplate> <if @sources:rowcount@ > <p> - #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. </p> </if> <p> <listtemplate name="sources"></listtemplate> </p> - 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 { - <center><if @sources.show_description_p@ true>\#news-aggregator.No\#</if><else>\#news-aggregator.Yes\#</else> <a href="@sources.toggle_show_desc_url@" title="toggle" class="button">toggle</a></center> + <center><if @sources.show_description_p@ true>No</if><else>Yes</else> <a href="@sources.toggle_show_desc_url@" title="toggle" class="button">toggle</a></center> } } feed_url { - label "\#news-aggregator.Source\#" + label "Source" display_template { - <a href="@sources.feed_url@" title="\#news-aggregator.View_the_XML\#" + <a href="@sources.feed_url@" title="View the XML + source for this subscriptions." ><img src="@sources.xml_graphics_url@" height="14" width="36" - alt="\#news-aggregator.View_the_XML\#" border="0"></a> + alt="View the XML source for this subscription" border="0"></a> } } } -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 @@ <ul> - <li><a href="@url@">#news-aggregator-portlet.Manage_subscriptions#</a> + <li><a href="@url@">Manage subscriptions</a> </ul> 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 @@ -<if @shaded_p@ ne "t"> - - <if @items:rowcount@ gt 0> - - <table cellspacing=1 cellpadding=0 border=0> - <tr> - <td bgcolor="#cccccc"> - <table cellspacing=1 cellpadding=5 border=0 width="100%"> - <multiple name="items"> - <group column="sort_date"> - <tr bgcolor="#f5f5f5"> - <td><b><a href="@items.link@">@items.title@</a>, @items.last_scanned@</b></td> - <td><a href="@items.feed_url@">RSS</a></td> - </tr> - <group column="source_id"> - <tr bgcolor="#ffffff"> - <td> - @items.content;noquote@ - <if @items.item_link@ not nil> - <a href="@items.item_link@">#</a> - </if> - </td> - <td> </td> - </tr> - </group> - </group> - </multiple> - </table> - </td> - </tr> - </table> - - <if @items:rowcount@ eq 0> - <small>No Feeds.</small> - </if> - - <if @write_p@ eq 1> - <p> - <b>»</b> <a href="@subscription_url@">Add or remove subscriptions</a> - </p> - </if> - - </if> - <else> - <small>#news-aggregator-portlet.No_Items#</small> - </else> - -</if> -<else> - <small> - #new-portal.when_portlet_shaded# - </small> -</else> +<if @shaded_p@ ne "t"> + + <if @items:rowcount@ gt 0> + + <table cellspacing=1 cellpadding=0 border=0> + <tr> + <td bgcolor="#cccccc"> + <table cellspacing=1 cellpadding=5 border=0 width="100%"> + <multiple name="items"> + <group column="sort_date"> + <tr bgcolor="#f5f5f5"> + <td><b><a href="@items.link@">@items.title@</a>, @items.last_scanned@</b></td> + <td><a href="@items.feed_url@">RSS</a></td> + </tr> + <group column="source_id"> + <tr bgcolor="#ffffff"> + <td> + @items.content;noquote@ + <if @items.item_link@ not nil> + <a href="@items.item_link@">#</a> + </if> + </td> + <td> </td> + </tr> + </group> + </group> + </multiple> + </table> + </td> + </tr> + </table> + + <if @items:rowcount@ eq 0> + <small>No Feeds.</small> + </if> + + <if @write_p@ eq 1> + <p> + <b>»</b> <a href="@subscription_url@">Add or remove subscriptions</a> + </p> + </if> + + </if> + <else> + <small>No Items</small> + </else> + +</if> +<else> + +</else> 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 "<a href=\"$item_link\">$item_title</a>. $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 "<a href=\"$item_link\">$item_title</a>. $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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="news-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="news-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Add_a_News_Item">Neue Ank�ndigung erstellen</msg> <msg key="admin_pretty_name">Ank�ndigungen verwalten</msg> - <msg key="Contributed_by">Von</msg> <msg key="Manage_News">Ank�ndigungen verwalten</msg> <msg key="No_News">Keine Ank�ndigungen vorhanden</msg> <msg key="pretty_name">Ank�ndigungen</msg> 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 @@ <msg key="Add_a_News_Item">Add a News Item</msg> <msg key="admin_pretty_name">News Administration</msg> - <msg key="Contributed_by">Contributed by</msg> <msg key="Manage_News">Manage News</msg> <msg key="news_syndication_feed">News syndication feed</msg> <msg key="No_News">No News</msg> 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 @@ </if> <else> - <listtemplate name="news" style="groups"></listtemplate> + + <multiple name="news_items"> + <if @one_instance_p@ false><h3>@news_items.parent_name@</h3></if> + <ul> + <group column="package_id"> + <if @display_item_content_p@ eq "1"> + <li> + <p>@news_items.publish_body;noquote@</p> + <if @display_item_attribution_p@ eq "1"> + <p>Contributed by <a href="@news_items.creator_url@">@news_items.item_creator@</a></p> + </if> + </li> + </if> + <else> + <li> + <a href="@news_items.url@item?item_id=@news_items.item_id@" title="#news-portlet.show_content_news_items_publish_title#">@news_items.publish_title@</a> + <small>(@news_items.publish_date@)</small> + </li> + </else> + </group> + </ul> + <br/>@news_items.notification_chunk;noquote@ + <if @news_items.rss_exists@ eq 1> + <br/><a href="@news_items.rss_url;noquote@" title="#news-portlet.news_syndication_feed#">#rss-support.Syndication_Feed# <img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" border=0 /></a><hr/><br/> + </if> + </multiple> </else> </if> <else> <small>#news-portlet.No_News#</small> </else> </if> <else> - <small> - #new-portal.when_portlet_shaded# - </small> + </else> -<if @inside_comm_p@ ></br><small><a href="@news_url@news/item-create">#news-portlet.Add_a_News_Item#</a></small></if> +<if @inside_comm_p@ ><br><a href="@news_url@news/item-create">#news-portlet.Add_a_News_Item#</a></if> 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 { - <if @one_instance_p@ false><b>@news_items.parent_name@</b></if></br> - <group column="package_id"> - <if @display_item_content_p@ eq "1"> - <p>@news_items.publish_body;noquote@</p> - <if @display_item_attribution_p@ eq "1"> - <p>#news-portlet.Contributed_by# <a href="@news_items.creator_url@">@news_items.item_creator@</a> - </if> - </if><else> - » <a href="@news_items.url@item?item_id=@news_items.item_id@">@news_items.publish_title@</a> - <small>@news_items.publish_date@</small> - </else> - <if @news_items.rss_exists@ eq 1> - <a href="@news_items.rss_url;noquote@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" border=0 /></a> - </if></br> - </group> - } - } - 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@ <if @display_item_attribution_p@ eq "1"> -<p>#news-portlet.Contributed_by# <a href="@creator_url@">@item_creator@</a> +<p>Contributed by <a href="@creator_url@">@item_creator@</a></p> </if> </blockquote> 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 @@ <msg key="Notification_Types">Benachrichtigungstypen</msg> <msg key="Notifications">Benachrichtigungen</msg> <msg key="Request_Notification">Benachrichtigungsfunktion aktivieren</msg> - <msg key="Short_Subscribe_Link"></msg> - <msg key="Short_Unsubscribe_Link"></msg> <msg key="SUBJECT">BETREFF:</msg> - <msg key="Subscribe">benachrichtigen</msg> <msg key="Unsubscribe">Benachrichtigungsfunktion deaktivieren</msg> </message_catalog> 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 @@ <msg key="Notification_Types">Notification Types</msg> <msg key="Notifications">Notifications</msg> <msg key="Request_Notification">Request Notification</msg> - <msg key="Short_Subscribe_Link"></msg> - <msg key="Short_Unsubscribe_Link"></msg> <msg key="SUBJECT">SUBJECT:</msg> - <msg key="Subscribe">Subscribe</msg> <msg key="Unsubscribe">Unsubscribe</msg> </message_catalog> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="search" package_version="5.2.3" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="search" package_version="5.2.3b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Advanced_Search">Erweiterte Suche</msg> <msg key="and_not_needed">Der '<b>AND</>' operator is unn�tig -- es sind alle Suchbegriffe standardm�ssig enthalten</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="search" package_version="5.2.3" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="search" package_version="5.2.3b2" locale="en_US" charset="ISO-8859-1"> <msg key="Advanced_Search">Advanced Search</msg> <msg key="and_not_needed">The "<b>AND</b>" operator is unnecessary -- we include all search terms by default.</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="static-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="static-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="admin_portlet_element_pretty_name">Benutzerdefiniertes Portlet</msg> <msg key="admin_portlet_pretty_name">Benutzerdefinierte Portlets verwalten</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="static-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="static-portlet" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="admin_portlet_element_pretty_name">Custom Portlet</msg> <msg key="admin_portlet_pretty_name">Custom Portlet Administration</msg> 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 @@ <msg key="add_new_question">Neue Frage hinzuf�gen</msg> <msg key="Admin_This_Survey">Diese Evaluation verwalten</msg> <msg key="allow_multiple">Teilnahme mehrmals m�glich</msg> - <msg key="Answer_Survey">Umfrage starten</msg> + <msg key="Answer_Survey">Evaluation starten</msg> <msg key="Answer_Text">Antworttext</msg> <msg key="are">sind</msg> <msg key="Below_the_question">Unterhalb der Frage</msg> @@ -99,7 +99,7 @@ <msg key="lt_For_Multiple_Choicebr">Geben Sie hier die<br>m�glichen Antworten ein,<br>eine pro Zeile.</msg> <msg key="lt_had_to_say_in_respons">gab in %survey_name% folgende Antworten:</msg> <msg key="lt_Here_is_how_your_surv">Die Beschreibung der Evaluation wird wie folgt angezeigt:</msg> - <msg key="lt_img_srcgraphicsadming"><img src="graphics/Verwalten.gif" border="0" alt="Umfrage verwalten"> </msg> + <msg key="lt_img_srcgraphicsadming"><img src="graphics/Verwalten.gif" border="0" alt="Evaluationen verwalten"> </msg> <msg key="lt_img_srcgraphicsadming_1"><img src="graphics/Verwalten.gif" border="0" alt="Verwalten"> </msg> <msg key="lt_Main_Survey_Administr">Evaluationen verwalten</msg> <msg key="lt_Modify_a_Questions_Te">Den Text einer Frage �ndern</msg> @@ -131,7 +131,7 @@ <msg key="lt_Return_to_survey_admi">Zur�ck zu Evaluationen verwalten</msg> <msg key="lt_Section_section_id_do">Der Abschnitt %section_id% ist nicht vorhanden.</msg> <msg key="lt_Send_Mail_Re_survey_n">E-Mail senden bez�glich %survey_name%</msg> - <msg key="lt_Survey_Administration">Umfragen verwalten</msg> + <msg key="lt_Survey_Administration">Evaluationen verwalten</msg> <msg key="lt_Survey_Administration_1">Evaluationen verwalten: Neue Frage hinzuf�gen (Forts.)</msg> <msg key="lt_Survey_Administration_2">Evaluationen verwalten: Neue Evaluation erstellen</msg> <msg key="lt_survey_infoname_New_Q">%survey_info.name%: Neue Frage</msg> @@ -163,7 +163,7 @@ <msg key="lt_This_survey_allows_yo">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.</msg> <msg key="lt_This_survey_is_not_ed">Diese Evaluation kann nicht bearbeitet werden.</msg> <msg key="lt_This_will_remove_respo">Bei diesem Vorgang werden %response_count% R�ckantworten gel�scht.</msg> - <msg key="lt_to_the_survey_index_p">zur Umfrage�bersicht</msg> + <msg key="lt_to_the_survey_index_p">zur Evaluations�bersicht</msg> <msg key="lt_Users_may_edit_their_">Benutzer k�nnen Ihre R�ckantworten nachtr�glich bearbeiten.</msg> <msg key="lt_Users_may_not_edit_th">Teilnehmer k�nnen ihre R�ckantworten nicht nachtr�glich bearbeiten</msg> <msg key="lt_Valid_Resposnes_enter">M�gliche Antworten (eine pro Zeile)</msg> @@ -184,12 +184,11 @@ <msg key="Multiple_Choice">Mehrere Antworten zur Auswahl:</msg> <msg key="multiple_responses">Mehrfachantworten</msg> <msg key="Name_copy">Bezeichnung</msg> - <msg key="New_Survey">Neue Umfrage erstellen</msg> + <msg key="New_Survey">Neue Evaluation erstellen</msg> <msg key="No">Nein</msg> <msg key="No_data_found">Es wurden keine Daten gefunden.</msg> <msg key="No_Responses">Keine R�ckantworten vorhanden</msg> <msg key="No_surveys_active">Keine aktivierten Komplexaufgaben vorhanden</msg> - <msg key="No_unanswered_surveys">Keine Umfragen, die noch nicht beantwortet wurden.</msg> <msg key="non-">nicht </msg> <msg key="Not_Found">Nicht gefunden</msg> <msg key="Number">Zahl</msg> @@ -228,10 +227,9 @@ <msg key="Submit">Abschicken</msg> <msg key="Submit_response">R�ckantwort abschicken</msg> <msg key="Summary">�bersicht</msg> - <msg key="Survey">Umfragen</msg> <msg key="Survey_Description">Beschreibung der Evaluation</msg> <msg key="Survey_Name">Bezeichnung der Evaluation:</msg> - <msg key="Survey_Name_1">Bezeichnung der Umfrage</msg> + <msg key="Survey_Name_1">Bezeichnung der Evaluation</msg> <msg key="Survey_Name_name">Bezeichnung der Evaluation:</msg> <msg key="Surveys">Komplexaufgaben</msg> <msg key="table">Tabelle</msg> @@ -242,8 +240,6 @@ <msg key="Type_of_Response">Zul�ssige Werte</msg> <msg key="Uploaded_file">Hochgeladene Datei:</msg> <msg key="View">Anzeigen</msg> - <msg key="view_edit_previous_responses">Bisherige Angaben anschauen/bearbeiten</msg> - <msg key="view_edit_previous_responses_for_surveys_in_this_group">Bisherige Angaben f�r Umfragen in dieser Gruppe anschauen/bearbeiten</msg> <msg key="View_Response">R�ckantwort anzeigen</msg> <msg key="View_Responses">R�ckantworten anzeigen:</msg> <msg key="View_responses">R�ckantworten anzeigen</msg> 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 @@ <msg key="No_data_found">No data found</msg> <msg key="No_Responses">No Responses</msg> <msg key="No_surveys_active">No surveys active</msg> - <msg key="No_unanswered_surveys">No unanswered surveys</msg> <msg key="non-">non-</msg> <msg key="Not_Found">Not Found</msg> <msg key="Number">Number</msg> @@ -270,8 +269,6 @@ <msg key="Type_of_Response">Type of Response</msg> <msg key="Uploaded_file">Uploaded file:</msg> <msg key="View">View</msg> - <msg key="view_edit_previous_responses">view/edit previous responses</msg> - <msg key="view_edit_previous_responses_for_surveys_in_this_group">view/edit previous responses for surveys in this group</msg> <msg key="View_Response">View Response</msg> <msg key="View_Responses">View Responses:</msg> <msg key="View_responses">View responses</msg> 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 @@ %> -<if @config.shaded_p@ ne "t"> - <if @surveys:rowcount@ gt 0 and @readable_surveys_p@ eq 1> <multiple name="surveys"> - <if @one_instance_p@ false>@surveys.parent_name@</if> - <ul> +<if @one_instance_p@ false>@surveys.parent_name@</if> +<ul> - <group column="package_id"> - <if @surveys.response_count@ eq 0 and @surveys.can_read_private_data_p@> - <li><a href="@surveys.url@one-survey?survey_id=@surveys.survey_id@">@surveys.name@</a></li> - </if> - </group> - </ul> - <if @one_instance_p@><br /></if> - <if @surveys.can_read_private_data_p@> - <a href="@surveys.url@"> - <if @one_instance_p@ eq 0> - <small>#survey-portlet.view_edit_previous_responses_for_surveys_in_this_group#</small> - </if> - <else> - <small>#survey-portlet.view_edit_previous_responses#</small> - </else> - </a><br /> - </if><br /> - </multiple> +<group column="package_id"> + <if @surveys.response_count@ eq 0 and @surveys.can_read_private_data_p@> + <li> + <a href="@surveys.url@one-survey?survey_id=@surveys.survey_id@">@surveys.name@</a> + </li> + </if> +</group> +</ul> + <if @one_instance_p@><br /></if><if @surveys.can_read_private_data_p@><a href="@surveys.url@">view/edit previous responses<if @one_instance_p@ eq 0> for surveys in this group</if></a><br /></if><br /> + </multiple> </if> <else> - <small>#survey.No_unanswered_surveys#</small> + <small>No unanswered surveys</small> </else> </if> -<else> - <small>#new-portal.when_portlet_shaded#</small> -</else> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="theme-selva" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="theme-selva" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Communities">Mitgliedschaften</msg> <msg key="ControlPanel">Eigene Einstellungen</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="weblogger-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1"> +<message_catalog package_key="weblogger-portlet" package_version="2.2.0b2" locale="de_DE" charset="ISO-8859-1"> <msg key="Add_entry">Eintrag hinzuf�gen</msg> <msg key="Administer_Weblogger">Verwalte Weblogger</msg> <msg key="Administration">Weblogger-Verwaltung</msg> - <msg key="Draft_entries">Entw�rfe + <msg key="Draft_entries">Entw�rfe </msg> <msg key="FullView">Vollansicht</msg> <msg key="lt_by_entriesposter_firs">nach %entries.poster_first_names% %entries.poster_last_name%</msg> 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 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<message_catalog package_key="weblogger-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1"> +<message_catalog package_key="weblogger-portlet" package_version="2.2.0b2" locale="en_US" charset="ISO-8859-1"> <msg key="Add_entry">Add entry</msg> <msg key="Administer_Weblogger">Administer Weblogger</msg> 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 @@ <if @read_p@ true> <if @shaded_p@ ne "t"> - <listtemplate name="blogs" style="groups"></listtemplate> + + <if @entries:rowcount@ gt 0> + <multiple name="entries"> + @entries.parent_name@ + <ul> + <group column="package_id"> + <if @entries.entry_id@ not nil> + <li> + <p> + <b><a href="@entries.view_url@" title="View this entry">@entries.title@</a></b> <br /> + @entries.content;noquote@ + <br><b>#weblogger-portlet.lt_by_entriesposter_firs#</b> + <small>(@entries.posted_time_pretty@)</small> + </p> + </li> + </if> + </group> + </ul> + <if @entries.add_url@ not nil> + <p> + <b>#weblogger-portlet.raquo#</b> <a href="@entries.add_url@">#weblogger-portlet.Add_entry#</a> + </p> + </if> + <p> + <b>#weblogger-portlet.raquo#</b> <a href="@entries.base_url@">#weblogger-portlet.FullView#</a> + </p> + </multiple> + </if> + <else> + <small>#weblogger-portlet.No_Entries#</small> + </else> </if> <else> - <small>#new-portal.when_portlet_shaded#</small> + </else> </if> 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 { - <b>@entries.parent_name@</b></br> - <group column="package_id"> - <if @entries.entry_id@ not nil> - » <i><a href="@entries.view_url@" title="View this entry">@entries.title@</a></i> - @entries.content;noquote@ - <small>(@entries.posted_time_pretty@)</small></br> - </if> - </group> - } - } - actions { - label "" - display_template { - <if @entries.add_url@ not nil><a href="@entries.add_url@">#weblogger-portlet.Add_entry#</a> - | </if> - <a href="@entries.base_url@">\#weblogger-portlet.FullView\#</a> - } - } -} - 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