--- loncom/interface/slotrequest.pm	2009/03/27 11:39:07	1.92
+++ 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.92 2009/03/27 11:39:07 bisitz 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').'</p>').&return_link($r);
+        $r->print(&mt('or').'</p>');
+        &return_link($r);
     } else {
         $r->print('</p>');
     }
@@ -1351,9 +1352,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);
 	}
 
@@ -1595,9 +1600,9 @@ sub show_map_row {
         $output .= '<img src="'.$location.'" alt="" />';
     }
     if ($type eq 'page') {
-        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";
+        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
     } else {
-        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
+        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
     }
     $output .= $title.'</td><td colspan="2">&nbsp;</td>'."\n";
     unshift (@{$maprows},$output);
@@ -1618,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('<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>');
     }
@@ -1748,6 +1753,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'};
@@ -1810,8 +1835,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;
@@ -1912,7 +1937,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;
 }
 
@@ -1964,7 +1991,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)).
@@ -2037,7 +2064,7 @@ sub display_filter {
 sub upload_start {
     my ($r)=@_;    
     $r->print(&Apache::grades::checkforfile_js());
-    my $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+    my $result.='<table width="100%" border="0"><tr bgcolor="#E6FFFF"><td>'."\n";
     $result.='&nbsp;<b>'.
 	&mt('Specify a file containing the slot definitions.').
 	'</b></td></tr>'."\n";
@@ -2077,7 +2104,7 @@ Total number of records found in file: $
 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.<hr />
 <input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
-<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
+<label><input type="checkbox" name="noFirstLine"$checked />$ignore</label>
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
 <input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />