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.92 -r1.93 --- openacs-4/packages/acs-subsite/acs-subsite.info 19 Jun 2007 13:31:53 -0000 1.92 +++ openacs-4/packages/acs-subsite/acs-subsite.info 29 Aug 2007 13:44:36 -0000 1.93 @@ -7,7 +7,7 @@ t f - + OpenACS Subsite 2007-04-22 @@ -16,12 +16,12 @@ GPL 3 - + - + @@ -38,12 +38,14 @@ + + @@ -57,10 +59,9 @@ + - - @@ -69,11 +70,11 @@ - - - - + + + + Index: openacs-4/packages/acs-subsite/lib/home.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/home.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/lib/home.adp 29 Aug 2007 13:44:37 -0000 1.1 @@ -0,0 +1,118 @@ + + @page_title@ + @context;noquote@ + user_info.first_names + @user_id@ + + + + + +
+
+
+

#acs-subsite.Edit_Options#

 +
+
+ +
+
+ + +
+
+

#acs-subsite.Privacy#

 +
+
+ + + + #acs-subsite.Currently_invisible_msg# + + + + #acs-subsite.Currently_visible_msg# + + +
+
+ +		 + +
+
+

#acs-subsite.My_Account#

+
+
+ + + #acs-subsite.Account_closed_workspace_msg# + +
+
+ + + + +
+
+

#acs-subsite.Your_Portrait#

 +
+
+

+ #acs-subsite.lt_Show_everyone_else_at# #acs-subsite.upload_a_portrait# +

+
+
+ + + +
+
+

#acs-subsite.Your_Portrait#

 +
+
+

+ #acs-subsite.lt_On_portrait_publish_d#. +

+ +
+Portrait

+#acs-subsite.Edit# +

@portrait_description@
+
+
+ + +
+
+

+

+
+ @fragments:item;noquote@ + +
+
Index: openacs-4/packages/acs-subsite/lib/home.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/home.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/lib/home.tcl 29 Aug 2007 13:44:37 -0000 1.1 @@ -0,0 +1,91 @@ +# /pvt/home.tcl + +ad_page_contract { + user's workspace page + @cvs-id $Id: home.tcl,v 1.1 2007/08/29 13:44:37 maltes Exp $ +} -properties { + system_name:onevalue + context:onevalue + full_name:onevalue + email:onevalue + url:onevalue + screen_name:onevalue + bio:onevalue + portrait_state:onevalue + portrait_publish_date:onevalue + portrait_title:onevalue + portrait_description:onevalue + export_user_id:onevalue + ad_url:onevalue + member_link:onevalue + pvt_home_url:onevalue +} + +set user_id [auth::require_login -account_status closed] + +acs_user::get -array user -include_bio -user_id $user_id + +set account_status [ad_conn account_status] +set login_url [ad_get_login_url] +set subsite_url [ad_conn vhost_subsite_url] + +set page_title [ad_pvt_home_name] + +set pvt_home_url [ad_pvt_home] + +set context [list $page_title] + +set fragments [callback -catch user::workspace -user_id $user_id] + +set ad_url [ad_url] + +set community_member_url [acs_community_member_url -user_id $user_id] + +set notifications_url [lindex [site_node::get_children -node_id [subsite::get_element -element node_id] -package_key "notifications"] 0] + +set system_name [ad_system_name] + +set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }] + +if { [llength [lang::system::get_locales]] > 1 } { + set change_locale_url [apm_package_url_from_key "acs-lang"] +} + + + +if {[ad_parameter SolicitPortraitP "user-info" 0]} { + # we have portraits for some users + if {![db_0or1row get_portrait_info " + select cr.publish_date, nvl(cr.title,'your portrait') as portrait_title, + nvl(cr.description,'no description') as portrait_description + from cr_revisions cr, cr_items ci, acs_rels a + where cr.revision_id = ci.live_revision + and ci.item_id = a.object_id_two + and a.object_id_one = :user_id + and a.rel_type = 'user_portrait_rel' + "]} { + set portrait_state "upload" + } else { + if { $portrait_title eq "" } { + set portrait_title "[_ acs-subsite.no_portrait_title_message]" + } + + set portrait_state "show" + set portrait_publish_date [lc_time_fmt $publish_date "%q"] + } +} else { + set portrait_state "none" +} + + +set whos_online_url "[subsite::get_element -element url]shared/whos-online" +set make_visible_url "[subsite::get_element -element url]shared/make-visible" +set make_invisible_url "[subsite::get_element -element url]shared/make-invisible" +set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]] + +set subsite_id [ad_conn subsite_id] +set user_info_template [parameter::get -parameter "UserInfoTemplate" -package_id $subsite_id] + +if {$user_info_template eq ""} { + set user_info_template "/packages/acs-subsite/lib/user-info" +} Index: openacs-4/packages/acs-subsite/lib/home.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/Attic/home.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/lib/home.xql 29 Aug 2007 13:44:37 -0000 1.1 @@ -0,0 +1,53 @@ + + + + + + + select first_names, last_name, email, url, screen_name + from cc_users + where user_id=:user_id + + + + + + + + +select attr_value +from acs_attribute_values +where object_id = :user_id +and attribute_id = + (select attribute_id + from acs_attributes + where object_type = 'person' + and attribute_name = 'bio') + + + + + + + + select cr.publish_date, cr.title as portrait_title, cr.description as portrait_description + from cr_revisions cr, cr_items ci, acs_rels a + where cr.revision_id = ci.live_revision + and ci.item_id = a.object_id_two + and a.object_id_one = :user_id + and a.rel_type = 'user_portrait_rel' + + + + + + + select email + from cc_users + where user_iad=:user_id + + + + + + 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.24 -r1.25 --- openacs-4/packages/acs-subsite/www/pvt/home.adp 12 Aug 2007 03:27:42 -0000 1.24 +++ openacs-4/packages/acs-subsite/www/pvt/home.adp 29 Aug 2007 13:44:37 -0000 1.25 @@ -4,115 +4,4 @@ user_info.first_names @user_id@ - - - - -
-
-
-

