Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.6 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.7 @@ -73,7 +73,7 @@ Bem�rk, at du kan slette den gemte e-mailadresse og adgangskode ved at v�lge "log ud" fra din arbejdsplads. Nu har vi virkelig problemer, for vi fik denne fejl: %num_children% B�rn skjult - Den %portrait_publish_date%, uploadede du <a href="/user/portrait/">%portrait_title%</a> + Den %portrait_publish_date%, uploadede du <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> Vore server kan fort�lle din browser, at den skal gemme visse ting s�som din e-mailadresse og din adgangskode. Dette er smart, fordi du - hvis du er den eneste, der bruger din computer - ikke bliver n�dt til at fort�lle os din e-mailadresse og din kode hver gang du bes�ger siden. Bekr�ftigelse af adgangskode: URL til personlig hjemmeside: 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.4 -r1.5 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.4 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.5 @@ -75,7 +75,7 @@ Beachten Sie dass Sie Ihre abgespeicherte eMail-Adresse und Ihr Passwort ausl�schen k�nnen, indem Sie die Option "Abmelden" in Ihrem Arbeitsbereich w�hlen. Nun haben wir ein echtes Problem, denn wir haben folgenden Fehler bekommen: %num_children% Kinder ausgeblendet - Am %portrait_publish_date% haben Sie <a href="/user/portrait/">%">%portrait_title% hochgeladen. + Am %portrait_publish_date% haben Sie <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%">%portrait_title% hochgeladen. Unser Server kann Ihrem Browser sagen dass er sich bestimmte Dinge merken soll, wie etwa Ihre eMail-Adresse und Ihr Passwort. Dies ist angenehm f�r Sie, wenn Sie die einzige Person sind die Ihren PC benutzt; Sie m�ssen uns dann nicht immer wieder eMail-Adresse und Passwort angeben. Passwort-Best�tigung: Adresse der pers�nlichen Homepage: 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.9 -r1.10 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.9 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.10 @@ -92,7 +92,7 @@ choosing the "log out" option from your workspace. Now we're really in trouble because we got this error: %num_children% Children Hidden - On %portrait_publish_date%, you uploaded <a href="/user/portrait/">%portrait_title%</a> + On %portrait_publish_date%, you uploaded <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> Our server can tell your browser to remember certain things, such as your email address and password. This is convenient for you because, if you're the only person who uses your computer, you won't have to Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.4 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.5 @@ -73,7 +73,7 @@ Tenga en cuenta que puede eliminar su direcci�n de correo y contrase�a de la memoria de su ordenador, pulsando la opci�n "Salir" de su portal. Ahora estamos realmente en problemas porque hemos obtenido este error: %num_children% Hijos ocultos - El %portrait_publish_date%, subiste <a href="/user/portrait/"">%portrait_title%</a> + El %portrait_publish_date%, subiste <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%"">%portrait_title%</a> Nuestro servidor le puede decir a su navegador que recuerde algunas cosas como su direcci�n electr�nica y su contrase�a. Esto es conveniente porque si usted es la �nica persona que usa su ordenador, no tiene que repetirnos su correo ni su contrase�a. Confirmaci�n de la contrase�a: URL de su p�gina personal: Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.ISO-8859-15.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.fi_FI.ISO-8859-15.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.ISO-8859-15.xml 24 Jun 2003 12:01:27 -0000 1.4 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.ISO-8859-15.xml 15 Aug 2003 21:18:12 -0000 1.5 @@ -74,7 +74,7 @@ Huomaa, että voit nollata tallentamasi sähköpostiosoitteen ja salasanan valitsemalla "kirjaudu ulos" järjestelmän omalta kotisivultasi. Nyt olemme todella lirissä, koska saimme seuraavan virheilmoituksen: %num_children% piilotettu(a) lapsi/lasta - %portrait_publish_date% tallensit tänne kuvan nimeltä <a href="/user/portrait/">%portrait_title%</a> + %portrait_publish_date% tallensit tänne kuvan nimeltä <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> Palvelimemme voi pyytää selaintasi muistamaan tiettyjä asioita, kuten sähköpostiosoitteesi ja salasanasi. Tämä on kätevää, koska jos olet koneesi ainoa käyttäjä, sinun ei tarvitse jatkuvasti syöttää näitä tietoja uudelleen. Salasnan varmistus: Oman kotisivun osoite: Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.2 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.3 @@ -73,7 +73,7 @@ L'option "d�connecter" de votre espace de travail, permet d'effacer toute trace de votre adresse email et mot de passe. Maintenant nous avons vraiment un probl�me car nous venons de recevoir l'erreur suivante: %num_children% fils cach�s - Vous avez envoy� <a href="/user/portrait/">%portrait_title%</a> le %portrait_publish_date% + Vous avez envoy� <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> le %portrait_publish_date% Notre serveur peut envoyer certaines donn�es � votre navigateur, comme vos adresse email et mot de passe. C'est un avantage car, si vous �tes la seule personne � utiliser cet ordinateur, vous n'aurez pas � les introduire � chaque fois. Confirmation de mot de passe: URL de votre page web personnelle: Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.EUC-KR.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.ko_KR.EUC-KR.xml,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.EUC-KR.xml 24 Jun 2003 12:01:27 -0000 1.1 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.EUC-KR.xml 15 Aug 2003 21:18:12 -0000 1.2 @@ -73,7 +73,7 @@ �۾��������� "�α� �ƿ�"�ɼ��� ���������ν� ����Ǿ��� ���ڿ����ּҿ� ��й�ȣ�� ������ �� �ֽ��ϴ�. ������ ���� ������ �߻��߽��ϴ�. %num_children% ������ ���̵� - %portrait_publish_date%�� ���ε��߽��ϴ�<a href="/user/portrait/">%portrait_title%</a> + %portrait_publish_date%�� ���ε��߽��ϴ�<a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> �������� ���Ǹ� ����, ������ ���������� ���ڿ����ּҳ� ��й�ȣ�� ���� ������ ����ϰ� �� �� �ֽ��ϴ�. ���� �������� ��ǻ�͸� ������ ȥ�ڼ��� ����ϴ� ���̶��,���ڿ��� �ּҳ� ��й�ȣ�� �Ź� �Է��� �ʿ䰡 �����ϴ�. ��й�ȣ Ȯ��: ���� Ȩ������ URL: Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.4 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.5 @@ -74,7 +74,7 @@ Een opgeslagen e-mailadres en wachtwoord kan worden gewist door de "log uit" optie te kiezen vanuit de "Werkplek". Nu hebben we echt een probleem, omdat we de volgende fout hebben: %num_children% verborgen onderliggende elementen - <a href="/user/portrait/">%portrait_title%</a> is op %portrait_publish_date% ingevoerd + <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> is op %portrait_publish_date% ingevoerd Ons systeem kan uw browser helpen om dingen te onthouden, zoals uw e-mailadres en wachtwoord. Dit is handig als u de enige bent die op uw computer werkt. U hoeft uw e-mailadres en wachtwoord dan niet steeds in te typen. Bevestig Wachtwoord: URL van persoonlijke webpagina: Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.3 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.4 @@ -74,7 +74,7 @@ Legg merke til at du kan slette e-postadressen og passordet du har lagret ved � velge "logg ut" fra arbeidsomr�det ditt. N� har vi virkelig problemer fordi vi fikk denne feilmeldingen: %num_children% Barn gjemt - Den %portrait_publish_date%, lastet du opp <a href="/user/portrait/">%portrait_title%</a> + Den %portrait_publish_date%, lastet du opp <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> Tjenesten v�r kan be webleseren din � huske visse ting, som bruker-id og passord. Dette er praktisk for deg fordi, dersom du er den eneste personen som bruker denne maskinen, s� trenger du ikke fortelle dem til oss hele tiden. Bekreft passord: URL for personlig webside: Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.ISO-8859-2.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.pl_PL.ISO-8859-2.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.ISO-8859-2.xml 24 Jun 2003 12:01:27 -0000 1.4 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.ISO-8859-2.xml 15 Aug 2003 21:18:12 -0000 1.5 @@ -75,7 +75,7 @@ Mo�esz wymaza� swoje zapisane email i has�o wybieraj�c "wyloguj si�" na Twoim Pulpicie. Mamy k�opoty poniewa� wyst�pi� b��d: %num_children% Ukrytych Dzieci - %portrait_publish_date% wgrano <a href="/user/portrait/">%portrait_title%</a> + %portrait_publish_date% wgrano <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> Twoja przegl�darka mo�e zapami�ta� Tw�j email i has�o. Jest to wygodne, bo nie musisz ci�gle ich wpisywa� - ale bezpieczne TYLKO wtedy gdy JEDYNIE TY u�ywasz komputera z kt�rego odwiedzasz nasz system. Potwierdzenie Has�a URL Strony Domowej Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml 24 Jun 2003 12:01:27 -0000 1.4 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml 15 Aug 2003 21:18:12 -0000 1.5 @@ -73,7 +73,7 @@ Notera att du kan ta bort din sparade e-postadress ocj l�senord genom att v�lja "logga ut" fr�n ditt arbetsrum. Nu har vi verkliga problem, beroende p� detta fel: %num_children% Children g�mda - P� %portrait_publish_date%, laddade du upp <a href="/user/portrait/">%portrait_title%</a> + P� %portrait_publish_date%, laddade du upp <a href="%subsite_url%user/portrait/?return_url=%pvt_home_url%">%portrait_title%</a> V�r server kan f� din webbl�sare att minnas vissa saker, t.ex. d�n epostadress och ditt l�senord. Om du �r den enda personen som anv�nder din dator, kommer det att underl�tta eftersom du inte beh�ver ange epostadress och l�senord. L�senordsbekr�ftelse: URL till personlig hemsida: Index: openacs-4/packages/acs-subsite/www/pvt/home.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/pvt/home.adp 22 May 2003 14:12:54 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/pvt/home.adp 15 Aug 2003 21:18:12 -0000 1.7 @@ -6,11 +6,10 @@

