--- loncom/interface/slotrequest.pm	2009/02/02 18:20:15	1.88
+++ loncom/interface/slotrequest.pm	2012/06/09 15:41:26	1.113
@@ -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.88 2009/02/02 18:20:15 bisitz Exp $
+# $Id: slotrequest.pm,v 1.113 2012/06/09 15:41:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,8 +56,12 @@ sub fail {
 }
 
 sub start_page {
-    my ($r,$title)=@_;
-    $r->print(&Apache::loncommon::start_page($title));
+    my ($r,$title,$brcrum)=@_;
+    my $args;
+    if (ref($brcrum) eq 'ARRAY') {
+        $args = {bread_crumbs => $brcrum};
+    }
+    $r->print(&Apache::loncommon::start_page($title,undef,$args));
 }
 
 sub end_page {
@@ -133,22 +137,20 @@ sub check_for_reservation {
 	return 'error: Unable to determine current status';
     }    
     my @got;
-    foreach my $slot_name (sort {
-	if (ref($slots{$a}) && ref($slots{$b})) {
-	    return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'}
-	}
-	if (ref($slots{$a})) { return -1;}
-	if (ref($slots{$b})) { return 1;}
-	return 0;
-    } @slots) {
+    my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
+    foreach my $slot_name (@sorted_slots) {
 	next if (!defined($slots{$slot_name}) ||
 		 !ref($slots{$slot_name}));
 	&Apache::lonxml::debug(time." $slot_name ".
 			       $slots{$slot_name}->{'starttime'}." -- ".
-			       $slots{$slot_name}->{'startreserve'});
-	if ($slots{$slot_name}->{'endtime'} > time &&
-	    $slots{$slot_name}->{'startreserve'} < time) {
-	    # between start of reservation times and end of slot
+			       $slots{$slot_name}->{'startreserve'}." -- ".
+                               $slots{$slot_name}->{'endreserve'});
+	if (($slots{$slot_name}->{'endtime'} > time) &&
+	    ($slots{$slot_name}->{'startreserve'} < time) &&
+            ((!$slots{$slot_name}->{'endreserve'}) || 
+             ($slots{$slot_name}->{'endreserve'} > time))) {
+	    # between start of reservation time and end of reservation time
+            # and before end of slot
 	    if ($mode eq 'allslots') {
 		push(@got,$slot_name);
 	    } else {
@@ -239,9 +241,7 @@ sub check_for_conflict {
 }
 
 sub make_reservation {
-    my ($slot_name,$slot,$symb)=@_;
-
-    my ($cnum,$cdom)=&get_course();
+    my ($slot_name,$slot,$symb,$cnum,$cdom)=@_;
 
     my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb,
 				   $env{'user.domain'},$env{'user.name'});
@@ -315,13 +315,7 @@ sub make_reservation {
 	if ($value) {
 	    $new_value=$value.':'.$new_value;
 	}
-	my $result=&Apache::lonparmset::storeparm_by_symb($symb,
-						      '0_availablestudent',
-						       $parm_level, $new_value,
-						       'string',
-						       $env{'user.name'},
-					               $env{'user.domain'});
-	&Apache::lonxml::debug("hrrm $result");
+        &store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom);
 	return $wanted;
     }
 
@@ -329,6 +323,32 @@ sub make_reservation {
     return undef;
 }
 
+sub store_slot_parm {
+    my ($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom) = @_;
+    my $result=&Apache::lonparmset::storeparm_by_symb($symb,
+                                                  '0_availablestudent',
+                                                   $parm_level, $new_value,
+                                                   'string',
+                                                   $env{'user.name'},
+                                                   $env{'user.domain'});
+    &Apache::lonxml::debug("hrrm $result");
+    my %storehash = (
+                       symb    => $symb,
+                       slot    => $slot_name,
+                       action  => 'reserve',
+                       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'});
+
+    return;
+}
+
 sub remove_registration {
     my ($r) = @_;
     if ($env{'form.entry'} ne 'remove all') {
@@ -354,7 +374,7 @@ sub remove_registration {
     my $names = join(' ',@names);
 
     my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name);
-    &remove_registration_confirmation($r,$msg,['entry','slotname']);
+    &remove_registration_confirmation($r,$msg,['entry','slotname','context']);
 }
 
 sub remove_registration_user {
@@ -371,7 +391,7 @@ sub remove_registration_user {
 		  $name,$slot_name,$title);
     
     &remove_registration_confirmation($r,$msg,['uname','udom','slotname',
-					       'entry','symb']);
+					       'entry','symb','context']);
 }
 
 sub remove_registration_confirmation {
@@ -383,8 +403,10 @@ sub remove_registration_confirmation {
 	    '<input type="hidden" name="'.$parm.'" value="'
 	    .&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";
     }
-    my %lt = &Apache::lonlocal::texthash('yes' => 'Yes',
-					 'no'  => 'No',);
+    my %lt = &Apache::lonlocal::texthash(
+        'yes' => 'Yes',
+        'no'  => 'No',
+    );
     $r->print(<<"END_CONFIRM");
 <p> $msg </p>
 <form action="/adm/slotrequest" method="post">
@@ -510,6 +532,16 @@ sub release_reservation {
 	if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
 	    &Apache::lonnet::del('slot_reservations',[$entry],
 				 $cdom,$cnum);
+            my %storehash = (
+                               symb    => $symb,
+                               slot    => $slot_name,
+                               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);
 	}
     }
 
@@ -530,12 +562,15 @@ sub release_reservation {
 						      '0_availablestudent',
 						      $parm_level, $new_param,
 						      'string', $uname, $udom);
-
     my $msg;
     if ($mgr eq 'F') {
 	$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
     } else {
-	$msg = &mt('Released Reservation: [_1]',$description);
+	$msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />';
+        my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+        my $subject = &mt('Reservation change: [_1]',$description);
+        my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
+        $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'release');
     }
     return (1,$msg);
 }
@@ -575,8 +610,13 @@ sub delete_slot {
 
 sub return_link {
     my ($r) = @_;
-    $r->print('<p><a href="/adm/flip?postdata=return:">'.
-	      &mt('Return to last resource').'</a></p>');
+    if (($env{'form.command'} eq 'manageresv') || ($env{'form.context'} eq 'usermanage')) {
+	$r->print('<p><a href="/adm/slotrequest?command=manageresv">'.
+                  &mt('Return to reservations'));  
+    } else {
+        $r->print('<p><a href="/adm/flip?postdata=return:">'.
+	          &mt('Return to last resource').'</a></p>');
+    }
 }
 
 sub get_slot {
@@ -597,7 +637,6 @@ sub get_slot {
 	my $description1=&get_description($slot_name,\%slot);
 	%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
 	my $description2=&get_description($env{'form.slotname'},\%slot);
-	$r->print('<p>'.&mt('Already have a reservation: [_1].',$description1).'</p>');
 	if ($slot_name ne $env{'form.slotname'}) {
 	    $r->print(<<STUFF);
 <form method="post" action="/adm/slotrequest">
@@ -606,26 +645,32 @@ sub get_slot {
    <input type="hidden" name="releaseslot" value="$slot_name" />
    <input type="hidden" name="command" value="change" />
 STUFF
-            $r->print('<p>'
-                     .&mt('You can either [_1]Change[_2] your reservation from [_3] to [_4] or'
-                         ,'<input type="submit" name="change" value="'
-                         ,'" />'
-                         ,'<b>'.$description1.'</b>'
-                         ,'<b>'.$description2.'</b>')
-                     .'<br /></p>'
-            );
-	    &return_link($r);
+            $r->print('<p class="LC_error">'.&mt('Reservation currently unchanged').'</p>');
+            if ($slot_name ne '') {
+                $r->print('<p>'.&mt('To complete the transaction you [_1]must confirm[_2] you want to [_3]process the change[_4] to [_5].'
+                         ,'<b>','</b>','<i>','</i>','<b>'.$description2.'</b>')
+                         .'<br />'
+                         .&mt('Or you can choose to [_1]make no change[_2] and continue[_2] with the reservation you already had: [_3].'
+                         ,'<i>','</i>','<b>'.$description1.'</b>')
+                         .'</p><p><span class="LC_nobreak">'
+                         .'<input type="submit" name="change" value="'.&mt('Process the change').'" />' 
+                         .('&nbsp;'x3)
+                         .'<input type="submit" name="nochange" value="'.&mt('Make no change').'" />'
+                         .'</span></p>');
+            }
 	    $r->print(<<STUFF);
 </form>
 STUFF
         } else {
+            $r->print('<p>'.&mt('Already have a reservation: [_1].',$description1).'</p>');
 	    &return_link($r);
 	}
 	return 0;
     }
 
+    my ($cnum,$cdom)=&get_course();
     my $reserved=&make_reservation($env{'form.slotname'},
-				   \%slot,$symb);
+				   \%slot,$symb,$cnum,$cdom);
     my $description=&get_description($env{'form.slotname'},\%slot);
     if (defined($reserved)) {
 	my $retvalue = 0;
@@ -634,8 +679,15 @@ STUFF
                      .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
                      .'</span></p>');
 	} elsif ($reserved > -1) {
-	    $r->print('<p>'.&mt('Success: [_1]',$description).'</p>');
+	    $r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up:  [_1]',$description).'</p>');
 	    $retvalue = 1;
+            my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+            my $subject = &mt('Reservation change: [_1]',$description);
+            my $msgbody = &mt('Successful reservation by [_1] for [_2].',$person,$description);
+            my $msg = &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'reserve');
+            if ($msg) {
+                $r->print($msg);
+            }
 	} elsif ($reserved < 0) {
 	    $r->print('<p>'.&mt('Already reserved: [_1]',$description).'</p>');
 	}
@@ -643,10 +695,11 @@ STUFF
 	return 1;
     }
 
-    my %lt=('request'=>"Availibility list",
-	    'try'    =>'Try again?',
-            'or'     => 'or');
-    %lt=&Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash(
+        'request' => 'Availibility list',
+        'try'     => 'Try again?',
+        'or'      => 'or',
+    );
 
     my $extra_input;
     if ($conflictable_slot) {
@@ -673,7 +726,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>');
     }
@@ -706,6 +760,11 @@ sub allowed_slot {
     if ($slot->{'startreserve'} > time) {
 	return 0;
     }
+    # reserve time ended
+    if (($slot->{'endreserve'}) &&
+        ($slot->{'endreserve'} < time)) {
+        return 0;
+    }    
     &Apache::lonxml::debug("$slot_name reserve good");
 
     my $userallowed=0;
@@ -780,10 +839,10 @@ sub get_description {
 }
 
 sub show_choices {
-    my ($r,$symb)=@_;
+    my ($r,$symb,$formname)=@_;
 
     my ($cnum,$cdom)=&get_course();
-    my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+    my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
     my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
     if (ref($consumed_uniqueperiods) eq 'HASH') {
         if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
@@ -798,7 +857,7 @@ sub show_choices {
                   '</span>');
         return;
     }
-    my $available;
+    my (@available,$output);
     &Apache::lonxml::debug("Checking Slots");
     my @got_slots=&check_for_reservation($symb,'allslots');
     if ($got_slots[0] =~ /^error: /) {
@@ -807,20 +866,33 @@ sub show_choices {
                   '</span>');
         return;
     }
-    $r->print('<table border="1">');
     foreach my $slot (sort 
 		      { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
 		      (keys(%slots)))  {
 
 	&Apache::lonxml::debug("Checking Slot $slot");
-	next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots,
+	next if (!&allowed_slot($slot,$slots{$slot},$symb,\%slots,
 				$consumed_uniqueperiods));
 
-	$available++;
-
+        push(@available,$slot);
+    }
+    if (!@available) {
+        $output = &mt('No available times.');
+        if ($env{'form.command'} ne 'manageresv') {
+            $output .= ' <a href="/adm/flip?postdata=return:">'.
+                       &mt('Return to last resource').'</a>';
+        }
+        $r->print('<p class="LC_info">'.$output.'</p>');
+        return;
+    }
+    if ($env{'form.command'} eq 'manageresv') {
+        $output = '<table border="0">';
+    } else {
+        $output = &Apache::loncommon::start_data_table();
+    }
+    foreach my $slot (@available) { 
 	my $description=&get_description($slot,$slots{$slot});
-
-	my $form=&mt('Unavailable');
+	my $form;
 	if ((grep(/^\Q$slot\E$/,@got_slots)) ||
 	    &space_available($slot,$slots{$slot},$symb)) {
 	    my $text=&mt('Select');
@@ -834,9 +906,9 @@ sub show_choices {
 						   $consumed_uniqueperiods);
                 if ($conflict) {
                     if ($conflict =~ /^error: /) {
-                        $r->print('<tr><td><span class="LC_error" colspan="2">'
-                                  .&mt('Slot: [_1] has unknown status.',$description)
-                                  .'</span></td></tr>');
+                        $form = '<span class="LC_error">'.
+                                &mt('Slot: [_1] has unknown status.',$description).
+                                '</span>';
                     } else {
 		        $text=&mt('Change Reservation');
 		        $command='get';
@@ -844,29 +916,47 @@ sub show_choices {
                 }
 	    }
 	    my $escsymb=&escape($symb);
-	    $form=<<STUFF;
-   <form method="post" action="/adm/slotrequest">
+            if (!$form) {
+                if ($formname) {
+                    $formname = 'name="'.$formname.'" ';
+                }
+                my $context = 'user';
+                if ($env{'form.command'} eq 'manageresv') {
+                    $context = 'usermanage';
+                }
+	        $form=<<STUFF;
+   <form method="post" action="/adm/slotrequest" $formname>
      <input type="submit" name="Select" value="$text" />
      <input type="hidden" name="symb" value="$escsymb" />
      <input type="hidden" name="slotname" value="$slot" />
      <input type="hidden" name="command" value="$command" />
+     <input type="hidden" name="context" value="$context" />
    </form>
 STUFF
-	}
-	$r->print(<<STUFF);
-<tr>
+	    }
+        } else {
+            $form = &mt('Unavailable');
+        }
+        if ($env{'form.command'} eq 'manageresv') {
+            $output .= '<tr>';
+        } else {
+	    $output .= &Apache::loncommon::start_data_table_row();
+        }
+        $output .= " 
  <td>$form</td>
- <td>$description</td>
-</tr>
-STUFF
+ <td>$description</td>\n";
+        if ($env{'form.command'} eq 'manageresv') {
+            $output .= '</tr>';
+        } else {
+            $output .= &Apache::loncommon::end_data_table_row();
+        }
     }
-
-    if (!$available) {
-	$r->print('<tr><td>'.&mt('No available times.').
-                  ' <a href="/adm/flip?postdata=return:">'.
-		  &mt('Return to last resource').'</a></td></tr>');
+    if ($env{'form.command'} eq 'manageresv') {
+        $output .= '</table>';
+    } else {
+       $output .= &Apache::loncommon::end_data_table();
     }
-    $r->print('</table>');
+    $r->print($output);
 }
 
 sub to_show {
@@ -950,7 +1040,7 @@ sub remove_link {
     $symb      = &escape($symb);
 
     return <<"END_LINK";
- <a href="/adm/slotrequest?command=remove_registration&amp;slotname=$slotname&amp;entry=$entry&amp;uname=$uname&amp;udom=$udom&amp;symb=$symb"
+ <a href="/adm/slotrequest?command=remove_registration&amp;slotname=$slotname&amp;entry=$entry&amp;uname=$uname&amp;udom=$udom&amp;symb=$symb&amp;context=manage"
    >($remove)</a>
 END_LINK
 
@@ -960,6 +1050,7 @@ sub show_table {
     my ($r,$mgr)=@_;
 
     my ($cnum,$cdom)=&get_course();
+    my $crstype=&Apache::loncommon::course_type($cdom.'_'.$cnum);
     my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
     if ( (keys(%slots))[0] =~ /^error: 2 /) {
 	undef(%slots);
@@ -981,6 +1072,15 @@ sub show_table {
 	$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface'));
 	$r->print('</div>');
     }
+
+    if (!keys(%slots)) {
+        if ($crstype eq 'Community') {
+            $r->print('<div>'.&mt('No slots have been created in this community.').'</div>');
+        } else {
+            $r->print('<div>'.&mt('No slots have been created in this course.').'</div>');
+        }
+        return;
+    }
     
     my %Saveable_Parameters = ('show'              => 'array',
 			       'when'              => 'scalar',
@@ -1005,6 +1105,8 @@ sub show_table {
 	     'starttime'       => 'Start time',
 	     'endtime'         => 'End Time',
              'startreserve'    => 'Time students can start reserving',
+             'endreserve'      => 'Time students can no longer reserve',
+             'reservationmsg'  => 'Message triggered by reservation',
 	     'secret'          => 'Secret Word',
 	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
@@ -1014,9 +1116,14 @@ sub show_table {
 	     'uniqueperiod'    => 'Period of time slot is unique',
 	     'scheduled'       => 'Scheduled Students',
 	     'proctor'         => 'List of proctors');
+    if ($crstype eq 'Community') {
+        $show_fields{'startreserve'} = &mt('Time members can start reserving');
+        $show_fields{'endreserve'} = &mt('Time members can no longer reserve');
+        $show_fields{'scheduled'} = &mt('Scheduled Members');
+    }
     my @show_order=('name','description','type','starttime','endtime',
-		    'startreserve','secret','space','ip','symb',
-		    'allowedsections','allowedusers','uniqueperiod',
+		    'startreserve','endreserve','reservationmsg','secret','space',
+		    'ip','symb','allowedsections','allowedusers','uniqueperiod',
 		    'scheduled','proctor');
     my @show = 
 	(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
@@ -1082,24 +1189,24 @@ sub show_table {
           <th>'.&mt('Slot Name Filter').'</th>
           <th>'.&mt('Options').'</th>
       </tr>
-      <tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
+      <tr><td valign="top">'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
 	      '</td>
-           <td>
+           <td valign="top">
          '.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display,
 						    6,\%stu_display_fields,
 						    \@stu_display_order).'
            </td>
-           <td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
+           <td valign="top">'.&Apache::loncommon::select_form($when,'when',\%when_fields).
           '</td>
-           <td>'.&Apache::loncommon::select_form($name_filter_type,
+           <td valign="top">'.&Apache::loncommon::select_form($name_filter_type,
 						 'name_filter_type',
-						 %name_filter_type_fields).
+						 \%name_filter_type_fields).
 	      '<br />'.
 	      &Apache::lonhtmlcommon::textbox('name_filter_value',
 					      $env{'form.name_filter_value'},
 					      15).
           '</td>
-           <td>
+           <td valign="top">
             <table>
               <tr>
                 <td rowspan="2">Deleted slots:</td>
@@ -1127,7 +1234,7 @@ sub show_table {
 
     my %name_cache;
     my $slotsort = sub {
-	if ($env{'form.order'}=~/^(type|description|endtime|startreserve|ip|symb|allowedsections|allowedusers)$/) {
+	if ($env{'form.order'}=~/^(type|description|endtime|startreserve|endreserve|ip|symb|allowedsections|allowedusers|reservationmsg)$/) {
 	    if (lc($slots{$a}->{$env{'form.order'}})
 		ne lc($slots{$b}->{$env{'form.order'}})) {
 		return (lc($slots{$a}->{$env{'form.order'}}) 
@@ -1164,12 +1271,15 @@ sub show_table {
 	if ($tmp =~ /^error: /) { undef(%consumed); }
     }
 
+    my %msgops = &slot_reservationmsg_options();
+
     foreach my $slot (sort $slotsort (keys(%slots)))  {
 	if (!&to_show($slot,$slots{$slot},$when,
 		      $env{'form.deleted'},$name_filter)) { next; }
+        my $reservemsg;
 	if (defined($slots{$slot}->{'type'})
-	    && $slots{$slot}->{'type'} ne 'schedulable_student') {
-	    #next;
+	    && $slots{$slot}->{'type'} eq 'schedulable_student') {
+	    $reservemsg = $msgops{$slots{$slot}->{'reservationmsg'}};
 	}
 	my $description=&get_description($slot,$slots{$slot});
 	my ($id_count,$ids);
@@ -1206,6 +1316,8 @@ sub show_table {
 		 &Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):'');
 	my $start_reserve=($slots{$slot}->{'startreserve'}?
 			   &Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):'');
+        my $end_reserve=($slots{$slot}->{'endreserve'}?
+                         &Apache::lonlocal::locallocaltime($slots{$slot}->{'endreserve'}):'');
 	
 	my $unique;
 	if (ref($slots{$slot}{'uniqueperiod'})) {
@@ -1262,26 +1374,39 @@ sub show_table {
 	}
 	my $proctors=join(', ',@proctors);
 
+        my %lt = &Apache::lonlocal::texthash (
+                                               edit   => 'Edit',
+                                               delete => 'Delete',
+                                               slotlog => 'History',
+        );
 	my $edit=(<<"EDITLINK");
-<a href="/adm/helper/newslot.helper?name=$slot">Edit</a>
+<a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a>
 EDITLINK
 
 	my $delete=(<<"DELETELINK");
-<a href="/adm/slotrequest?command=delete&amp;slotname=$slot">Delete</a>
+<a href="/adm/slotrequest?command=delete&amp;slotname=$slot">$lt{'delete'}</a>
 DELETELINK
 
+        my $showlog=(<<"LOGLINK");
+<a href="/adm/slotrequest?command=slotlog&amp;slotname=$slot">$lt{'slotlog'}</a>
+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);
 	}
 
 	my $row_start=&Apache::loncommon::start_data_table_row();
 	my $row_end=&Apache::loncommon::end_data_table_row();
         $r->print($row_start.
-		  "\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
+		  "\n<td rowspan=\"$rowspan\">$edit $delete $showlog</td>\n");
 	if (exists($show{'name'})) {
 	    $colspan++;$r->print("<td>$slot</td>");
 	}
@@ -1300,6 +1425,12 @@ DELETELINK
 	if (exists($show{'startreserve'})) {
 	    $colspan++;$r->print("<td>$start_reserve</td>\n");
 	}
+        if (exists($show{'endreserve'})) {
+            $colspan++;$r->print("<td>$end_reserve</td>\n");
+        }
+        if (exists($show{'reservationmsg'})) {
+            $colspan++;$r->print("<td>$reservemsg</td>\n");
+        }
 	if (exists($show{'secret'})) {
 	    $colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n");
 	}
@@ -1340,30 +1471,755 @@ $row_end
 STUFF
         }
     }
-    $r->print('</table></form>');
+    $r->print(&Apache::loncommon::end_data_table().'</form>');
+    return;
+}
+
+sub manage_reservations {
+    my ($r,$crstype) = @_;
+    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>'
+    );
+    if (!defined($navmap)) {
+        $r->print('<div class="LC_error">');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('Unable to retrieve information about community contents'));
+        } else {
+            $r->print(&mt('Unable to retrieve information about course contents'));
+        }
+        $r->print('</div>');
+        &Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+        return;
+    }
+    my (%parent,%shownparent,%container,%container_title,%contents);
+    my ($depth,$count,$reservable,$lastcontainer,$rownum) = (0,0,0,0,0);
+    my @backgrounds = ("LC_odd_row","LC_even_row");
+    my $numcolors = scalar(@backgrounds);
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
+    my $slotheader = '<p>'.
+                 &mt('Your reservation status for any such assignments is listed below:').
+                 '</p>'.
+                 '<table class="LC_data_table LC_tableOfContent">'."\n";
+    my $shownheader = 0;
+    my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+    while (my $resource = $it->next()) {
+        if ($resource == $it->BEGIN_MAP()) {
+            $depth++;
+            $parent{$depth} = $lastcontainer;
+        }
+        if ($resource == $it->END_MAP()) {
+            $depth--;
+            $lastcontainer = $parent{$depth};
+        }
+        if (ref($resource)) {
+            my $symb = $resource->symb();
+            my $ressymb = $symb;
+            $contents{$lastcontainer} ++;
+            next if (!$resource->is_problem() && !$resource->is_sequence() && 
+                     !$resource->is_page());
+            $count ++;
+            if (($resource->is_sequence()) || ($resource->is_page())) {
+                $lastcontainer = $count;
+                $container{$lastcontainer} = $resource;
+                $container_title{$lastcontainer} = $resource->compTitle();
+            }
+            if ($resource->is_problem()) {
+                my ($useslots) = $resource->slot_control();
+                next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i));
+                my ($msg,$get_choices,$slotdescription);
+                my $title = $resource->compTitle();
+                my $status = $resource->simpleStatus('0');
+                my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0');
+                if ($slot_name ne '') {
+                    my %slot=&Apache::lonnet::get_slot($slot_name);
+                    $slotdescription=&get_description($slot_name,\%slot);
+                }
+                if ($slot_status == $resource->NOT_IN_A_SLOT) {
+                    $msg=&mt('No current reservation.');
+                    $get_choices = 1;
+                } elsif ($slot_status == $resource->NEEDS_CHECKIN) {
+                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                         '&nbsp;'.$slotdescription.'</span><br />'.
+                         &mt('Access requires proctor validation.');
+                } elsif ($slot_status == $resource->WAITING_FOR_GRADE) {
+                    $msg=&mt('Submitted and currently in grading queue.');
+                } elsif ($slot_status == $resource->CORRECT) {
+                    $msg=&mt('Problem is unavailable.');
+                } elsif ($slot_status == $resource->RESERVED) {
+                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                         '&nbsp;'.$slotdescription.'</span><br />'.
+                         &mt('Problem is currently available.');
+                } elsif ($slot_status == $resource->RESERVED_LOCATION) {
+                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                         '&nbsp;'.$slotdescription.'</span><br />'.
+                         &mt('Problem is available at a different location.');
+                    $get_choices = 1;
+                } elsif ($slot_status == $resource->RESERVED_LATER) {
+                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                         '&nbsp;'.$slotdescription.'</span><br />'.
+                         &mt('Problem will be available later.');
+                    $get_choices = 1;
+                } elsif ($slot_status == $resource->RESERVABLE) {
+                    $msg=&mt('Reservation needed');
+                    $get_choices = 1;
+                } elsif ($slot_status == $resource->RESERVABLE_LATER) {
+                    $msg=&mt('Reservation needed: will be reservable later.');
+                } elsif ($slot_status == $resource->NOTRESERVABLE) {
+                    $msg=&mt('Reservation needed: none available.');
+                } elsif ($slot_status == $resource->UNKNOWN) {
+                    $msg=&mt('Unable to determine status due to network problems.');
+                } else {
+                    if ($status != $resource->OPEN) {
+                        $msg = &Apache::lonnavmaps::getDescription($resource,'0'); 
+                    }
+                }
+                $reservable ++;
+                my $treelevel = $depth;
+                my $higherup = $lastcontainer;
+                if ($depth > 1) {
+                    my @maprows;
+                    while ($treelevel > 1) {
+                        if (ref($container{$higherup})) {
+                            my $res = $container{$higherup};
+                            last if (defined($shownparent{$higherup}));
+                            my $maptitle = $res->compTitle();
+                            my $type = 'sequence';
+                            if ($res->is_page()) {
+                                $type = 'page';
+                            }
+                            &show_map_row($treelevel,$location,$type,$maptitle,
+                                          \@maprows);
+                            $shownparent{$higherup} = 1;
+                        }
+                        $treelevel --;
+                        $higherup = $parent{$treelevel};
+                    }
+                    foreach my $item (@maprows) {
+                        $rownum ++;
+                        my $bgcolor = $backgrounds[$rownum % $numcolors];
+                        if (!$shownheader) {
+                            $r->print($slotheader);
+                            $shownheader = 1;
+                        }
+                        $r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n");
+                    }
+                }
+                $rownum ++;
+                my $bgcolor = $backgrounds[$rownum % $numcolors];
+                if (!$shownheader) {
+                    $r->print($slotheader);
+                    $shownheader = 1;
+                }
+                $r->print('<tr class="'.$bgcolor.'"><td>'."\n");
+                for (my $i=0; $i<$depth; $i++) {
+                    $r->print('<img src="'.$location.'" alt="" />');
+                }
+                my $result = '<a href="'.$resource->src().'?symb='.$symb.'">'.
+                             '<img class="LC_contentImage" src="/adm/lonIcons/';
+                if ($resource->is_task()) {
+                    $result .= 'task.gif" alt="'.&mt('Task');
+                } else {
+                    $result .= 'problem.gif" alt="'.&mt('Problem');
+                }
+                $result .= '" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>';
+                my $hasaction;
+                if ($status == $resource->OPEN) {
+                    if ($get_choices) {
+                        $hasaction = 1;
+                    }
+                }
+                if ($hasaction) {
+                    $result .= '<td valgn="middle">'.$msg.'</td>'.
+                               '<td valign="middle">'.('&nbsp;' x6);
+                } else {
+                    $result .= '<td colspan="2" valign="middle">'.$msg.'</td>';
+                }
+                $r->print($result);
+                if ($hasaction) {
+                    my $formname = 'manageres_'.$reservable;
+                    &show_choices($r,$symb,$formname);
+                    $r->print('</td>');
+                }
+                $r->print('</tr>');
+            }
+        }
+    }
+    if ($shownheader) {
+        $r->print('</table>');
+    }
+    if (!$reservable) {
+        $r->print('<span class="LC_info">');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('No community items currently require a reservation to gain access.'));
+        } else {
+            $r->print(&mt('No course items currently require a reservation to gain access.'));
+        }
+        $r->print('</span>');
+    }
+    $r->print('<p><a href="/adm/slotrequest?command=showresv">'.
+              &mt('Reservation History').'</a></p>');
+}
+
+sub show_map_row {
+    my ($depth,$location,$type,$title,$maprows) = @_;
+    my $output = '<td>';
+    for (my $i=0; $i<$depth-1; $i++) {
+        $output .= '<img src="'.$location.'" alt="" />';
+    }
+    if ($type eq 'page') {
+        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
+    } else {
+        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
+    }
+    $output .= $title.'</td><td colspan="2">&nbsp;</td>'."\n";
+    unshift (@{$maprows},$output);
+    return;
+}
+
+sub show_reservations {
+    my ($r,$uname,$udom) = @_;
+    if (!defined($uname)) {
+        $uname = $env{'user.name'};
+    }
+    if (!defined($udom)) {
+        $udom = $env{'user.domain'};
+    }
+    my $formname = 'slotlog';
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = &Apache::loncommon::course_type();
+    my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname);
+    if ($env{'form.origin'} eq 'aboutme') {
+        $r->print('<div class="LC_fontsize_large">');
+        my $name = &Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'},
+                                                    'firstname');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('History of member-reservable slots for: [_1]',
+                          $name));
+        } else {
+            $r->print(&mt('History of student-reservable slots for: [_1]',
+                          $name));
+
+        }
+        $r->print('</div>');
+    }
+    $r->print('<form action="/adm/slotrequest" method="post" name="'.$formname.'">');
+    # set defaults
+    my $now = time();
+    my $defstart = $now - (7*24*3600); #7 days ago
+    my %defaults = (
+                     page           => '1',
+                     show           => '10',
+                     action         => 'any',
+                     log_start_date => $defstart,
+                     log_end_date   => $now,
+                   );
+    my $more_records = 0;
+
+    # set current
+    my %curr;
+    foreach my $item ('show','page','action') {
+        $curr{$item} = $env{'form.'.$item};
+    }
+    my ($startdate,$enddate) =
+        &Apache::lonuserutils::get_dates_from_form('log_start_date',
+                                                   'log_end_date');
+    $curr{'log_start_date'} = $startdate;
+    $curr{'log_end_date'} = $enddate;
+    foreach my $key (keys(%defaults)) {
+        if ($curr{$key} eq '') {
+            $curr{$key} = $defaults{$key};
+        }
+    }
+    my ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
+    $r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version));
+    my $showntablehdr = 0;
+    my $tablehdr = &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>&nbsp;</th><th>'.&mt('When').'</th><th>'.&mt('Action').'</th>'.
+                   '<th>'.&mt('Description').'</th><th>'.&mt('Start time').'</th>'.
+                   '<th>'.&mt('End time').'</th><th>'.&mt('Resource').'</th>'.
+                   &Apache::loncommon::end_data_table_header_row();
+    my ($minshown,$maxshown);
+    $minshown = 1;
+    my $count = 0;
+    if ($curr{'show'} ne &mt('all')) {
+        $maxshown = $curr{'page'} * $curr{'show'};
+        if ($curr{'page'} > 1) {
+            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+        }
+    }
+    my (%titles,%maptitles);
+    my %lt = &reservationlog_contexts($crstype);
+    foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) {
+        next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) ||
+                 ($log{$id}{'exe_time'} > $curr{'log_end_date'}));
+        if ($curr{'show'} ne &mt('all')) {
+            if ($count >= $curr{'page'} * $curr{'show'}) {
+                $more_records = 1;
+                last;
+            }
+        }
+        if ($curr{'action'} ne 'any') {
+            next if ($log{$id}{'logentry'}{'action'} ne $curr{'action'});
+        }
+        $count ++;
+        next if ($count < $minshown);
+        if (!$showntablehdr) {
+            $r->print($tablehdr);
+            $showntablehdr = 1;
+        }
+        my $symb = $log{$id}{'logentry'}{'symb'};
+        my $slot_name = $log{$id}{'logentry'}{'slot'};
+        my %slot=&Apache::lonnet::get_slot($slot_name);
+        my $description = $slot{'description'};
+        my $start = ($slot{'starttime'}?
+                     &Apache::lonlocal::locallocaltime($slot{'starttime'}):'');
+        my $end = ($slot{'endtime'}?
+                   &Apache::lonlocal::locallocaltime($slot{'endtime'}):'');
+        my $title = &get_resource_title($symb,\%titles,\%maptitles);
+        my $chgaction = $log{$id}{'logentry'}{'action'};
+        if ($chgaction ne '' && $lt{$chgaction} ne '') {
+            $chgaction = $lt{$chgaction};
+        }
+        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($log{$id}{'exe_time'}).'</td><td>'.$chgaction.'</td><td>'.$description.'</td><td>'.$start.'</td><td>'.$end.'</td><td>'.$title.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
+    }
+    if ($showntablehdr) {
+        $r->print(&Apache::loncommon::end_data_table().'<br />');
+        if (($curr{'page'} > 1) || ($more_records)) {
+            $r->print('<table><tr>');
+            if ($curr{'page'} > 1) {
+                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            if ($more_records) {
+                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            $r->print('</tr></table>');
+            $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+function chgPage(caller) {
+    if (caller == 'previous') {
+        document.$formname.page.value --;
+    }
+    if (caller == 'next') {
+        document.$formname.page.value ++;
+    }
+    document.$formname.submit();
+    return;
+}
+</script>
+ENDSCRIPT
+        }
+    } else {
+        $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");
+    if ($env{'form.origin'} eq 'aboutme') {
+        $r->print('<input type="hidden" name="origin" value="'.$env{'form.origin'}.'" />'."\n".
+                  '<input type="hidden" name="uname" value="'.$env{'form.uname'}.'" />'."\n".
+                  '<input type="hidden" name="udom" value="'.$env{'form.udom'}.'" />'."\n");
+    }
+    $r->print('</form>');
+    return;
+}
+
+sub show_reservations_log {
+    my ($r) = @_;
+    my $badslot;
+    my $crstype = &Apache::loncommon::course_type();
+    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">');
+            if ($crstype eq 'Community') {
+                $r->print(&mt('Reservation history unavailable for non-member-reservable slot: [_1].',$description));
+            } else {
+                $r->print(&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description));
+            }
+            $r->print('</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'};
+    my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum);
+    if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); }
+
+    my (%log,@allsymbs);
+    if (keys(%slotlog)) {
+        foreach my $key (keys(%slotlog)) {
+            if (ref($slotlog{$key}) eq 'HASH') {
+                if (ref($slotlog{$key}{'logentry'}) eq 'HASH') {
+                    if ($slotlog{$key}{'logentry'}{'slot'} eq $env{'form.slotname'}) {
+                        $log{$key} = $slotlog{$key};
+                        if ($slotlog{$key}{'logentry'}{'symb'} ne '') {
+                            push(@allsymbs,$slotlog{$key}{'logentry'}{'symb'});
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    $r->print('<form action="/adm/slotrequest" method="post" name="'.$formname.'">');
+    my %saveable_parameters = ('show' => 'scalar',);
+    &Apache::loncommon::store_course_settings('reservationslog',
+                                              \%saveable_parameters);
+    &Apache::loncommon::restore_course_settings('reservationslog',
+                                                \%saveable_parameters);
+    # set defaults
+    my $now = time();
+    my $defstart = $now - (7*24*3600); #7 days ago
+    my %defaults = (
+                     page           => '1',
+                     show           => '10',
+                     chgcontext     => 'any',
+                     action         => 'any',
+                     symb           => 'any',
+                     log_start_date => $defstart,
+                     log_end_date   => $now,
+                   );
+    my $more_records = 0;
+
+    # set current
+    my %curr;
+    foreach my $item ('show','page','chgcontext','action','symb') {
+        $curr{$item} = $env{'form.'.$item};
+    }
+    my ($startdate,$enddate) =
+        &Apache::lonuserutils::get_dates_from_form('log_start_date',
+                                                   'log_end_date');
+    $curr{'log_start_date'} = $startdate;
+    $curr{'log_end_date'} = $enddate;
+    foreach my $key (keys(%defaults)) {
+        if ($curr{$key} eq '') {
+            $curr{$key} = $defaults{$key};
+        }
+    }
+    my (%whodunit,%changed,$version);
+    ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
+
+    my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+    my $description = $slot{'description'};
+    $r->print('<span class="LC_fontsize_large">');
+    if ($crstype eq 'Community') {
+        $r->print(&mt('Reservation changes for member-reservable slot: [_1]',$description));
+    } else {
+        $r->print(&mt('Reservation changes for student-reservable slot: [_1]',$description));
+    }
+    $r->print('</span><br />');
+    $r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));
+    my $showntablehdr = 0;
+    my $tablehdr = &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>&nbsp;</th><th>'.&mt('When').'</th><th>'.&mt('Who made the change').
+                   '</th><th>'.&mt('Affected User').'</th><th>'.&mt('Action').'</th>'.
+                   '<th>'.&mt('Resource').'</th><th>'.&mt('Context').'</th>'.
+                   &Apache::loncommon::end_data_table_header_row();
+    my ($minshown,$maxshown);
+    $minshown = 1;
+    my $count = 0;
+    if ($curr{'show'} ne &mt('all')) {
+        $maxshown = $curr{'page'} * $curr{'show'};
+        if ($curr{'page'} > 1) {
+            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+        }
+    }
+    my %lt = &reservationlog_contexts($crstype);
+    my (%titles,%maptitles);
+    foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) {
+        next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) ||
+                 ($log{$id}{'exe_time'} > $curr{'log_end_date'}));
+        if ($curr{'show'} ne &mt('all')) {
+            if ($count >= $curr{'page'} * $curr{'show'}) {
+                $more_records = 1;
+                last;
+            }
+        }
+        if ($curr{'chgcontext'} ne 'any') {
+            if ($curr{'chgcontext'} eq 'user') {
+                next if (($log{$id}{'logentry'}{'context'} ne 'user') && 
+                         ($log{$id}{'logentry'}{'context'} ne 'usermanage'));
+            } else {
+                next if ($log{$id}{'logentry'}{'context'} ne $curr{'chgcontext'});
+            }
+        }
+        if ($curr{'action'} ne 'any') {
+            next if ($log{$id}{'logentry'}{'action'} ne $curr{'action'});
+        }
+        if ($curr{'symb'} ne 'any') {
+            next if ($log{$id}{'logentry'}{'symb'} ne $curr{'symb'});
+        }
+        $count ++;
+        next if ($count < $minshown);
+        if (!$showntablehdr) {
+            $r->print($tablehdr);
+            $showntablehdr = 1;
+        }
+        if ($whodunit{$log{$id}{'exe_uname'}.':'.$log{$id}{'exe_udom'}} eq '') {
+            $whodunit{$log{$id}{'exe_uname'}.':'.$log{$id}{'exe_udom'}} =
+                &Apache::loncommon::plainname($log{$id}{'exe_uname'},$log{$id}{'exe_udom'});
+        }
+        if ($changed{$log{$id}{'uname'}.':'.$log{$id}{'udom'}} eq '') {
+            $changed{$log{$id}{'uname'}.':'.$log{$id}{'udom'}} =
+                &Apache::loncommon::plainname($log{$id}{'uname'},$log{$id}{'udom'});
+        }
+        my $symb = $log{$id}{'logentry'}{'symb'};
+        my $title = &get_resource_title($symb,\%titles,\%maptitles); 
+        my $chgcontext = $log{$id}{'logentry'}{'context'};
+        if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
+            $chgcontext = $lt{$chgcontext};
+        }
+        my $chgaction = $log{$id}{'logentry'}{'action'};
+        if ($chgaction ne '' && $lt{$chgaction} ne '') {
+            $chgaction = $lt{$chgaction}; 
+        }
+        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($log{$id}{'exe_time'}).'</td><td>'.$whodunit{$log{$id}{'exe_uname'}.':'.$log{$id}{'exe_udom'}}.'</td><td>'.$changed{$log{$id}{'uname'}.':'.$log{$id}{'udom'}}.'</td><td>'.$chgaction.'</td><td>'.$title.'</td><td>'.$chgcontext.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
+    }
+    if ($showntablehdr) {
+        $r->print(&Apache::loncommon::end_data_table().'<br />');
+        if (($curr{'page'} > 1) || ($more_records)) {
+            $r->print('<table><tr>');
+            if ($curr{'page'} > 1) {
+                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            if ($more_records) {
+                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            $r->print('</tr></table>');
+            $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+function chgPage(caller) {
+    if (caller == 'previous') {
+        document.$formname.page.value --;
+    }
+    if (caller == 'next') {
+        document.$formname.page.value ++;
+    }
+    document.$formname.submit();
+    return;
+}
+</script>
+ENDSCRIPT
+        }
+    } else {
+        $r->print(&mt('There are no records to display.'));
+    }
+    $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>'.
+              '<p><a href="/adm/slotrequest?command=showslots">'.
+              &mt('Return to slot list').'</a></p>');
+    return;
+}
+
+sub get_resource_title {
+    my ($symb,$titles,$maptitles) = @_;
+    my $title;
+    if ((ref($titles) eq 'HASH') && (ref($maptitles) eq 'HASH')) { 
+        if (defined($titles->{$symb})) {
+            $title = $titles->{$symb};
+        } else {
+            $title = &Apache::lonnet::gettitle($symb);
+            my $maptitle;
+            my ($mapurl) = &Apache::lonnet::decode_symb($symb);
+            if (defined($maptitles->{$mapurl})) {
+                $maptitle = $maptitles->{$mapurl};
+            } else {
+                if ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) {
+                    $maptitle=&mt('Main Course Documents');
+                } else {
+                    $maptitle=&Apache::lonnet::gettitle($mapurl);
+                }
+                $maptitles->{$mapurl} = $maptitle;
+            }
+            if ($maptitle ne '') {
+                $title .= ' '.&mt('(in [_1])',$maptitle);
+            }
+            $titles->{$symb} = $title;
+        }
+    } else {
+        $title = $symb;
+    }
+    return $title;
+}
+
+sub reservationlog_contexts {
+    my ($crstype) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                                             any        => 'Any',
+                                             user       => 'By student',
+                                             manage     => 'Via Slot Manager',
+                                             parameter  => 'Via Parameter Manager',
+                                             reserve    => 'Made reservation',
+                                             release    => 'Dropped reservation',
+                                             usermanage => 'By student', 
+                                         );
+    if ($crstype eq 'Community') {
+        $lt{'user'} = &mt('By member');
+        $lt{'usermanage'} = $lt{'user'};
+    }
+    return %lt;
+}
+
+sub display_filter {
+    my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_;
+    my $nolink = 1;
+    my (%titles,%maptitles);
+    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)).
+                 '</td><td>&nbsp;&nbsp;</td>';
+    my $startform =
+        &Apache::lonhtmlcommon::date_setter($formname,'log_start_date',
+                                            $curr->{'log_start_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my $endform =
+        &Apache::lonhtmlcommon::date_setter($formname,'log_end_date',
+                                            $curr->{'log_end_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my $crstype = &Apache::loncommon::course_type();
+    my %lt = &reservationlog_contexts($crstype);
+    $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').
+               '</b><br /><table><tr><td>'.&mt('After:').
+               '</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.
+               $endform.'</td></tr></table></td><td>&nbsp;&nbsp;</td>';
+    if (ref($allsymbs) eq 'ARRAY') {
+        $output .= '<td valign="top"><b>'.&mt('Resource').'</b><br />'.
+                   '<select name="resource"><option value="any"';
+        if ($curr->{'resource'} eq 'any') {
+            $output .= ' selected="selected"';
+        }
+        $output .=  '>'.&mt('Any').'</option>'."\n";
+        foreach my $symb (@{$allsymbs}) {
+            my $title = &get_resource_title($symb,\%titles,\%maptitles);
+            my $selstr = '';
+            if ($curr->{'resource'} eq $symb) {
+                $selstr = ' selected="selected"';
+            }
+            $output .= '  <option value="'.$symb.'"'.$selstr.'>'.$title.'</option>';
+        }
+        $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="top"><b>'.
+                   &mt('Context:').'</b><br /><select name="chgcontext">';
+        foreach my $chgtype ('any','user','manage','parameter') {
+            my $selstr = '';
+            if ($curr->{'chgcontext'} eq $chgtype) {
+                $output .= $selstr = ' selected="selected"';
+            }
+            $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
+        }
+        $output .= '</select></td>';
+    } else {
+        $output .= '<td valign="top"><b>'.&mt('Action').'</b><br />'.
+                   '<select name="action"><option value="any"';
+        if ($curr->{'action'} eq 'any') {
+            $output .= ' selected="selected"';
+        }
+        $output .=  '>'.&mt('Any').'</option>'."\n";
+        foreach my $actiontype ('reserve','release') {
+            my $selstr = '';
+            if ($curr->{'action'} eq $actiontype) {
+                $output .= $selstr = ' selected="selected"';
+            }
+            $output .= '<option value="'.$actiontype.'"'.$selstr.'>'.$lt{$actiontype}.'</option>'."\n";
+        }
+        $output .= '</select></td>';
+    }
+    $output .= '<td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
+               &mt('Update Display').'" /></tr></table>'.
+               '<p class="LC_info">'.
+               &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+                  ,'2.9.0');
+    if ($version) {
+        $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+    }
+    $output .= '</p><hr /><br />';
+    return $output;
+}
+
+sub slot_change_messaging {
+    my ($setting,$subject,$msg,$action) = @_;
+    my $user = $env{'user.name'};
+    my $domain = $env{'user.domain'};
+    my ($message_status,$comment_status);
+    if ($setting eq 'only_student'
+        || $setting eq 'student_and_user_notes_screen') {
+        $message_status =
+            &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);
+        $message_status = '<li>'.&mt('Sent to you: [_1]',
+                                    $message_status).' </li>';
+    }
+    if ($setting eq 'student_and_user_notes_screen') {
+        $comment_status =
+            &Apache::lonmsg::store_instructor_comment($subject.'<br />'.
+                                                      $msg,$user,$domain);
+        $comment_status = '<li>'.&mt('Entry added to course record (viewable by instructor): [_1]',
+                                    $comment_status).'</li>';
+    }
+    if ($message_status || $comment_status) {
+        my $msgtitle;
+        if ($action eq 'reserve') {
+            $msgtitle = &mt('Status of messages about saved reservation');
+        } elsif ($action eq 'release') {
+            $msgtitle = &mt('Status of messages about dropped reservation');
+        } elsif ($action eq 'nochange') {
+            $msgtitle = &mt('Status of messages about unchanged existing reservation');
+        }
+        return '<span class="LC_info">'.$msgtitle.'</span>'
+               .'<ul>'
+               .$message_status
+               .$comment_status
+               .'</ul><hr />';
+    }
 }
 
 sub upload_start {
     my ($r)=@_;    
-    $r->print(&Apache::grades::checkforfile_js());
-    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";
-    $result.='<tr bgcolor="#ffffe6"><td>'."\n";
-    my $upfile_select=&Apache::loncommon::upfile_select_html();
-    my $ignore=&mt('Ignore First Line');
-    $result.=<<ENDUPFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<input type="hidden" name="command" value="csvuploadmap" />
-$upfile_select
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Data" />
-<label><input type="checkbox" name="noFirstLine" />$ignore</label>
-</form>
-ENDUPFORM
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $r->print($result);
+    $r->print(
+        &Apache::grades::checkforfile_js()
+       .'<h3>'.&mt('Specify a file containing the slot definitions.').'</h3>'
+       .'<form method="post" enctype="multipart/form-data"'
+       .' action="/adm/slotrequest" name="slotupload">'
+       .'<input type="hidden" name="command" value="csvuploadmap" />'
+       .&Apache::lonhtmlcommon::start_pick_box()
+       .&Apache::lonhtmlcommon::row_title(&mt('File'))
+       .&Apache::loncommon::upfile_select_html()
+       .&Apache::lonhtmlcommon::row_closure()
+       .&Apache::lonhtmlcommon::row_title(
+            '<label for="noFirstLine">'
+           .&mt('Ignore First Line')
+           .'</label>')
+       .'<input type="checkbox" name="noFirstLine" id="noFirstLine" />'
+       .&Apache::lonhtmlcommon::row_closure(1)
+       .&Apache::lonhtmlcommon::end_pick_box()
+       .'<p>'
+       .'<input type="button" onclick="javascript:checkUpload(this.form);"'
+       .' value="'.&mt('Next').'" />'
+       .'</p>'
+      .'</form>'
+    );
 }
 
 sub csvuploadmap_header {
@@ -1385,8 +2241,8 @@ sub csvuploadmap_header {
 Total number of records found in file: $distotal <hr />
 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>
+<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>
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
 <input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
@@ -1410,7 +2266,7 @@ sub csvuploadmap_footer {
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onClick="javascript:verify(this.form)" value="$buttontext" /><br />
+<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br />
 </form>
 ENDPICK
 }
@@ -1509,6 +2365,8 @@ sub csvupload_fields {
 	    ['starttime','Start Time of slot'],
 	    ['endtime','End Time of slot'],
 	    ['startreserve','Reservation Start Time'],
+            ['endreserve','Reservation End Time'],
+            ['reservationmsg','Message when reservation changed'],
 	    ['ip','IP or DNS restriction'],
 	    ['proctor','List of proctor ids'],
 	    ['description','Slot Description'],
@@ -1590,6 +2448,30 @@ sub csv_upload_assign {
 	    next;
 	}
 
+        if ($entries{$fields{'endreserve'}}) {
+            $slot{'endreserve'}=
+                &UnixDate($entries{$fields{'endreserve'}},"%s");
+        }
+        if (defined($slot{'endreserve'})
+            && $slot{'endreserve'} > $slot{'starttime'}) {
+            push(@errors,"$name not created -- Slot's reservation end time is after the slot's start time.");
+            next;
+        }
+
+        if ($slot{'type'} eq 'schedulable_student') {
+            if ($entries{$fields{'reservationmsg'}}) {
+                 if (($entries{$fields{'reservationmsg'}} eq 'only_student') ||
+                     ($entries{$fields{'reservationmsg'}} eq 'student_and_user_notes_screen')) {
+                      $slot{'reservationmsg'}=$entries{$fields{'reservationmsg'}};
+                 } else {
+                      unless (($entries{$fields{'reservationmsg'}} eq 'none') ||
+                              ($entries{$fields{'reservationmsg'}} eq '')) {
+                          push(@errors,"$name -- Slot's reservationmsg setting ignored - not one of: 'only_student', 'student_and_user_notes_screen', 'none' or ''");
+                      }
+                 }
+            }
+        }
+
 	foreach my $key ('ip','proctor','description','maxspace',
 			 'secret','symb') {
 	    if ($entries{$fields{$key}}) {
@@ -1614,6 +2496,9 @@ sub csv_upload_assign {
 	$r->rflush();
 	$countdone++;
     }
+    if ($countdone) {
+        &Apache::lonnet::devalidate_slots_cache($cname,$cdom); 
+    }
     $r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>');
     foreach my $error (@errors) {
 	$r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n");
@@ -1622,6 +2507,32 @@ sub csv_upload_assign {
     return '';
 }
 
+sub slot_command_titles {
+    my %titles = (
+                 slotlog            => 'Reservation Logs',
+                 showslots          => 'Manage Slots',
+                 showresv           => 'Reservation History',
+                 manageresv         => 'Manage Reservations',
+                 uploadstart        => 'Upload Slots File',
+                 csvuploadmap       => 'Upload Slots File',
+                 csvuploadassign    => 'Upload Slots File',
+                 delete             => 'Slot Deletion',
+                 release            => 'Reservation Result',
+                 remove_reservation => 'Remove Registration',
+                 get_reservation    => 'Request Reservation',
+              );
+    return %titles;
+}
+
+sub slot_reservationmsg_options {
+    my %options = &Apache::lonlocal::texthash (
+                        only_student  => 'Sent to student',
+        student_and_user_notes_screen => 'Sent to student and added to user notes',
+                                 none => 'None sent and no record in user notes',
+    );
+    return %options;
+}
+
 sub handler {
     my $r=shift;
 
@@ -1633,16 +2544,66 @@ sub handler {
     }
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-    
+
+    my %crumb_titles = &slot_command_titles();
+    my $brcrum;
+
     my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    if ($env{'form.command'} eq 'showslots') {
+        if (($vgr ne 'F') && ($mgr ne 'F')) {
+            $env{'form.command'} = 'manageresv'; 
+        }
+    } elsif ($env{'form.command'} eq 'manageresv') {
+        if (($vgr eq 'F') || ($mgr eq 'F')) {
+            $env{'form.command'} = 'showslots';
+        }
+    }
     my $title='Requesting Another Worktime';
-    if ($env{'form.command'} =~ /^(showslots|uploadstart|csvuploadmap|csvuploadassign)$/ && $vgr eq 'F') {
-	$title = 'Managing Slots';
+    if ($env{'form.command'} eq 'showresv') {
+        $title = 'Reservation History';
+        if ($env{'form.origin'} eq 'aboutme') {
+            $brcrum =[{href=>"/adm/$env{'form.udom'}/$env{'form.uname'}/aboutme",text=>'Personal Information Page'}];
+        } else {
+            $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>'Manage Reservations'}];
+        }
+        if (ref($brcrum) eq 'ARRAY') {
+            push(@{$brcrum},{href=>"/adm/slotrequest?command=showresv",text=>$title});
+        }
+    } elsif ($env{'form.command'} eq 'manageresv') {
+        $title = 'Manage Reservations';
+        $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
+    } elsif ($vgr eq 'F') {
+        if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) {
+            $brcrum =[{href=>"/adm/slotrequest?command=showslots",
+                       text=>$crumb_titles{'showslots'}}];
+	    $title = 'Managing Slots';
+            unless ($env{'form.command'} eq 'showslots') {
+                if (ref($brcrum) eq 'ARRAY') {
+                    push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
+                }
+            }
+        }
+    } elsif ($env{'form.command'} eq 'release') {
+        if ($env{'form.context'} eq 'usermanage') {
+            $brcrum =[{href=>"/adm/slotrequest?command=manageresv",
+                       text=>$crumb_titles{'showslots'}}];
+            $title = 'Manage Reservations';
+            if (ref($brcrum) eq 'ARRAY') {
+                push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
+            }
+        }
+    } else {
+        $brcrum =[];
     }
-    &start_page($r,$title);
+    &start_page($r,$title,$brcrum);
 
-    if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
+    if ($env{'form.command'} eq 'manageresv') {
+        my $crstype = &Apache::loncommon::course_type();
+        &manage_reservations($r,$crstype);
+    } elsif ($env{'form.command'} eq 'showresv') {
+        &show_reservations($r,$env{'form.uname'},$env{'form.udom'});
+    } elsif ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
 	&show_table($r,$mgr);
     } elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') {
 	&remove_registration($r);
@@ -1669,6 +2630,8 @@ sub handler {
 	    }
 	    &csv_upload_map($r);
 	}
+    } elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') {
+        &show_reservations_log($r);
     } else {
 	my $symb=&unescape($env{'form.symb'});
 	if (!defined($symb)) {
@@ -1700,7 +2663,26 @@ sub handler {
 	} elsif ($env{'form.command'} eq 'get') {
 	    &get_slot($r,$symb);
 	} elsif ($env{'form.command'} eq 'change') {
-	    if (&get_slot($r,$symb,$env{'form.releaseslot'},1)) {
+            if ($env{'form.nochange'}) {
+                my $slot_name = $env{'form.releaseslot'};
+                my @slots = &check_for_reservation($symb,'allslots');
+                my $msg;
+                if (($slot_name ne '') && (grep(/^\Q$slot_name\E/,@slots))) { 
+                     my %slot=&Apache::lonnet::get_slot($env{'form.releaseslot'});
+                     my $description=&get_description($slot_name,\%slot);
+                     $msg = '<span style="font-weight: bold;">'.
+                            &mt('Unchanged reservation: [_1]',$description).'</span><br /><br />';
+                     my $person = 
+                         &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+                     my $subject = &mt('Reservation unchanged: [_1]',$description);
+                     my $msgbody = &mt('No change to existing registration by [_1] for [_2].',$person,$description);
+                     $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'nochange');
+                } else {
+                    $msg = '<span class="LC_warning">'.&mt('Reservation no longer reported as available.').'</span>';
+                }
+                $r->print($msg);
+                &return_link($r);
+	    } elsif (&get_slot($r,$symb,$env{'form.releaseslot'},1)) {
 		&release_slot($r,$symb,$env{'form.releaseslot'});
 	    }
 	} else {