--- loncom/interface/lonuserutils.pm 2012/08/21 15:43:27 1.141 +++ 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.141 2012/08/21 15:43:27 raeburn Exp $ +# $Id: lonuserutils.pm,v 1.145 2012/12/18 15:35:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1691,21 +1691,23 @@ sub print_userlist { } } if (keys(%userlist) == 0) { + my $msg = ''; if ($context eq 'author') { - $r->print(&mt('There are no co-authors to display.')."\n"); + $msg = &mt('There are no co-authors to display.'); } elsif ($context eq 'domain') { if ($env{'form.roletype'} eq 'domain') { - $r->print(&mt('There are no users with domain roles to display.')."\n"); + $msg = &mt('There are no users with domain roles to display.'); } elsif ($env{'form.roletype'} eq 'author') { - $r->print(&mt('There are no authors or co-authors to display.')."\n"); + $msg = &mt('There are no authors or co-authors to display.'); } elsif ($env{'form.roletype'} eq 'course') { - $r->print(&mt('There are no course users to display')."\n"); + $msg = &mt('There are no course users to display'); } elsif ($env{'form.roletype'} eq 'community') { - $r->print(&mt('There are no community users to display')."\n"); + $msg = &mt('There are no community users to display'); } } elsif ($context eq 'course') { $r->print(&mt('There are no course users to display.')."\n"); } + $r->print('
'."\n") if $msg;
} else {
# Print out the available choices
my $usercount;
@@ -1717,7 +1719,7 @@ sub print_userlist {
$permission,$env{'form.Status'},\%userlist,$keylist);
}
if (!$usercount) {
- $r->print('
'
+ $r->print('
'
.&mt('There are no users matching the search criteria.')
.''
);
@@ -2577,7 +2579,11 @@ END
if ($env{'form.userwin'}) {
$checkwin = ' checked="checked"';
}
- $output .= '
'.$msg.'
'); return; } my ($classgroups) = &Apache::loncoursedata::get_group_memberships( @@ -4459,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. @@ -4583,11 +4591,13 @@ sub print_drop_menu { ''."\n"); + $r->print( + &Apache::lonhtmlcommon::actionbox( + [''.$linktext.'']) + .''."\n"); } sub dates_feedback { @@ -5142,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.',