#acs-subsite.Edit_Options#

 -
-
- -
-
- - -
-
-

#acs-subsite.Privacy#

 -
-
- - - - #acs-subsite.Currently_invisible_msg# - - - - #acs-subsite.Currently_visible_msg# - - -
-
- -		 - -
-
-

#acs-subsite.My_Account#

-
-
- - - #acs-subsite.Account_closed_workspace_msg# - -
-
- - - - -
-
-

#acs-subsite.Your_Portrait#

 -
-
-

- #acs-subsite.lt_Show_everyone_else_at# #acs-subsite.upload_a_portrait# -

-
-
- - - -
-
-

#acs-subsite.Your_Portrait#

 -
-
-

- #acs-subsite.lt_On_portrait_publish_d#. -

- -
-Portrait

-#acs-subsite.Edit# -

@portrait_description@
-
-
- - -
-
-

-

-
- @fragments:item;noquote@ - -
-
+ 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.25 -r1.26 --- openacs-4/packages/acs-subsite/www/pvt/home.tcl 12 Aug 2007 03:31:49 -0000 1.25 +++ openacs-4/packages/acs-subsite/www/pvt/home.tcl 29 Aug 2007 13:44:37 -0000 1.26 @@ -1,91 +1,18 @@ -# /pvt/home.tcl - ad_page_contract { - user's workspace page + Page for users to register themselves on the site. + @cvs-id $Id$ -} -properties { - system_name:onevalue - context:onevalue - full_name:onevalue - email:onevalue - url:onevalue - screen_name:onevalue - bio:onevalue - portrait_state:onevalue - portrait_publish_date:onevalue - portrait_title:onevalue - portrait_description:onevalue - export_user_id:onevalue - ad_url:onevalue - member_link:onevalue - pvt_home_url:onevalue +} { + } set user_id [auth::require_login -account_status closed] - -acs_user::get -array user -include_bio -user_id $user_id - -set account_status [ad_conn account_status] -set login_url [ad_get_login_url] -set subsite_url [ad_conn vhost_subsite_url] - set page_title [ad_pvt_home_name] - -set pvt_home_url [ad_pvt_home] - set context [list $page_title] -set fragments [callback -catch user::workspace -user_id $user_id] - -set ad_url [ad_url] - -set community_member_url [acs_community_member_url -user_id $user_id] - -set notifications_url [lindex [site_node::get_children -node_id [subsite::get_element -element node_id] -package_key "notifications"] 0] - -set system_name [ad_system_name] - -set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }] - -if { [llength [lang::system::get_locales]] > 1 } { - set change_locale_url [apm_package_url_from_key "acs-lang"] -} - - - -if {[ad_parameter SolicitPortraitP "user-info" 0]} { - # we have portraits for some users - if {![db_0or1row get_portrait_info " - select cr.publish_date, nvl(cr.title,'your portrait') as portrait_title, - nvl(cr.description,'no description') as portrait_description - from cr_revisions cr, cr_items ci, acs_rels a - where cr.revision_id = ci.live_revision - and ci.item_id = a.object_id_two - and a.object_id_one = :user_id - and a.rel_type = 'user_portrait_rel' - "]} { - set portrait_state "upload" - } else { - if { $portrait_title eq "" } { - set portrait_title "[_ acs-subsite.no_portrait_title_message]" - } - - set portrait_state "show" - set portrait_publish_date [lc_time_fmt $publish_date "%q"] - } -} else { - set portrait_state "none" -} - - -set whos_online_url "[subsite::get_element -element url]shared/whos-online" -set make_visible_url "[subsite::get_element -element url]shared/make-visible" -set make_invisible_url "[subsite::get_element -element url]shared/make-invisible" -set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]] - set subsite_id [ad_conn subsite_id] -set user_info_template [parameter::get -parameter "UserInfoTemplate" -package_id $subsite_id] +set user_home_template [parameter::get -parameter "UserHomeTemplate" -package_id $subsite_id] -if {$user_info_template eq ""} { - set user_info_template "/packages/acs-subsite/lib/user-info" -} +if {$user_home_template eq ""} { + set user_home_template "/packages/acs-subsite/lib/home" +} \ No newline at end of file Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/home.xql'. Fisheye: No comparison available. Pass `N' to diff?