Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.106 -r1.107
--- openacs-4/packages/acs-subsite/acs-subsite.info 11 Jul 2009 23:47:24 -0000 1.106
+++ openacs-4/packages/acs-subsite/acs-subsite.info 5 Jan 2010 11:09:26 -0000 1.107
@@ -8,7 +8,7 @@
<singleton-p>f</singleton-p>
<implements-subsite-p>t</implements-subsite-p>
- <version name="5.6.0d1" url="http://openacs.org/repository/download/apm/acs-subsite-5.6.0d1.apm">
+ <version name="5.6.0d2" url="http://openacs.org/repository/download/apm/acs-subsite-5.6.0d2.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Subsite</summary>
<release-date>2009-06-19</release-date>
@@ -17,7 +17,7 @@
<license>GPL</license>
<maturity>3</maturity>
- <provides url="acs-subsite" version="5.6.0d1"/>
+ <provides url="acs-subsite" version="5.6.0d2"/>
<requires url="acs-authentication" version="5.6.0d1"/>
<requires url="acs-content-repository" version="5.6.0d1"/>
<requires url="acs-kernel" version="5.6.0d1"/>
Index: openacs-4/packages/acs-subsite/lib/user-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/lib/user-info.adp 7 Jun 2008 20:28:56 -0000 1.9
+++ openacs-4/packages/acs-subsite/lib/user-info.adp 5 Jan 2010 11:09:26 -0000 1.10
@@ -2,6 +2,7 @@
<formtemplate id="user_info"></formtemplate>
<if @edit_mode_p@ true and @read_only_notice_p@ true>
- <p> <font color="red">#acs-subsite.Notice#</font> #acs-subsite.Elements_not_editable# </p>
+ <p style="color: #ff0000;">#acs-subsite.Notice#</p>
+ <p>#acs-subsite.Elements_not_editable# </p>
</if>
Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/lib/user-info.tcl 27 Apr 2009 15:49:22 -0000 1.20
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl 5 Jan 2010 11:09:26 -0000 1.21
@@ -54,86 +54,115 @@
{message:text(hidden),optional}
}
+# Fill the form elements list
+set elms_list [list]
+
if { [llength [auth::authority::get_authority_options]] > 1 } {
- ad_form -extend -name user_info -form {
- {authority_id:text(select)
- {mode $elm_mode(authority_id)}
- {label "[_ acs-subsite.Authority]"}
- {options {[auth::authority::get_authority_options]}}
- }
+ lappend elms_list {
+ authority_id:text(select)
+ {mode $elm_mode(authority_id)}
+ {label "[_ acs-subsite.Authority]"}
+ {options {[auth::authority::get_authority_options]}}
}
} else {
lappend read_only_elements authority_id
}
if { $user(authority_id) != [auth::authority::local] || ![auth::UseEmailForLoginP] || \
- ([acs_user::site_wide_admin_p] && [llength [auth::authority::get_authority_options]] > 1) } {
- ad_form -extend -name user_info -form {
- {username:text(text)
- {label "[_ acs-subsite.Username]"}
- {mode $elm_mode(username)}
- }
+ ([acs_user::site_wide_admin_p] && [llength [auth::authority::get_authority_options]] > 1) } {
+ lappend elms_list {
+ username:text(text)
+ {label "[_ acs-subsite.Username]"}
+ {mode $elm_mode(username)}
}
} else {
lappend read_only_elements username
}
-set first_element {}
-foreach elm $form_elms {
- if { $elm_mode($elm) eq "" && ( [lsearch $read_only_elements $elm] eq -1) } {
- set first_element $elm
- break
- }
+# TODO: Use get_registration_form_elements, or auto-generate the form somehow? Deferred.
+
+lappend elms_list {
+ first_names:text
+ {label "[_ acs-subsite.First_names]"}
+ {html {size 50}}
+ {mode $elm_mode(first_names)}
+} {
+ last_name:text
+ {label "[_ acs-subsite.Last_name]"}
+ {html {size 50}}
+ {mode $elm_mode(last_name)}
+} {
+ email:text
+ {label "[_ acs-subsite.Email]"}
+ {html {size 50}}
+ {mode $elm_mode(email)}
}
-set focus "user_info.$first_element"
-# TODO: Use get_registration_form_elements, or auto-generate the form somehow? Deferred.
+if { [acs_user::ScreenName] ne "none" } {
+ lappend elms_list [list screen_name:text[ad_decode [acs_user::ScreenName] "solicit" ",optional" ""] \
+ {label "[_ acs-subsite.Screen_name]"} \
+ {html {size 50}} \
+ {mode $elm_mode(screen_name)} \
+ ]
+}
+lappend elms_list {
+ url:text,optional
+ {label "[_ acs-subsite.Home_page]"}
+ {html {size 50}}
+ {mode $elm_mode(url)}
+} {
+ bio:text(textarea),optional
+ {label "[_ acs-subsite.Biography]"}
+ {html {rows 8 cols 60}}
+ {mode $elm_mode(bio)}
+ {display_value {[ad_text_to_html -- $user(bio)]}}
+}
-ad_form -extend -name user_info -form {
- {first_names:text
- {label "[_ acs-subsite.First_names]"}
- {html {size 50}}
- {mode $elm_mode(first_names)}
+set locale_options [list]
+db_foreach get_locales {} {
+ if { [lang::message::message_exists_p $locale acs-lang.this-language] } {
+ set label "[lang::message::lookup $locale acs-lang.this-language]"
}
- {last_name:text
- {label "[_ acs-subsite.Last_name]"}
- {html {size 50}}
- {mode $elm_mode(last_name)}
- }
- {email:text
- {label "[_ acs-subsite.Email]"}
- {html {size 50}}
- {mode $elm_mode(email)}
- }
+ lappend locale_options [list ${label} $locale]
}
-if { [acs_user::ScreenName] ne "none" } {
- ad_form -extend -name user_info -form \
- [list \
- [list screen_name:text[ad_decode [acs_user::ScreenName] "solicit" ",optional" ""] \
- {label "[_ acs-subsite.Screen_name]"} \
- {html {size 50}} \
- {mode $elm_mode(screen_name)} \
- ]]
+if { [llength $locale_options] > 1 } {
+ lappend elms_list {
+ site_wide_locale:text(select_locales),optional
+ {label "[_ acs-lang.Your_Preferred_Locale]"}
+ {options $locale_options}
+ }
}
-ad_form -extend -name user_info -form {
- {url:text,optional
- {label "[_ acs-subsite.Home_page]"}
- {html {size 50}}
- {mode $elm_mode(url)}
+lappend elms_list [list \
+ timezone:text(select),optional \
+ {label "[_ acs-lang.Your_timezone]"} \
+ [list options [db_list_of_lists get_timezones {}]]]
+
+# Setting focus on the first editable element of the form
+set first_element {}
+foreach elm $form_elms {
+ if { $elm_mode($elm) eq "" && ( [lsearch $read_only_elements $elm] eq -1) } {
+ set first_element $elm
+ break
}
- {bio:text(textarea),optional
- {label "[_ acs-subsite.Biography]"}
- {html {rows 8 cols 60}}
- {mode $elm_mode(bio)}
- {display_value {[ad_text_to_html -- $user(bio)]}}
- }
-} -on_request {
+}
+set focus "user_info.$first_element"
+
+#
+ad_form -extend -name user_info -form $elms_list -on_request {
foreach var { authority_id first_names last_name email username screen_name url bio } {
set $var $user($var)
}
+
+ set site_wide_locale [ad_conn locale]
+
+ set timezone [lang::user::timezone]
+ if { $timezone eq "" } {
+ set timezone [lang::system::timezone]
+ }
+
} -on_submit {
# Makes the email an image or text according to the level of privacy
@@ -156,7 +185,11 @@
# Handle authentication problems
switch $result(update_status) {
ok {
- # Continue below
+ # Updating locale/tz data
+ if { [info exists site_wide_locale] } {
+ lang::user::set_locale $site_wide_locale
+ }
+ lang::user::set_timezone $timezone
}
default {
# Adding the error to the first element, but only if there are no element messages
Index: openacs-4/packages/acs-subsite/lib/user-info.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/lib/user-info.xql 5 Jan 2010 11:09:26 -0000 1.1
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+ <fullquery name="get_timezones">
+ <querytext>
+ select tz || ' ' || gmt_offset as full_tz, tz
+ from timezones
+ order by tz
+ </querytext>
+ </fullquery>
+
+ <fullquery name="get_locales">
+ <querytext>
+ select label, locale
+ from enabled_locales
+ order by label
+ </querytext>
+ </fullquery>
+
+</queryset>