#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/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