--- loncom/interface/slotrequest.pm 2011/12/20 22:44:27 1.112
+++ loncom/interface/slotrequest.pm 2014/09/12 15:22:58 1.121
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.112 2011/12/20 22:44:27 raeburn Exp $
+# $Id: slotrequest.pm,v 1.121 2014/09/12 15:22:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -339,12 +339,12 @@ sub store_slot_parm {
context => $env{'form.context'},
);
- &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
- '',$env{'user.name'},$env{'user.domain'},
- $cnum,$cdom);
- &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
- 1,$env{'user.name'},$env{'user.domain'},
- $env{'user.name'},$env{'user.domain'});
+ &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+ '',$env{'user.name'},$env{'user.domain'},
+ $cnum,$cdom);
+ &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+ 1,$env{'user.name'},$env{'user.domain'},
+ $env{'user.name'},$env{'user.domain'});
return;
}
@@ -538,10 +538,10 @@ sub release_reservation {
action => 'release',
context => $env{'form.context'},
);
- &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
- 1,$uname,$udom,$cnum,$cdom);
- &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
- 1,$uname,$udom,$uname,$udom);
+ &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+ 1,$uname,$udom,$cnum,$cdom);
+ &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+ 1,$uname,$udom,$uname,$udom);
}
}
@@ -696,7 +696,7 @@ STUFF
}
my %lt = &Apache::lonlocal::texthash(
- 'request' => 'Availibility list',
+ 'request' => 'Availability list',
'try' => 'Try again?',
'or' => 'or',
);
@@ -847,13 +847,13 @@ sub show_choices {
if (ref($consumed_uniqueperiods) eq 'HASH') {
if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
$r->print(''.
- &mt('An error occurred determining slot availability').
+ &mt('An error occurred determining slot availability.').
'');
return;
}
} elsif ($consumed_uniqueperiods =~ /^error: /) {
$r->print(''.
- &mt('An error occurred determining slot availability').
+ &mt('An error occurred determining slot availability.').
'');
return;
}
@@ -862,7 +862,7 @@ sub show_choices {
my @got_slots=&check_for_reservation($symb,'allslots');
if ($got_slots[0] =~ /^error: /) {
$r->print(''.
- &mt('An error occurred determining slot availability').
+ &mt('An error occurred determining slot availability.').
'');
return;
}
@@ -877,7 +877,7 @@ sub show_choices {
push(@available,$slot);
}
if (!@available) {
- $output = &mt('No available times.');
+ $output = ''.&mt('No available times.').'';
if ($env{'form.command'} ne 'manageresv') {
$output .= ' '.
&mt('Return to last resource').'';
@@ -957,6 +957,7 @@ STUFF
$output .= &Apache::loncommon::end_data_table();
}
$r->print($output);
+ return;
}
sub to_show {
@@ -1058,7 +1059,8 @@ sub show_table {
my $available;
if ($mgr eq 'F') {
# FIXME: This line should be deleted once Slots uses breadcrumbs
- $r->print(&Apache::loncommon::help_open_topic('Slot About', 'Help on slots'));
+ $r->print('
'.&Apache::loncommon::help_open_topic(
+ 'Slot About', &mt('Help on slots')));
$r->print('