--- loncom/interface/slotrequest.pm	2009/03/27 06:47:59	1.91
+++ loncom/interface/slotrequest.pm	2009/03/29 18:06:09	1.94
@@ -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.94 2009/03/29 18:06:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1351,9 +1351,13 @@ LOGLINK
 
         my $remove_all=&remove_link($slot,'remove all').'<br />';
 
-        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 +1430,14 @@ STUFF
 sub manage_reservations {
     my ($r,$type) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    $r->print('<p>'.&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.').'<br />'.&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.').'</p><p>'.&mt('Your reservation status for any such assignments is listed below:').'</p>');
+    $r->print('<p>'
+             .&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
+             .'<br />'
+             .&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.')
+             .'</p><p>'
+             .&mt('Your reservation status for any such assignments is listed below:')
+             .'</p>'
+    );
     if (!defined($navmap)) {
         $r->print('<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
@@ -1611,7 +1622,7 @@ sub show_reservations {
     my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname);
     if ($env{'form.origin'} eq 'aboutme') {
         $r->print('<div class="LC_fontsize_large">'.
-                  &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')).'</div>');
     }
@@ -1723,7 +1734,10 @@ function chgPage(caller) {
 ENDSCRIPT
         }
     } else {
-        $r->print(&mt('There are no trasactions to display'));
+        $r->print('<span class="LC_info">'
+                 .&mt('There are no transactions to display')
+                 .'</span>'
+        );
     }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'."\n".
               '<input type="hidden" name="command" value="showresv" />'."\n");
@@ -1738,6 +1752,26 @@ ENDSCRIPT
 
 sub show_reservations_log {
     my ($r) = @_;
+    my $badslot;
+    if ($env{'form.slotname'} eq '') {
+        $r->print('<div class="LC_warning">'.&mt('No slot name provided').'</div>');
+        $badslot = 1;
+    } else {
+        my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+        if (keys(%slot) == 0) {
+            $r->print('<div class="LC_warning">'.&mt('Invalid slot name: [_1]',$env{'form.slotname'}).'</div>');
+            $badslot = 1;
+        } elsif ($slot{type} ne 'schedulable_student') {
+            my $description = &get_description($env{'form.slotname'},\%slot);
+            $r->print('<div class="LC_warning">'.&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description).'</div>');
+            $badslot = 1;
+        }
+    }
+    if ($badslot) {
+        $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+                  &mt('Return to slot list').'</a></p>');
+        return;
+    }
     my $formname = 'reservationslog';
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -1800,8 +1834,8 @@ sub show_reservations_log {
 
     my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
     my $description = $slot{'description'};
-    $r->print('<div class="LC_fontsize_large">'.
-              &mt('Reservation changes for slot: [_1]',$description).'</div>');
+    $r->print('<span class="LC_fontsize_large">'.
+              &mt('Reservation changes for student-reservable slot: [_1]',$description).'</span><br />');
 
     $r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));
     my $showntablehdr = 0;
@@ -1902,7 +1936,9 @@ ENDSCRIPT
     }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               '<input type="hidden" name="slotname" value="'.$env{'form.slotname'}.'" />'.
-              '<input type="hidden" name="command" value="slotlog" /></form>');
+              '<input type="hidden" name="command" value="slotlog" /></form>'.
+              '<p><a href="/adm/slotrequest?command=showslots">'.
+              &mt('Return to slot list').'</a></p>');
     return;
 }
 
@@ -1954,7 +1990,7 @@ sub display_filter {
     my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_;
     my $nolink = 1;
     my (%titles,%maptitles);
-    my $output = '<table><tr><td valign="top">'.
+    my $output = '<br /><table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
                  &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).