');
+ $r->print('| ');
my $displayed = 0;
my $totalboxes = 0;
@@ -634,20 +535,17 @@ sub display_actions_box {
}
my $halfway = 4;
# my $halfway = int($totalboxes/2) + $totalboxes%2;
- if ($custommenu) {
- $halfway = 2;
- }
foreach my $actionitem (@actionorder) {
if ($$checkallowed{$actionitem}) {
if ($displayed == $halfway) {
$r->print(' | | ');
}
- &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount);
+ &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror);
$displayed ++;
}
}
$r->print('
- |
+
');
@@ -730,8 +628,6 @@ sub display_interval_config {
$r->print('
'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' expired.').'
');
} elsif ($context eq 'newroles') {
$r->print('
'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'
');
- } elsif ($context eq 'crslogin') {
- $r->print('
'.&mt('Choose the time window to use to display the last login by a user in the '.$lctype).'
');
} else {
$r->print('
'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'
');
}
@@ -897,7 +793,7 @@ sub display_launcher {
$tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
$newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
$interval,$countunread,$expired,$expirecount,$activated,$activecount,
- $crstype,$itemserror,$loggedin,$logincount) = @_;
+ $crstype,$itemserror) = @_;
if ($$checkallowed{$action}) {
&start_box($r,$show,$headings,$action,$refpage,$action);
@@ -924,10 +820,6 @@ sub display_launcher {
} elsif ($action eq 'oldroles') { # EXPIRED ROLES
&display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'},
$crstype);
- } elsif ($action eq 'crslogin') { #LAST LOGIN
- &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'},
- $crstype);
-
}
}
&end_box($r);
@@ -1238,7 +1130,7 @@ sub process_reset {
sub process_update {
my ($uname,$udom,$threshold_titles) = @_;
- my $setoutput = ''.&mt('Changes to threshold(s) for problem tracking:').'
';
+ my $setoutput = ''.&mt('Changes to threshold(s) for problem tracking:').'
';
foreach (keys %env) {
next if ($_!~/^form\.(.+)\_setparmval$/);
my $name = $1;
@@ -1249,17 +1141,17 @@ sub process_update {
my ($shortname) = ($name =~ /^\Q$env{'request.course.id'}\E:threshold_(.+)$/);
if ($put_result eq 'ok') {
- $setoutput.=&mt('Set threshold for [_1] to [_2]',
+ $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Set threshold for [_1] to [_2]',
''.$$threshold_titles{$shortname}.'',
- ''.$value.'').'
';
+ ''.$value.'').'
');
} else {
- $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
+ $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
''.$name.'',''.$value.'',
- ''.$put_result.'').'
';
+ ''.$put_result.'').'
',1);
}
}
}
- return $setoutput;
+ return &Apache::loncommon::confirmwrapper($setoutput);
}
sub getnormalmail {
@@ -1525,39 +1417,6 @@ sub getrolechanges {
return $rolechgcount;
}
-sub getloggedin {
- my ($cdom,$crs,$lastlogins,$starttime) = @_;
- my $context = 'course';
- my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context);
- my $viewablesec = &Apache::lonuserutils::viewable_section($permission);
- my %crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$crs);
- my $logincount = 0;
- my ($tmp) = keys(%crslogins);
- unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- if (keys(%crslogins) > 0) {
- foreach my $key (keys(%crslogins)) {
- my ($uname,$udom,$section,$role) = split(/:/,$key);
- my $eventtime = $crslogins{$key};
- if ($eventtime > $starttime) {
- if (($viewablesec ne '') && ($section ne '')) {
- next if ($viewablesec ne $section);
- }
- my %chginfo = (
- 'section' => $section,
- 'uname' => $uname,
- 'udom' => $udom,
- 'role' => $role,
- );
- $logincount ++;
- push (@{$lastlogins->{$eventtime}},\%chginfo);
- }
- }
- }
- }
- return $logincount;
-}
-
sub checkversions {
my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
@@ -1814,90 +1673,6 @@ sub display_rolechanges {
}
return;
}
-
-sub display_crslogins {
- my ($r,$logincount,$loggedin,$interval,$crstype) = @_;
- my %lt = &Apache::lonlocal::texthash(
- 'user' => 'User',
- 'role' => 'Role',
- 'sec' => 'Section',
- 'number' => 'Total number of logins',
- );
- if ($logincount) {
- $r->print(' |