--- loncom/interface/loncommon.pm 2013/03/01 04:48:59 1.1116 +++ loncom/interface/loncommon.pm 2013/04/02 00:02:02 1.1119 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1116 2013/03/01 04:48:59 raeburn Exp $ +# $Id: loncommon.pm,v 1.1119 2013/04/02 00:02:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1003,7 +1003,7 @@ sub select_language { my ($name,$selected,$includeempty) = @_; my %langchoices; if ($includeempty) { - %langchoices = ('' => &mt('No language preference')); + %langchoices = ('' => 'No language preference'); } foreach my $id (&languageids()) { my $code = &supportedlanguagecode($id); @@ -1011,6 +1011,7 @@ sub select_language { $langchoices{$code} = &plainlanguagedescription($id); } } + %langchoices = &Apache::lonlocal::texthash(%langchoices); return &select_form($selected,$name,\%langchoices); } @@ -6728,7 +6729,7 @@ ul#LC_secondary_menu li ul li { vertical-align: top; border-left: 1px solid black; border-right: 1px solid black; - background-color: $data_table_light + background-color: $data_table_light; list-style:none; float: none; } @@ -8224,7 +8225,19 @@ sub get_sections { my %sectioncount; my $now = time; - if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) { + my $check_students = 1; + my $only_students = 0; + if (ref($possible_roles) eq 'ARRAY') { + if (grep(/^st$/,@{$possible_roles})) { + if (@{$possible_roles} == 1) { + $only_students = 1; + } + } else { + $check_students = 0; + } + } + + if ($check_students) { my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum); my $sec_index = &Apache::loncoursedata::CL_SECTION(); my $status_index = &Apache::loncoursedata::CL_STATUS(); @@ -8251,6 +8264,9 @@ sub get_sections { } } } + if ($only_students) { + return %sectioncount; + } my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); foreach my $user (sort(keys(%courseroles))) { if ($user !~ /^(\w{2})/) { next; }