-

  • #acs-subsite.Log_Out# - +
  • Log Out

    -

  • #acs-subsite.Change_my_Password# +
  • #acs-subsite.Change_my_Password# @@ -32,13 +31,13 @@
  • #acs-subsite.screen_name# @screen_name;noquote@
  • #acs-subsite.bio# @bio@
  • -

    (#acs-subsite.update#)

    +

    (#acs-subsite.Update#)

    #acs-subsite.Your_Portrait#

    -#acs-subsite.lt_Show_everyone_else_at# #acs-subsite.upload_a_portrait# +#acs-subsite.lt_Show_everyone_else_at# #acs-subsite.upload_a_portrait#
    @@ -55,9 +54,9 @@ #acs-subsite.lt_Then_you_should_eithe#

    #acs-subsite.or#

    Index: openacs-4/packages/acs-subsite/www/pvt/home.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/pvt/home.tcl 9 Dec 2002 13:29:00 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/pvt/home.tcl 15 Aug 2003 21:18:12 -0000 1.8 @@ -17,10 +17,15 @@ export_user_id:onevalue ad_url:onevalue member_link:onevalue + subsite_url:onevalue + pvt_home_url:onevalue } set user_id [ad_verify_and_get_user_id] +set subsite_url [subsite::get_element -element url] +set pvt_home_url [ad_pvt_home] + set user_exists_p [db_0or1row pvt_home_user_info { select first_names, last_name, email, url, nvl(screen_name,'< none set up >') as screen_name @@ -84,11 +89,7 @@ set header [ad_header "$full_name's workspace at $system_name"] -if {[ad_conn package_url] == "/"} { - set context [list "[ad_pvt_home_name]"] -} else { - set context [list "Home"] -} +set context [list "[ad_pvt_home_name]"] set export_user_id [export_url_vars user_id] set ad_url [ad_url] Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-to-null.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp 6 Sep 2002 21:50:08 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp 15 Aug 2003 21:18:12 -0000 1.4 @@ -1,5 +1,6 @@ -Vacation Information Updated +Vacation Information Updated +Information Updated

    You're marked as back from vacation at @site_link@.

    Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-until.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp 6 Sep 2002 21:50:08 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp 15 Aug 2003 21:18:12 -0000 1.4 @@ -1,6 +1,7 @@ -Vacation Information Updated - +Vacation Information Updated +Information Updated +

    Your vacation information at @site_link@ has been updated.

    You won't get any email until after @pretty_date@.

    Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp 6 Sep 2002 21:50:08 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp 15 Aug 2003 21:18:12 -0000 1.5 @@ -1,5 +1,6 @@ Confirm Unsubscribe +Confirm Unsubscribe

    Confirm that you'd like to unsubscribe from @site_link@.

    Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp 7 Nov 2002 18:06:57 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp 15 Aug 2003 21:18:12 -0000 1.5 @@ -1,5 +1,6 @@ #acs-subsite.Awaiting_Approval# +#acs-subsite.Awaiting_Approval#

    #acs-subsite.lt_registration_request_submitted#

    Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp 7 Nov 2002 18:06:57 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp 15 Aug 2003 21:18:12 -0000 1.5 @@ -1,6 +1,7 @@ #acs-subsite.lt_Awaiting_email_verifi# - +#acs-subsite.lt_Awaiting_email_verifi# +

    #acs-subsite.lt_Registration_informat#

    #acs-subsite.lt_Please_read_and_follo#

    Index: openacs-4/packages/acs-subsite/www/register/bad-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/bad-password.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/bad-password.adp 22 May 2003 14:13:13 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/bad-password.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,6 +1,7 @@ #acs-subsite.Bad_Password# -#acs-subsite.in# @system_name;noquote@ +#acs-subsite.in# @system_name;noquote@ +#acs-subsite.Bad_Password#

    #acs-subsite.lt_The_password_you_type#

    Index: openacs-4/packages/acs-subsite/www/register/bad-password.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/bad-password.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/bad-password.tcl 30 Nov 2002 17:23:11 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/bad-password.tcl 15 Aug 2003 21:18:12 -0000 1.4 @@ -10,12 +10,16 @@ system_name:onevalue email_forgotten_password_p:onevalue user_id:onevalue + subsite_url:onevalue } +set subsite_url [subsite::get_element -element url] + set email_forgotten_password_p [ad_parameter EmailForgottenPasswordP security 1] set system_name [ad_system_name] set email_password_url "email-password?user_id=$user_id" ad_return_template + Index: openacs-4/packages/acs-subsite/www/register/banned-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/banned-user.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/banned-user.adp 7 Nov 2002 18:06:57 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/banned-user.adp 15 Aug 2003 21:18:12 -0000 1.5 @@ -1,5 +1,6 @@ -#acs-subsite.Sorry# +#acs-subsite.Sorry# +#acs-subsite.Sorry# #acs-subsite.lt_Sorry_but_it_seems_th# Index: openacs-4/packages/acs-subsite/www/register/deleted-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/deleted-user.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/deleted-user.adp 7 Nov 2002 18:06:57 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/deleted-user.adp 15 Aug 2003 21:18:12 -0000 1.5 @@ -1,7 +1,8 @@ #acs-subsite.Welcome_Back# #acs-subsite.to_site_link# - +#acs-subsite.Welcome_Back# + #acs-subsite.Welcome_Back_1# #acs-subsite.to_site_link_1#. Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/email-confirm.adp 7 Nov 2002 18:06:57 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,5 +1,6 @@ -#acs-subsite.Email_Confirmation# +#acs-subsite.Email_Confirmation# +#acs-subsite.Email_Confirmation# Index: openacs-4/packages/acs-subsite/www/register/email-password-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/email-password-2.adp 7 Nov 2002 18:06:57 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/email-password-2.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,5 +1,6 @@ -#acs-subsite.Check_Your_Inbox# +#acs-subsite.Check_Your_Inbox# +#acs-subsite.Check_Your_Inbox# #acs-subsite.lt_Please_check_your_inb# Index: openacs-4/packages/acs-subsite/www/register/email-password-3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-3.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/email-password-3.adp 7 Nov 2002 18:06:57 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/email-password-3.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,6 +1,7 @@ #acs-subsite.lt_Customized_QuestionAn# - +#acs-subsite.lt_Customized_QuestionAn# +

    #acs-subsite.lt_Please_Wait_for_our_E#

    #acs-subsite.lt_When_you_get_your_ema#

    Index: openacs-4/packages/acs-subsite/www/register/email-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/email-password.adp 7 Nov 2002 18:06:57 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/email-password.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,7 +1,7 @@ #acs-subsite.Email_Password# +#acs-subsite.Email_Password# -

    #acs-subsite.lt_Please_verify_your_id#

    Index: openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp 22 May 2003 14:13:13 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,6 +1,7 @@ #acs-subsite.lt_Saving_email_address_# #acs-subsite.at# @home_link;noquote@ +#acs-subsite.lt_Saving_email_address_#

    #acs-subsite.lt_Our_server_can_tell_y# Index: openacs-4/packages/acs-subsite/www/register/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/register/index.adp 22 May 2003 14:13:13 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/register/index.adp 15 Aug 2003 21:18:12 -0000 1.7 @@ -1,7 +1,8 @@ #acs-subsite.Log_In# login.email -#acs-subsite.to# @system_name;noquote@ +#acs-subsite.to# @system_name;noquote@ +#acs-subsite.Log_In#

    #acs-subsite.Current_users# #acs-subsite.lt_Please_enter_your_ema#

    #acs-subsite.New_users# #acs-subsite.lt_welcome_please_register#

    Index: openacs-4/packages/acs-subsite/www/register/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/index.tcl 17 May 2003 10:02:25 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/index.tcl 15 Aug 2003 21:18:12 -0000 1.4 @@ -11,11 +11,13 @@ old_login_process:onevalue allow_persistent_login_p:onevalue persistent_login_p:onevalue + subsite_url:onevalue } set old_login_process [parameter::get -parameter SeparateEmailPasswordPagesP -default 0] set allow_persistent_login_p [parameter::get -parameter AllowPersistentLoginP -default 1] set persistent_login_p [parameter::get -parameter AllowPersistentLoginP -default 1] +set subsite_url [subsite::get_element -element url] set email_forgotten_password_p [parameter::get -parameter EmailForgottenPasswordP -default 1] Index: openacs-4/packages/acs-subsite/www/register/login-expired.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-expired.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/login-expired.adp 7 Nov 2002 18:06:57 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/login-expired.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,5 +1,6 @@ -#acs-subsite.Login_Expired# +#acs-subsite.Login_Expired# +#acs-subsite.Login_Expired#

    #acs-subsite.Login_Expired_1# #acs-subsite.login# #acs-subsite.again#.

    Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/restore-user.adp 22 May 2003 14:13:13 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/restore-user.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,7 +1,7 @@ #acs-subsite.lt_Your_Account_is_Resto# +#acs-subsite.lt_Your_Account_is_Resto# -

    #acs-subsite.lt_Your_Account_at_site_#

    #acs-subsite.lt_You_can_log_in_now_us# Index: openacs-4/packages/acs-subsite/www/register/user-new-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-new-2.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/register/user-new-2.adp 22 May 2003 14:13:13 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/register/user-new-2.adp 15 Aug 2003 21:18:12 -0000 1.6 @@ -1,5 +1,6 @@ @title;noquote@ +#acs-subsite.Awaiting_Approval# Index: openacs-4/packages/acs-subsite/www/register/user-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-subsite/www/register/user-new.adp 22 May 2003 14:13:13 -0000 1.8 +++ openacs-4/packages/acs-subsite/www/register/user-new.adp 15 Aug 2003 21:18:12 -0000 1.9 @@ -1,8 +1,7 @@ #acs-subsite.Register# +#acs-subsite.Register# - - #acs-subsite.lt_Register_as_a_user_of# @system_name@ Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/shared/community-member.adp 22 May 2003 14:13:58 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/shared/community-member.adp 15 Aug 2003 21:18:13 -0000 1.6 @@ -1,6 +1,6 @@ -@first_names;noquote@ @last_name;noquote@ -@context;noquote@ +@first_names;noquote@ @last_name;noquote@ +Community Member
    @@ -59,7 +59,7 @@

    - If you were to log in, you'd be able to get more information on your fellow community member. + If you were to log in, you'd be able to get more information on your fellow community member.
    Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/shared/community-member.tcl 18 Nov 2002 18:01:14 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl 15 Aug 2003 21:18:13 -0000 1.6 @@ -24,8 +24,11 @@ bio:onevalue verified_user_id:onevalue user_contributions:multirow + subsite_url:onevalue } +set subsite_url [subsite::get_element -element url] + #See if this page has been overrided by a parameter in kernel set community_member_url [ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberURL "/shared/community-member"] if { $community_member_url != "/shared/community-member" } { Index: openacs-4/packages/acs-subsite/www/shared/confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/confirm.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/shared/confirm.adp 22 May 2003 14:13:58 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/shared/confirm.adp 15 Aug 2003 21:18:13 -0000 1.5 @@ -1,5 +1,6 @@ @title;noquote@ +#acs-subsite.Confirm# @message@ Index: openacs-4/packages/acs-subsite/www/shared/db-error.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/db-error.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/shared/db-error.adp 6 Sep 2002 21:50:11 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/shared/db-error.adp 15 Aug 2003 21:18:13 -0000 1.4 @@ -1,5 +1,6 @@ -Database error +Database Error +Database Error

    We had a problem processing your entry. @@ -12,4 +13,4 @@

    @errmsg@
    -

    \ No newline at end of file +

    Index: openacs-4/packages/acs-subsite/www/shared/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/shared/index.tcl 18 Sep 2002 12:16:50 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/shared/index.tcl 15 Aug 2003 21:18:13 -0000 1.3 @@ -1,4 +1,3 @@ # $Id$ # user try to play with the URL and get the directory structure instead of a file -ad_returnredirect / - +ad_returnredirect [subsite::get_element -element url] Index: openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp 30 Nov 2002 17:23:29 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp 15 Aug 2003 21:18:13 -0000 1.6 @@ -1,7 +1,7 @@ - - - +ISO Codes Not Loaded +No ISO Codes +

    ISO Codes not loaded


    Index: openacs-4/packages/acs-subsite/www/shared/iso-codes.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/shared/iso-codes.adp 26 Sep 2002 03:46:25 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/shared/iso-codes.adp 15 Aug 2003 21:18:13 -0000 1.5 @@ -1,5 +1,7 @@ - +Complete List of ISO Codes +ISO Code List +

    Complete List of ISO Codes

    Please locate your country's code among those listed below then use Index: openacs-4/packages/acs-subsite/www/shared/portrait.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/shared/portrait.adp 22 May 2003 14:13:58 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/shared/portrait.adp 15 Aug 2003 21:18:13 -0000 1.5 @@ -3,7 +3,7 @@ @context;noquote@

    - +

    Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/shared/portrait.tcl 18 Nov 2002 18:01:14 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl 15 Aug 2003 21:18:13 -0000 1.5 @@ -13,8 +13,11 @@ export_vars:onevalue widthheight_param:onevalue publish_date:onevalue + subsite_url:onevalue } +set subsite_url [subsite::get_element -element url] + if ![db_0or1row user_info "select first_names, last_name Index: openacs-4/packages/acs-subsite/www/shared/report-error.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/report-error.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/shared/report-error.adp 6 Sep 2002 21:50:11 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/shared/report-error.adp 15 Aug 2003 21:18:13 -0000 1.4 @@ -1,5 +1,6 @@ -Application error +Application Error +Error We had a problem processing your entry. Index: openacs-4/packages/acs-subsite/www/shared/whos-online.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/shared/whos-online.adp 22 May 2003 14:13:58 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/shared/whos-online.adp 15 Aug 2003 21:18:13 -0000 1.6 @@ -4,18 +4,18 @@ This page is mostly useful in conjunction with - @chat_system_name@. + @chat_system_name@.
      -
    • @users.first_names@ @users.last_name@ +
    • @users.first_names@ @users.last_name@ -
    • @users.first_names@ @users.last_name@ (@users.email@) +
    • @users.first_names@ @users.last_name@ (@users.email@) 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.4 -r1.5 --- openacs-4/packages/acs-subsite/www/shared/whos-online.tcl 6 Sep 2002 21:50:11 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/shared/whos-online.tcl 15 Aug 2003 21:18:13 -0000 1.5 @@ -9,8 +9,10 @@ chat_system_name:onevalue connected_user_id:onevalue users:multirow + subsite_url:onevalue } +set subsite_url [subsite::get_element -element url] set connected_user_id [ad_verify_and_get_user_id] db_multirow users grab_users "select user_id, first_names, last_name, email Index: openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/basic-info-update-2.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl 17 May 2003 10:03:44 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl 15 Aug 2003 21:18:13 -0000 1.8 @@ -159,7 +159,7 @@
      $errmsg
      - hi richard $bio_change_to + Debug error code: $bio_change_to " return @@ -168,7 +168,7 @@ if { [exists_and_not_null return_url] } { ad_returnredirect $return_url } else { - ad_returnredirect "/pvt/home" + ad_returnredirect [ad_pvt_home] } Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp 22 May 2003 14:14:50 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp 15 Aug 2003 21:18:13 -0000 1.5 @@ -1,6 +1,7 @@ Update Basic Information in @site_link;noquote@ +Update Information @export_vars;noquote@ Index: openacs-4/packages/acs-subsite/www/user/password-update.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/user/password-update.adp 7 Nov 2002 18:06:58 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/user/password-update.adp 15 Aug 2003 21:18:13 -0000 1.10 @@ -1,6 +1,7 @@ #acs-subsite.Update_Password# #acs-subsite.lt_for_first_names_last_# +#acs-subsite.Update_Password# Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/comment-edit-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit-2.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit-2.tcl 15 Aug 2003 21:18:13 -0000 1.2 @@ -38,5 +38,5 @@ if { ![empty_string_p $return_url] } { ad_returnredirect $return_url } else { - ad_returnredirect index -} \ No newline at end of file + ad_returnredirect [ad_pvt_home] +} Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/user/portrait/index.adp 22 May 2003 14:15:21 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp 15 Aug 2003 21:18:13 -0000 1.6 @@ -5,7 +5,7 @@

      This is the image that we show to other users at @system_name@:

      - +
      Data: 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.4 -r1.5 --- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 18 Nov 2002 18:01:15 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 15 Aug 2003 21:18:13 -0000 1.5 @@ -17,9 +17,11 @@ pretty_date:onevalue description:onevalue export_edit_vars:onevalue + subsite_url:onevalue } set current_user_id [ad_verify_and_get_user_id] +set subsite_url [subsite::get_element -element url] if [empty_string_p $user_id] { set user_id $current_user_id @@ -95,4 +97,4 @@ set pretty_date [lc_time_fmt $publish_date "%q"] set export_edit_vars [export_url_vars user_id return_url] -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/upload-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl 18 Sep 2002 12:16:53 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl 15 Aug 2003 21:18:13 -0000 1.4 @@ -183,5 +183,5 @@ if { [exists_and_not_null return_url] } { ad_returnredirect $return_url } else { - ad_returnredirect {} + ad_returnredirect [ad_pvt_home] } Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 6 Sep 2002 21:50:14 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 15 Aug 2003 21:18:13 -0000 1.3 @@ -35,9 +35,9 @@ if {$admin_p} { set context [list [list "./?user_id=$user_id" "User's Portrait"] "Upload Portrait"] } else { - set context [list [list "./" "Your Portrait"] "Upload Portrait"] + set context [list [list "./?return_url=$return_url" "Your Portrait"] "Upload Portrait"] } set export_vars [export_form_vars user_id return_url] -ad_return_template \ No newline at end of file +ad_return_template