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 -N -r1.43.2.15 -r1.43.2.16 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 18 May 2006 00:39:34 -0000 1.43.2.15 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 18 May 2006 19:24:28 -0000 1.43.2.16 @@ -37,6 +37,7 @@ Admin Administer <img border=0 valign="bottom" src="/resources/dotlrn/admin.gif" alt="Administer"> + Administration Administration Cockpit Administrator Administrators 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 -N -r1.15.2.4 -r1.15.2.5 --- openacs-4/packages/dotlrn/www/control-panel.adp 18 May 2006 00:39:34 -0000 1.15.2.4 +++ openacs-4/packages/dotlrn/www/control-panel.adp 18 May 2006 19:24:28 -0000 1.15.2.5 @@ -25,45 +25,111 @@ <% set dotlrn_url [dotlrn::get_url] %> - +
-
-
-

#dotlrn.General_Site_Help#

 -
-
- -
-
-
-

#dotlrn.Personal_Options#

 -
-
-
-

  • #dotlrn.Customize_Layout#
    • -

  • #dotlrn.Customize_Template#
    • +
    +
    +

    #acs-subsite.My_Account#

    +
    +
    + + + #acs-subsite.Account_closed_workspace_msg# + + + +
  • #acs-subsite.Change_locale_label#
    • +     -
    -
    + +
  • #acs-subsite.Manage_your_notifications#
    • +     -     		-
    -
    -

    #dotlrn.lt_JoinDrop_Classes_or_C#

     -
    -
    - + +
  • #acs-subsite.Close_your_account#
    • +     -
    -
    + +
  • @admin_pretty_name@
    • +     + + + + +     		+ +
    +
    +

    #acs-subsite.Privacy#

    +

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

    #dotlrn.General_Site_Help#

     +
    +
    + +
    +
    + + + +
    +
    +

    #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@
    +
    +
    +     + +
    Index: openacs-4/packages/dotlrn/www/control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v diff -u -N -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/dotlrn/www/control-panel.tcl 31 May 2005 23:13:06 -0000 1.9.2.1 +++ openacs-4/packages/dotlrn/www/control-panel.tcl 18 May 2006 19:24:28 -0000 1.9.2.2 @@ -34,7 +34,7 @@ set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] # Make sure user is logged in -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login -account_status closed] set title [parameter::get -localize -parameter admin_page_name] set admin_p [dotlrn::admin_p] @@ -47,3 +47,50 @@ set pvt_home [ad_pvt_home] set pvt_home_name [ad_pvt_home_name] +acs_user::get -array user -include_bio -user_id $user_id + +set account_status [ad_conn account_status] + +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 { [empty_string_p $portrait_title] } { + 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]] Index: openacs-4/packages/theme-selva/theme-selva.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v diff -u -N -r1.14.2.5 -r1.14.2.6 --- openacs-4/packages/theme-selva/theme-selva.info 18 May 2006 00:39:35 -0000 1.14.2.5 +++ openacs-4/packages/theme-selva/theme-selva.info 18 May 2006 19:24:28 -0000 1.14.2.6 @@ -20,7 +20,7 @@ - + Index: openacs-4/packages/theme-selva/tcl/selva-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.tcl,v diff -u -N -r1.5.2.7 -r1.5.2.8 --- openacs-4/packages/theme-selva/tcl/selva-procs.tcl 18 May 2006 00:39:35 -0000 1.5.2.7 +++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl 18 May 2006 19:24:29 -0000 1.5.2.8 @@ -94,7 +94,7 @@ } if { $sw_admin_p } { - lappend tabs_list [list "$dotlrn_admin_url" "#dotlrn.Administration_Cockpit#"] + lappend tabs_list [list "$dotlrn_admin_url" "#dotlrn.Administration#"] } ns_log Debug "TABS" $tabs_list