--- loncom/interface/slotrequest.pm 2009/03/27 06:47:59 1.91
+++ loncom/interface/slotrequest.pm 2009/08/13 10:32:29 1.103
@@ -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.91 2009/03/27 06:47:59 raeburn Exp $
+# $Id: slotrequest.pm,v 1.103 2009/08/13 10:32:29 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('');
}
@@ -1351,9 +1352,13 @@ LOGLINK
my $remove_all=&remove_link($slot,'remove all').' ';
- if ($ids ne '') { undef($delete); }
- if ($slots{$slot}{'type'} ne 'schedulable_student'
- || $ids eq '') {
+ if ($ids eq '') {
+ undef($remove_all);
+ } else {
+ undef($delete);
+ }
+ if ($slots{$slot}{'type'} ne 'schedulable_student') {
+ undef($showlog);
undef($remove_all);
}
@@ -1426,7 +1431,14 @@ STUFF
sub manage_reservations {
my ($r,$type) = @_;
my $navmap = Apache::lonnavmaps::navmap->new();
- $r->print('
'.&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.').' '.&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.').'
'.&mt('Your reservation status for any such assignments is listed below:').'
');
+ $r->print('
'
+ .&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
+ .' '
+ .&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.')
+ .'
'
+ .&mt('Your reservation status for any such assignments is listed below:')
+ .'
');
+ return;
+ }
my $formname = 'reservationslog';
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -1800,8 +1835,8 @@ sub show_reservations_log {
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description = $slot{'description'};
- $r->print('
'.
- &mt('Reservation changes for slot: [_1]',$description).'
');
+ $r->print(''.
+ &mt('Reservation changes for student-reservable slot: [_1]',$description).' ');
$r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));
my $showntablehdr = 0;
@@ -1898,11 +1933,13 @@ function chgPage(caller) {
ENDSCRIPT
}
} else {
- $r->print(&mt('There are no records to display'));
+ $r->print(&mt('There are no records to display.'));
}
$r->print(''.
''.
- '');
+ ''.
+ '
');
return;
}
@@ -1954,7 +1991,7 @@ sub display_filter {
my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_;
my $nolink = 1;
my (%titles,%maptitles);
- my $output = '
'.
- ''.
- &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.8.99.0 or later are displayed.');
+ '
'.
+ &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+ ,'2.9.0');
if ($version) {
- $output .= ' '.&mt('This server is version [_3].','','',$version);
+ $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
}
- $output .= '
';
+ $output .= ' ';
return $output;
}
sub upload_start {
my ($r)=@_;
- $r->print(&Apache::grades::checkforfile_js());
- my $result.='
'."\n";
- $result.=' '.
- &mt('Specify a file containing the slot definitions.').
- '
'."\n";
- $result.='
'."\n";
- my $upfile_select=&Apache::loncommon::upfile_select_html();
- my $ignore=&mt('Ignore First Line');
- $result.=<
-
-$upfile_select
-
-
-
-ENDUPFORM
- $result.='
'.&mt('Specify a file containing the slot definitions.').'
'
+ .''
+ );
}
sub csvuploadmap_header {
@@ -2066,8 +2108,8 @@ sub csvuploadmap_header {
Total number of records found in file: $distotal
Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to create the slots.
-
-
+
+
@@ -2091,7 +2133,7 @@ sub csvuploadmap_footer {
-
+
ENDPICK
}