![\"Add](\"/graphics/add.gif\")
\$day - \$pretty_date" \
- -date $current_date \
- -calendar_id_list $list_of_calendar_ids \
- -url_stub_callback "calendar_portlet_display::get_url_stub" \
- -prev_week_template "![\"Add](\"/shared/images/add.gif\")
\$day - \$pretty_date" \
+ -date $current_date \
+ -calendar_id_list $list_of_calendar_ids \
+ -url_stub_callback "calendar_portlet_display::get_url_stub" \
+ -prev_week_template "+ Produce a helpful context bar for .LRN users. The context + bar is intended to aid navigation inside applications mounted + under dotlrn packages (classes, communities, and the .LRN home). + The proc will fetch the context var from the callers scope with upvar. +
+ ++ Disclaimer: so far the proc has only been tested to work under + classes and communities. +
+ + @param community_id The id of the community/class we are at. + + @author Peter Marklund + } { + set community_context [dotlrn_community::navigation_context $community_id] + + upvar context context + + if { [exists_and_not_null context] } { + # The application context doesn't contain the application node itself so we need to prepend that + array set node_array [site_node::get -node_id [ad_conn node_id]] + set application_name $node_array(instance_name) + set application_url $node_array(url) + + if { [string match admin/* [ad_conn extra_url]] } { + set application_admin_context [list [list "${application_url}admin/" "Administration"]] + } else { + set application_admin_context [list] + } + + set application_context [list [list $application_url $application_name]] + + if { [llength $application_admin_context] > 0 } { + set application_context [concat $application_context $application_admin_context] + } + + if { ![empty_string_p $context] } { + set application_context [concat $application_context $context] + } else { + # Make last entry be just the label + set application_context [lreplace $application_context end end [lindex [lindex $application_context end] 1]] + } + } else { + set application_context [list] + } + + if { [llength $application_context] > 0 } { + set context_bar_context [concat $community_context $application_context] + } else { + # We need the last entry in the community context be just the label, so remove + # the URL + set community_context_last [lindex $community_context end] + set community_context_last_label [lindex $community_context_last 1] + + if { [llength $community_context] == 1} { + set context_bar_context [list $community_context_last_label] + } else { + set community_context_before_last [lrange $community_context 0 end-1] + set context_bar_context [concat $community_context_before_last [list $community_context_last_label]] + } + } + + return [dotlrn::raw_navbar $context_bar_context] + } + ad_proc -public navbar { { -community_id "" } { -community_type "" } @@ -100,7 +170,7 @@ } } - return "[join $list_of_links " > "]" + return "[join $list_of_links " : "]
" } ad_proc -public portal_navbar { @@ -180,7 +250,8 @@ } # - # Common code for the the behavior of the control panel link + # Common code for the the behavior of the control panel link (class administration + # or my account) # set extra_td_selected_p 0 if {$show_control_panel} { Index: openacs-4/packages/dotlrn/tcl/spam-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/spam-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/tcl/spam-procs.tcl 23 Oct 2002 12:38:38 -0000 1.4 +++ openacs-4/packages/dotlrn/tcl/spam-procs.tcl 29 May 2003 18:05:01 -0000 1.5 @@ -72,38 +72,13 @@ # loop through all the recepients and send them the spam set errors "" - db_foreach select_recepient_info " - select parties.email, - decode(acs_objects.object_type, - 'user', - (select first_names - from persons - where person_id = parties.party_id), - 'group', - (select group_name - from groups - where group_id = parties.party_id), - 'rel_segment', - (select segment_name - from rel_segments - where segment_id = parties.party_id), - '') as first_names, - decode(acs_objects.object_type, - 'user', - (select last_name - from persons - where person_id = parties.party_id), - '') as last_name - from parties, - acs_objects - where party_id in ([join $recepients ,]) - and parties.party_id = acs_objects.object_id - " { + db_foreach select_recepient_info {} { # replace some values in the subject and the message set values [list] - lappend values [list {
- -
+ +
#dotlrn.Shared_Files#
Index: openacs-4/packages/dotlrn/www/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn/www/community-member.tcl 4 Dec 2002 09:51:04 -0000 1.13 +++ openacs-4/packages/dotlrn/www/community-member.tcl 29 May 2003 18:05:01 -0000 1.14 @@ -126,11 +126,12 @@ db_multirow user_contributions user_contributions {} set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id] + set scope_fs_url "/packages/file-storage/www/folder-chunk" set n_past_days "" -set url [site_node_object_map::get_url -object_id $folder_id] +set url "[site_node_object_map::get_url -object_id $folder_id]index?folder_id=$folder_id&n_past_days=99999" -set context_bar [ad_context_bar_ws_or_index "[_ dotlrn.Community_member]"] +set context_bar [ad_context_bar "[_ dotlrn.Community_member]"] set system_name [ad_system_name] set pretty_creation_date [lc_time_fmt $creation_date "%q"] set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]" Index: openacs-4/packages/dotlrn/www/configure.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/configure.adp 4 Dec 2002 09:51:04 -0000 1.16 +++ openacs-4/packages/dotlrn/www/configure.adp 29 May 2003 18:05:01 -0000 1.17 @@ -29,3 +29,10 @@ @rendered_page@ + + + + + + + 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 -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/control-panel.adp 4 Dec 2002 09:51:04 -0000 1.7 +++ openacs-4/packages/dotlrn/www/control-panel.adp 29 May 2003 18:05:01 -0000 1.8 @@ -29,11 +29,11 @@| #dotlrn.lt_Help_and_Personal_Con# | +#dotlrn.lt_Help_and_Personal_Con# | ||||
 | |||||
 | |||||
|
+ |
|
- |
+ |
|
| |||||
| |||||
| #dotlrn.lt_JoinDrop_Classes_or_C# | +#dotlrn.lt_JoinDrop_Classes_or_C# | ||||
| |||||
| |||||
|
+ |
- |
- |
+ |
|
| |||||
| |||||
|
-
- |
+||||||||||||||||||||
|
+
+ |
- @text@ | -
- |
+ + @user_name@ + | +|
+ #dotlrn.user_portal_page_home_title#
+ 
+ #dotlrn.help#
+
+ #dotlrn.logout#
+ |
+
+
-||||
| ||||
| ||||
| @navbar@ | ||||
-
+ +
+
+
.LRN
++
| @navbar@ | ||
| ||
+
+
+ + -@navbar@ | ||
| ||
-
- - -