--- loncom/interface/lonuserutils.pm 2012/10/02 18:08:12 1.142 +++ loncom/interface/lonuserutils.pm 2012/12/18 15:35:42 1.145 @@ -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.145 2012/12/18 15:35:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2579,7 +2579,11 @@ END if ($env{'form.userwin'}) { $checkwin = ' checked="checked"'; } - $output .= ''.$lt{'owin'}.''; + $output .= + '' + .''; } $output .= "\n".'
'."\n". &Apache::loncommon::start_data_table(). @@ -3666,11 +3670,13 @@ END } } if (!$studentcount) { + my $msg = ''; if ($crstype eq 'Community') { - $r->print(&mt('There are no members to drop.')); + $msg = &mt('There are no members to drop.'); } else { - $r->print(&mt('There are no students to drop.')); + $msg = &mt('There are no students to drop.'); } + $r->print('

'.$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"); my $classlist = &Apache::loncoursedata::get_classlist(); if (! defined($classlist)) { + my $msg = ''; if ($crstype eq 'Community') { - $r->print(&mt('There are no members currently enrolled.')."\n"); + $msg = &mt('There are no members currently enrolled.'); } else { - $r->print(&mt('There are no students currently enrolled.')."\n"); + $msg = &mt('There are no students currently enrolled.'); } + $r->print('

'.$msg."

\n"); } else { &show_drop_list($r,$classlist,'nosort',$permission,$crstype); } @@ -4922,7 +4930,7 @@ sub update_user_list { } } } - $r->print('

'.&mt("$result_text{'ok'}{$choice} for [quant,_1,user role,user roles,no user roles].",$count).'

'); + $r->print('

'.&mt("$result_text{'ok'}{$choice} [quant,_1,user role,user roles,no user roles].",$count).'

'); if ($count > 0) { if ($choice eq 'revoke' || $choice eq 'drop') { $r->print('

'.&mt('Re-enabling will re-activate data for the role.').'

'); @@ -4939,7 +4947,10 @@ sub update_user_list { if ($choice eq 'drop') { $linktext = &mt('Display current class roster'); } - $r->print(''.$linktext.'
'."\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.',