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 -r1.43.2.12 -r1.43.2.13 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 11 May 2006 22:45:29 -0000 1.43.2.12 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 13 May 2006 22:34:09 -0000 1.43.2.13 @@ -426,7 +426,9 @@ Minutes Field must have one of the following values: You did not select any recipients for this message. Please use the back button on your browser to return to the New Bulk Mail page and select recipients. Thank you. + My Class My Communities + My Community My Workspace N/A Name Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql 29 Jun 2004 10:18:00 -0000 1.9 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql 13 May 2006 22:34:09 -0000 1.9.2.1 @@ -21,6 +21,7 @@ where dotlrn_communities_all.community_id = dotlrn_member_rels_approved.community_id and dotlrn_member_rels_approved.user_id = :user_id $archived_clause + $community_type_clause order by dotlrn_communities_all.tree_sortkey Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet-postgresql.xql 29 Jun 2004 10:18:00 -0000 1.3 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-postgresql.xql 13 May 2006 22:34:09 -0000 1.3.2.1 @@ -27,6 +27,7 @@ where dotlrn_communities_all.community_id = dotlrn_member_rels_approved.community_id and dotlrn_member_rels_approved.user_id = :user_id $archived_clause + $community_type_clause order by dotlrn_communities_all.tree_sortkey Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v diff -u -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 27 Jan 2006 02:14:25 -0000 1.13.2.2 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 13 May 2006 22:34:09 -0000 1.13.2.3 @@ -32,6 +32,15 @@ set show_archived_p 0 } +set community_type_clause "" +if { [exists_and_not_null community_filter] } { + if { $community_filter eq "classes" } { + set community_type_clause "and dotlrn_communities_all.community_type not in ('dotlrn_community', 'dotlrn_club', 'dotlrn_pers_community')" + } elseif { $community_filter eq "communities" } { + set community_type_clause "and dotlrn_communities_all.community_type in ('dotlrn_community', 'dotlrn_club', 'dotlrn_pers_community')" + } +} + set user_id [ad_conn user_id] set user_can_browse_p [dotlrn::user_can_browse_p -user_id $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 -r1.14.2.2 -r1.14.2.3 --- openacs-4/packages/theme-selva/theme-selva.info 10 Mar 2006 11:12:09 -0000 1.14.2.2 +++ openacs-4/packages/theme-selva/theme-selva.info 13 May 2006 22:34:09 -0000 1.14.2.3 @@ -19,7 +19,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 -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/theme-selva/tcl/selva-procs.tcl 4 May 2006 14:16:27 -0000 1.5.2.3 +++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl 13 May 2006 22:34:09 -0000 1.5.2.4 @@ -31,7 +31,7 @@ ad_proc -public portal_navbar { } { - A helper procedure that generates the Subnavbar (above the portal navbar, ie the tabs) + A helper procedure that generates the Navbar, ie the tabs, for dotlrn. It is called from the selva-master template. } { set current_url [ad_conn url] @@ -73,16 +73,20 @@ set user_name {} } - set subnavbar "
    " + set navbar "
      " set tabs_list [list] - set small_title_p [parameter::get_from_package_key -package_key "theme-selva" -parameter "SmallTitleP" -default "0"] - if {[exists_and_not_null community_id] && $small_title_p} { - lappend tabs_list [list "$current_url" [dotlrn_community::get_community_name $community_id]] + if { [exists_and_not_null community_id] } { + if { [dotlrn_community::get_community_type_from_community_id $community_id] eq "dotlrn_community" } { + set community_message_key "#dotlrn.My_Community#" + } else { + set community_message_key "#dotlrn.My_Class#" + } + lappend tabs_list [list "$current_url" $community_message_key] } - foreach {url name} [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] { + foreach {url name} [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalNavbarTabs" -default ""] { lappend tabs_list [list "$url" "$name"] } @@ -98,16 +102,17 @@ ns_log Debug "NAME:: $name" # if url is /dotlrn or /dotlrn/index we highlight the "Home" tab, otherwise we highlight the tab with the current_url, if there is one, i.e. we are not in a community if { $url == $current_url || ($url == "/dotlrn/" && $current_url == "/dotlrn/index")} { - append subnavbar "\n
    • " - #if {$picture != "null" } { append subnavbar "\"$picture\"" } - append subnavbar "[lang::util::localize $name]
      • " + append navbar "\n
    • " + #if {$picture != "null" } { append navbar "\"$picture\"" } + append navbar "[lang::util::localize $name]
      • " } else { - append subnavbar "\n
    • [lang::util::localize $name]
      • " + append navbar "\n
    • [lang::util::localize $name]
      • " } } - append subnavbar "\n
    " + append navbar "\n
