--- loncom/interface/lonuserutils.pm 2012/10/02 18:08:12 1.142 +++ loncom/interface/lonuserutils.pm 2012/12/31 15:28:36 1.146 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.142 2012/10/02 18:08:12 bisitz Exp $ +# $Id: lonuserutils.pm,v 1.146 2012/12/31 15:28:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1907,8 +1907,8 @@ sub column_checkboxes { if ($env{'form.Status'} ne 'Any') { $disabledchk{'status'} = 1; } - if ($env{'form.showrole'} ne 'Any') { - $disabledchk{'role'} = 1; + if (($env{'form.showrole'} ne 'Any') && ($env{'form.showrole'} ne 'cr')) { + $disabledchk{'role'} = 1; } } my $numposs = scalar(@cols); @@ -2579,7 +2579,11 @@ END if ($env{'form.userwin'}) { $checkwin = ' checked="checked"'; } - $output .= '
'.$msg.'
'); return; } my ($classgroups) = &Apache::loncoursedata::get_group_memberships( @@ -4461,7 +4467,7 @@ sub upfile_drop_add { if (! defined($classlist)) { $r->print(''. ''. - &mt('There are no students with current/future access to the course.'). + ''.&mt('There are no students with current/future access to the course.').'
'. ''."\n"); } elsif (ref($classlist) eq 'HASH') { # Remove the students we just added from the list of students. @@ -4585,11 +4591,13 @@ sub print_drop_menu { ''."\n"); + $r->print( + &Apache::lonhtmlcommon::actionbox( + [''.$linktext.'']) + .''."\n"); } sub dates_feedback { @@ -5144,7 +5155,7 @@ sub setsections_javascript { acor => 'A coordinator role will be added with access to all sections', inea => 'In each course, each user may only have one student role at a time.', inco => 'In each community, each user may only have one member role at a time.', - youh => 'You had selected ', + youh => 'You had selected', secs => 'sections.', plmo => 'Please modify your selections so they include no more than one section.', mayn => 'may not be used as the name for a section, as it is a reserved word.',