[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /interface loncommon.pm
raeburn
raeburn@source.lon-capa.org
Fri, 24 Sep 2010 03:33:38 -0000
raeburn Fri Sep 24 03:33:38 2010 EDT
Modified files: (Branch: version_2_10_X)
/loncom/interface loncommon.pm
Log:
- Backport 1.980.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.948.2.9 loncom/interface/loncommon.pm:1.948.2.10
--- loncom/interface/loncommon.pm:1.948.2.9 Wed Sep 1 16:51:47 2010
+++ loncom/interface/loncommon.pm Fri Sep 24 03:33:37 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.948.2.9 2010/09/01 16:51:47 raeburn Exp $
+# $Id: loncommon.pm,v 1.948.2.10 2010/09/24 03:33:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4751,7 +4751,7 @@
sub dc_courseid_toggle {
my ($dc_info) = @_;
- return ' <span id="dccidtext" class="LC_cusr_subheading">'.
+ return ' <span id="dccidtext" class="LC_cusr_subheading LC_nobreak">'.
'<a href="javascript:showCourseID();">'.
&mt('(More ...)').'</a></span>'.
'<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
@@ -10793,16 +10793,20 @@
$initial_env{"browser.interface"} = $form->{'interface'};
$env{'browser.interface'}=$form->{'interface'};
}
+ my %is_adv = ( is_adv => &Apache::lonnet::is_advanced_user($domain,$username) );
+ my %domdef = &Apache::lonnet::get_domain_defaults($domain);
foreach my $tool ('aboutme','blog','portfolio') {
$userenv{'availabletools.'.$tool} =
- &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
+ &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
+ undef,\%userenv,\%domdef,\%is_adv);
}
foreach my $crstype ('official','unofficial','community') {
$userenv{'canrequest.'.$crstype} =
&Apache::lonnet::usertools_access($username,$domain,$crstype,
- 'reload','requestcourses');
+ 'reload','requestcourses',
+ \%userenv,\%domdef,\%is_adv);
}
$env{'user.environment'} = "$lonids/$cookie.id";