" + } ad_proc -public portal_subnavbar { @@ -118,7 +123,7 @@ {-pre_html ""} {-post_html ""} } { - A helper procedure that generates the PORTAL navbar (the thing + A helper procedure that generates the portal subnavbar (the thing with the portal pages on it) for dotlrn. It is called from the dotlrn-master template } { @@ -134,9 +139,10 @@ # else on the site set link "[dotlrn::get_url]/" - if {[dotlrn::user_p -user_id $user_id]} { + if {[dotlrn::user_p -user_id $user_id] && + ($link eq [ad_conn url] || "${link}index" eq [ad_conn url]) } { # this user is a dotlrn user, show their personal portal - # navbar, including the control panel link + # subnavbar, including the control panel link set portal_id [dotlrn::get_portal_id -user_id $user_id] set show_control_panel 1 } else { @@ -187,8 +193,8 @@ } } - #AG: This code belongs in the portal package, near portal::navbar. For display reasons we need to do this - #as a ul instead of a table, which portal::navbar returns. Obviously we shouldn't be letting display-level + #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this + #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } { @@ -199,34 +205,25 @@ regsub -all {[^0-9]} $page_num {} page_num } - set navbar "
    \n" + set subnavbar "
      \n" db_foreach list_page_nums_select {} { - #if { "$dotlrn_url/" == [ad_conn url] || "$dotlrn_url/index" == [ad_conn url]) && $sort_key == 0 && $page_num == ""} { - # active tab is first tab and page_num may be "" - #append navbar "\n
    • $pretty_name
      • " - #} elseif {$page_num == $sort_key} { - # We are looking at the active tab - # append navbar "\n
    • $pretty_name
      • " - #} else { if {[string equal $page_num $sort_key]} { - append navbar "\n
    • $pretty_name
      • " + append subnavbar "\n
    • $pretty_name
      • " } else { - append navbar "\n
    • $pretty_name
      • " + append subnavbar "\n
    • $pretty_name
      • " } -# append navbar "\n
    • $pretty_name
      • " - #} } if {[regexp {dotlrn/(clubs|classes)/*} [ad_conn url]]} { if {[string match "*/one-community-admin" [ad_conn url]]} { - append navbar "\n
    • Admin
      • " + append subnavbar "\n
    • Admin
      • " } else { - append navbar "\n
    • Admin
      • " + append subnavbar "\n
    • Admin
      • " } } - append navbar "
    " + append subnavbar "
" } Index: openacs-4/packages/theme-selva/www/communities.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/communities.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/theme-selva/www/communities.adp 24 Feb 2006 11:20:23 -0000 1.1.2.1 +++ openacs-4/packages/theme-selva/www/communities.adp 13 May 2006 22:34:09 -0000 1.1.2.2 @@ -27,6 +27,6 @@
@portlet_title@
- +

Index: openacs-4/packages/theme-selva/www/courses.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/courses.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/theme-selva/www/courses.adp 24 Feb 2006 11:20:23 -0000 1.1.2.1 +++ openacs-4/packages/theme-selva/www/courses.adp 13 May 2006 22:34:09 -0000 1.1.2.2 @@ -27,6 +27,6 @@
@portlet_title@
- +

Index: openacs-4/packages/theme-selva/www/selva-lrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.tcl,v diff -u -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/theme-selva/www/selva-lrn-master.tcl 4 May 2006 10:48:42 -0000 1.2.2.2 +++ openacs-4/packages/theme-selva/www/selva-lrn-master.tcl 13 May 2006 22:34:09 -0000 1.2.2.3 @@ -275,7 +275,6 @@ } set extra_spaces "\"\"" - #set subnavbar [selva::portal_navbar] set subnavbar [selva::portal_subnavbar \ -user_id $user_id \ -link_control_panel $link_control_panel \