--- loncom/interface/slotrequest.pm 2009/03/29 17:56:43 1.93
+++ loncom/interface/slotrequest.pm 2009/05/16 22:50:35 1.98
@@ -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.93 2009/03/29 17:56:43 raeburn Exp $
+# $Id: slotrequest.pm,v 1.98 2009/05/16 22:50:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -707,7 +707,8 @@ $lt{'or'}
STUFF
if (!$inhibit_return_link) {
- $r->print(&mt('or').'
').&return_link($r);
+ $r->print(&mt('or').'');
+ &return_link($r);
} else {
$r->print('');
}
@@ -1599,9 +1600,9 @@ sub show_map_row {
$output .= '
';
}
if ($type eq 'page') {
- $output .= '
'."\n";
+ $output .= '
'."\n";
} else {
- $output .= '
'."\n";
+ $output .= '
'."\n";
}
$output .= $title.' | '."\n";
unshift (@{$maprows},$output);
@@ -1622,7 +1623,7 @@ sub show_reservations {
my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname);
if ($env{'form.origin'} eq 'aboutme') {
$r->print(''.
- &mt('History of student-schedulable slots for: [_1]',
+ &mt('History of student-reservable slots for: [_1]',
&Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'},
'firstname')).'
');
}
@@ -1763,7 +1764,7 @@ sub show_reservations_log {
$badslot = 1;
} elsif ($slot{type} ne 'schedulable_student') {
my $description = &get_description($env{'form.slotname'},\%slot);
- $r->print(''.&mt('Reservation history unavailable for non-student-schedulable slot: [_1].',$description).'
');
+ $r->print(''.&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description).'
');
$badslot = 1;
}
}
@@ -1835,7 +1836,7 @@ sub show_reservations_log {
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description = $slot{'description'};
$r->print(''.
- &mt('Reservation changes for student-schedulable slot: [_1]',$description).'
');
+ &mt('Reservation changes for student-reservable slot: [_1]',$description).'
');
$r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));
my $showntablehdr = 0;
@@ -2063,7 +2064,7 @@ sub display_filter {
sub upload_start {
my ($r)=@_;
$r->print(&Apache::grades::checkforfile_js());
- my $result.='