--- loncom/interface/slotrequest.pm	2006/03/15 19:41:26	1.52
+++ loncom/interface/slotrequest.pm	2009/08/05 13:40:10	1.100
@@ -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.52 2006/03/15 19:41:26 albertel Exp $
+# $Id: slotrequest.pm,v 1.100 2009/08/05 13:40:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,12 +36,15 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::lonnavmaps();
 use Date::Manip;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub fail {
     my ($r,$code)=@_;
     if ($code eq 'not_valid') {
 	$r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>');
-
+    } elsif ($code eq 'not_available') {
+	$r->print('<p>'.&mt('No slots are available.').'</p>');
     } elsif ($code eq 'not_allowed') {
 	$r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>');
     } else {
@@ -53,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 {
@@ -74,7 +81,7 @@ sub end_page {
 =cut
 
 sub get_course {
-    (undef,my $courseid)=&Apache::lonxml::whichuser();
+    (undef,my $courseid)=&Apache::lonnet::whichuser();
     my $cdom=$env{'course.'.$courseid.'.domain'};
     my $cnum=$env{'course.'.$courseid.'.num'};
     return ($cnum,$cdom);
@@ -87,7 +94,7 @@ sub get_reservation_ids {
 
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
-    if (&network_error(%consumed)) { 
+    if (&Apache::lonnet::error(%consumed)) { 
 	return 'error: Unable to determine current status';
     }
     my ($tmp)=%consumed;
@@ -124,19 +131,14 @@ sub check_for_reservation {
     my ($cnum,$cdom)=&get_course();
     my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
 
-    if (&network_error($student) || &network_error($course)  ||
-	&network_error(%slots)) {
+    if (&Apache::lonnet::error($student) 
+	|| &Apache::lonnet::error($course)
+	|| &Apache::lonnet::error(%slots)) {
 	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);
+    foreach my $slot_name (@sorted_slots) {
 	next if (!defined($slots{$slot_name}) ||
 		 !ref($slots{$slot_name}));
 	&Apache::lonxml::debug(time." $slot_name ".
@@ -161,6 +163,9 @@ sub check_for_reservation {
 sub get_consumed_uniqueperiods {
     my ($slots) = @_;
     my $navmap=Apache::lonnavmaps::navmap->new;
+    if (!defined($navmap)) {
+        return 'error: Unable to determine current status';
+    }
     my @problems = $navmap->retrieveResources(undef,
 					      sub { $_[0]->is_problem() },1,0);
     my %used_slots;
@@ -172,7 +177,8 @@ sub get_consumed_uniqueperiods {
 	my $course =  &Apache::lonnet::EXT("resource.0.available",
 					   $symb, $env{'user.domain'},
 					   $env{'user.name'});
-	if (&network_error($student) || &network_error($course)) {
+	if (&Apache::lonnet::error($student) 
+	    || &Apache::lonnet::error($course)) {
 	    return 'error: Unable to determine current status';
 	}
 	foreach my $slot (split(/:/,$student), split(/:/, $course)) {
@@ -183,7 +189,7 @@ sub get_consumed_uniqueperiods {
     if (!ref($slots)) {
 	my ($cnum,$cdom)=&get_course();
 	my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum);
-	if (&network_error(%slots)) {
+	if (&Apache::lonnet::error(%slots)) {
 	    return 'error: Unable to determine current status';
 	}
 	$slots = \%slots;
@@ -209,9 +215,13 @@ sub check_for_conflict {
 
     if (!ref($consumed_uniqueperiods)) {
 	$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
-	if (&network_error(%$consumed_uniqueperiods)) {
-	    return 'error: Unable to determine current status';
-	}
+        if (ref($consumed_uniqueperiods) eq 'HASH') {
+	    if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
+	        return 'error: Unable to determine current status';
+	    }
+        } else {
+            return 'error: Unable to determine current status';
+        }
     }
     
     my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
@@ -224,37 +234,40 @@ sub check_for_conflict {
 	}
     }
     return undef;
-
-}
-
-sub network_error {
-    my ($result) = @_;
-    if ($result =~ /^(con_lost|no_such_host|error: [^2])/) {
-	return 1;
-    }
-    return 0;
 }
 
 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'});
     &Apache::lonxml::debug("value is  $value<br />");
-    if (&network_error($value)) { 
+
+    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",$symb,
+					 $env{'user.domain'},$env{'user.name'});
+    &Apache::lonxml::debug("use_slots is  $use_slots<br />");
+
+    if (&Apache::lonnet::error($value) 
+	|| &Apache::lonnet::error($use_slots)) { 
 	return 'error: Unable to determine current status';
     }
 
+    my $parm_symb  = $symb;
+    my $parm_level = 1;
+    if ($use_slots eq 'map' || $use_slots eq 'map_map') {
+	my ($map) = &Apache::lonnet::decode_symb($symb);
+	$parm_symb = &Apache::lonnet::symbread($map);
+	$parm_level = 2;
+    }
+
     foreach my $other_slot (split(/:/, $value)) {
 	if ($other_slot eq $slot_name) {
 	    my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom,
 					       $cnum, "^$slot_name\0");   
-	    if (&network_error($value)) { 
+	    if (&Apache::lonnet::error($value)) { 
 		return 'error: Unable to determine current status';
 	    }
-	    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+	    my $me=$env{'user.name'}.':'.$env{'user.domain'};
 	    foreach my $key (keys(%consumed)) {
 		if ($consumed{$key}->{'name'} eq $me) {
 		    my $num=(split('\0',$key))[1];
@@ -268,7 +281,7 @@ sub make_reservation {
     if (!defined($max)) { $max=99999; }
 
     my (@ids)=&get_reservation_ids($slot_name);
-    if (&network_error(@ids)) { 
+    if (&Apache::lonnet::error(@ids)) { 
 	return 'error: Unable to determine current status';
     }
     my $last=0;
@@ -284,9 +297,9 @@ sub make_reservation {
 	return undef;
     }
     
-    my %reservation=('name'      => $env{'user.name'}.'@'.$env{'user.domain'},
+    my %reservation=('name'      => $env{'user.name'}.':'.$env{'user.domain'},
 		     'timestamp' => time,
-		     'symb'      => $symb);
+		     'symb'      => $parm_symb);
 
     my $success=&Apache::lonnet::newput('slot_reservations',
 					{"$slot_name\0$wanted" =>
@@ -298,12 +311,7 @@ sub make_reservation {
 	if ($value) {
 	    $new_value=$value.':'.$new_value;
 	}
-	my $result=&Apache::lonparmset::storeparm_by_symb($symb,
-						      '0_availablestudent',
-						       1, $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;
     }
 
@@ -311,39 +319,140 @@ 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') {
+	return &remove_registration_user($r);
+    }
+    my $slot_name = $env{'form.slotname'};
+    my %slot=&Apache::lonnet::get_slot($slot_name);
+
+    my ($cnum,$cdom)=&get_course();
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+				       "^$slot_name\0");
+    if (&Apache::lonnet::error(%consumed)) {
+	$r->print("<p><span class=\"LC_error\">".&mt('A network error has occurred.').'</span></p>');
+	return;
+    }
+    if (!%consumed) {
+	$r->print('<p>'.&mt('Slot [_1] has no reservations.',
+			    '<tt>'.$slot_name.'</tt>').'</p>');
+	return;
+    }
+
+    my @names = map { $consumed{$_}{'name'} } (sort(keys(%consumed)));
+    my $names = join(' ',@names);
+
+    my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name);
+    &remove_registration_confirmation($r,$msg,['entry','slotname','context']);
+}
+
+sub remove_registration_user {
+    my ($r) = @_;
+    
+    my $slot_name = $env{'form.slotname'};
+
     my $name = &Apache::loncommon::plainname($env{'form.uname'},
 					     $env{'form.udom'});
 
     my $title = &Apache::lonnet::gettitle($env{'form.symb'});
 
+    my $msg = &mt('Remove [_1] from slot [_2] for [_3]',
+		  $name,$slot_name,$title);
+    
+    &remove_registration_confirmation($r,$msg,['uname','udom','slotname',
+					       'entry','symb','context']);
+}
+
+sub remove_registration_confirmation {
+    my ($r,$msg,$inputs) =@_;
+
     my $hidden_input;
-    foreach my $parm ('uname','udom','slotname','entry','symb') {
+    foreach my $parm (@{$inputs}) {
 	$hidden_input .=
 	    '<input type="hidden" name="'.$parm.'" value="'
 	    .&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";
     }
+    my %lt = &Apache::lonlocal::texthash(
+        'yes' => 'Yes',
+        'no'  => 'No',
+    );
     $r->print(<<"END_CONFIRM");
-<p> Remove $name from slot $env{'form.slotname'} for $title</p>
-<form action="/adm/slotrequest" method="POST">
+<p> $msg </p>
+<form action="/adm/slotrequest" method="post">
     <input type="hidden" name="command" value="release" />
+    <input type="hidden" name="button" value="yes" />
     $hidden_input
-    <input type="submit" name="Yes" value="yes" />
+    <input type="submit" value="$lt{'yes'}" />
 </form>
-<form action="/adm/slotrequest" method="POST">
+<form action="/adm/slotrequest" method="post">
     <input type="hidden" name="command" value="showslots" />
-    <input type="submit" name="No" value="no" />
+    <input type="submit" value="$lt{'no'}" />
 </form>
 END_CONFIRM
 
 }
 
+sub release_all_slot {
+    my ($r,$mgr)=@_;
+    
+    my $slot_name = $env{'form.slotname'};
+
+    my ($cnum,$cdom)=&get_course();
+
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+				       "^$slot_name\0");
+    
+    $r->print('<p>'.&mt('Releasing reservations').'</p>');
+
+    foreach my $entry (sort { $consumed{$a}{'name'} cmp 
+				  $consumed{$b}{'name'} } (keys(%consumed))) {
+	my ($uname,$udom) = split(':',$consumed{$entry}{'name'});
+	my ($result,$msg) =
+	    &release_reservation($slot_name,$uname,$udom,
+				 $consumed{$entry}{'symb'},$mgr);
+        if (!$result) {
+            $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
+        } else {
+	    $r->print("<p>$msg</p>");
+        }
+	$r->rflush();
+    }
+    $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+	      &mt('Return to slot list').'</a></p>');
+    &return_link($r);
+}
+
 sub release_slot {
     my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_;
 
     if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; }
-    my ($cnum,$cdom)=&get_course();
 
     my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'});
     if ($mgr eq 'F' 
@@ -353,21 +462,55 @@ sub release_slot {
 
     if ($mgr eq 'F' 
 	&& defined($env{'form.symb'})) {
-	$symb = $env{'form.symb'};
+	$symb = &unescape($env{'form.symb'});
+    }
+
+    my ($result,$msg) =
+	&release_reservation($slot_name,$uname,$udom,$symb,$mgr);
+    if (!$result) {
+        $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
+    } else {
+        $r->print("<p>$msg</p>");
+    }
+    
+    if ($mgr eq 'F') {
+	$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+		  &mt('Return to slot list').'</a></p>');
     }
+
+    if (!$inhibit_return_link) { &return_link($r);  }
+    return $result;
+}
+
+sub release_reservation {
+    my ($slot_name,$uname,$udom,$symb,$mgr) = @_;
     my %slot=&Apache::lonnet::get_slot($slot_name);
-    my $description=&get_description($env{'form.slotname'},\%slot);
+    my $description=&get_description($slot_name,\%slot);
 
     if ($mgr ne 'F') {
 	if ($slot{'starttime'} < time) {
-	    $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.  </p>");
-	    &return_link($r);
-	    return 0;
+	    return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
 	}
     }
+
+    # if the reservation symb is for a map get a resource in that map
+    # to check slot parameters on
+    my $navmap=Apache::lonnavmaps::navmap->new;
+    if (!defined($navmap)) {
+        return (0,'error: Unable to determine current status');
+    }
+    my $passed_resource = $navmap->getBySymb($symb);
+    if ($passed_resource->is_map()) {
+	my ($a_resource) = 
+	    $navmap->retrieveResources($passed_resource, 
+				       sub {$_[0]->is_problem()},0,1);
+	$symb = $a_resource->symb();
+    }
+
     # get parameter string, check for existance, rebuild string with the slot
-    my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent",
-					       $symb,$udom,$uname));
+    my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
+                                       $symb,$udom,$uname);
+    my @slots = split(/:/,$student);
 
     my @new_slots;
     foreach my $exist_slot (@slots) {
@@ -376,28 +519,52 @@ sub release_slot {
     }
     my $new_param = join(':',@new_slots);
 
+    my ($cnum,$cdom)=&get_course();
+
     # get slot reservations, check if user has one, if so remove reservation
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
     foreach my $entry (keys(%consumed)) {
-	if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) {
+	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);
 	}
     }
 
+    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+					 $symb,$udom,$uname);
+    &Apache::lonxml::debug("use_slots is  $use_slots<br />");
+
+    if (&Apache::lonnet::error($use_slots)) { 
+	return (0,'error: Unable to determine current status');
+    }
+
+    my $parm_level = 1;
+    if ($use_slots eq 'map' || $use_slots eq 'map_map') {
+	$parm_level = 2;
+    }
     # store new parameter string
     my $result=&Apache::lonparmset::storeparm_by_symb($symb,
 						      '0_availablestudent',
-						      1, $new_param, 'string',
-						      $uname,$udom);
-    $r->print("<p>Released Reservation: $description</p>");
+						      $parm_level, $new_param,
+						      'string', $uname, $udom);
+    my $msg;
     if ($mgr eq 'F') {
-	$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
-		  &mt('Return to slot list').'</a></p>');
+	$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
+    } else {
+	$msg = &mt('Released Reservation: [_1]',$description);
     }
-    if (!$inhibit_return_link) { &return_link($r);  }
-    return 1;
+    return (1,$msg);
 }
 
 sub delete_slot {
@@ -417,15 +584,15 @@ sub delete_slot {
 	my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot},
 					$cdom, $cnum);
 	if ($ret eq 'ok') {
-	    $r->print("<p>Slot <tt>$slot_name</tt> marked as deleted.</p>");
+	    $r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>');
 	} else {
-	    $r->print("<p> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</p>");
+	    $r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>");
 	}
     } else {
 	if (%consumed) {
-	    $r->print("<p>Slot <tt>$slot_name</tt> has active reservations.</p>");
+	    $r->print('<p>'.&mt('Slot [_1] has active reservations.','<tt>'.$slot_name.'</tt>').'</p>');
 	} else {
-	    $r->print("<p>Slot <tt>$slot_name</tt> does not exist.</p>");
+	    $r->print('<p>'.&mt('Slot [_1] does not exist.','<tt>'.$slot_name.'</tt>').'</p>');
 	}
     }
     $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
@@ -435,42 +602,50 @@ 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 {
-    my ($r,$symb)=@_;
+    my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_;
 
     my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
     my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
 
     if ($slot_name =~ /^error: (.*)/) {
-	$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
+	$r->print('<p><span class="LC_error">'
+                 .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+                 .'</span></p>');
 	&return_link($r);
-	return;
+	return 0;
     }
-    if ($slot_name) {
+    if ($slot_name && $slot_name ne $conflictable_slot) {
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	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>Already have a reservation: $description1</p>");
+	$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">
+<form method="post" action="/adm/slotrequest">
    <input type="hidden" name="symb" value="$env{'form.symb'}" />
    <input type="hidden" name="slotname" value="$env{'form.slotname'}" />
    <input type="hidden" name="releaseslot" value="$slot_name" />
    <input type="hidden" name="command" value="change" />
 STUFF
-            $r->print("<p>You can either ");
-	    $r->print(<<STUFF);
-   <input type="submit" name="change" value="Change" />
-STUFF
-	    $r->print(' your reservation from <b>'.$description1.'</b> to <b>'.
-		      $description2.
-		      '</b> <br />or </p>');
+            $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(<<STUFF);
 </form>
@@ -478,51 +653,66 @@ STUFF
         } else {
 	    &return_link($r);
 	}
-	return;
+	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;
 	if ($slot_name =~ /^error: (.*)/) {
-	    $r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
+	    $r->print('<p><span class="LC_error">'
+                     .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+                     .'</span></p>');
 	} elsif ($reserved > -1) {
-	    $r->print("<p>Success: $description</p>");
+	    $r->print('<p>'.&mt('Success: [_1]',$description).'</p>');
+	    $retvalue = 1;
 	} elsif ($reserved < 0) {
-	    $r->print("<p>Already reserved: $description</p>");
+	    $r->print('<p>'.&mt('Already reserved: [_1]',$description).'</p>');
 	}
-	&return_link($r);
-	return;
+	if (!$inhibit_return_link) { &return_link($r); }
+	return 1;
     }
 
-    my %lt=('request'=>"Availibility list",
-	    'try'    =>'Try again');
-    %lt=&Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash(
+        'request' => 'Availibility list',
+        'try'     => 'Try again?',
+        'or'      => 'or',
+    );
+
+    my $extra_input;
+    if ($conflictable_slot) {
+	$extra_input='<input type="hidden" name="releaseslot" value="'.$env{'form.slotname'}.'" />';
+    }
 
+    $r->print('<p>'.&mt('[_1]Failed[_2] to reserve a slot for [_3].','<span class="LC_warning">','</span>',$description).'</p>');
     $r->print(<<STUFF);
-<p> <font color="red">Failed</font> to reserve a spot for $description. </p>
 <p>
-<form method="POST" action="/adm/slotrequest">
+<form method="post" action="/adm/slotrequest">
    <input type="submit" name="Try Again" value="$lt{'try'}" />
    <input type="hidden" name="symb" value="$env{'form.symb'}" />
    <input type="hidden" name="slotname" value="$env{'form.slotname'}" />
-   <input type="hidden" name="command" value="get" />
+   <input type="hidden" name="command" value="$env{'form.command'}" />
+   $extra_input
 </form>
-?
 </p>
 <p>
-or
-<form method="POST" action="/adm/slotrequest">
+$lt{'or'}
+<form method="post" action="/adm/slotrequest">
     <input type="hidden" name="symb" value="$env{'form.symb'}" />
     <input type="submit" name="requestattempt" value="$lt{'request'}" />
 </form>
-</p>
-or
 STUFF
 
-    &return_link($r);
-    return;
+    if (!$inhibit_return_link) { 
+        $r->print(&mt('or').'</p>');
+        &return_link($r);
+    } else {
+        $r->print('</p>');
+    }
+    return 0;
 }
 
 sub allowed_slot {
@@ -530,8 +720,7 @@ sub allowed_slot {
 
     #already started
     if ($slot->{'starttime'} < time) {
-	# all open slot to be schedulable
-	#return 0;
+	return 0;
     }
     &Apache::lonxml::debug("$slot_name starttime good");
 
@@ -548,6 +737,12 @@ sub allowed_slot {
     }
     &Apache::lonxml::debug("$slot_name type good");
 
+    # reserve time not yet started
+    if ($slot->{'startreserve'} > time) {
+	return 0;
+    }
+    &Apache::lonxml::debug("$slot_name reserve good");
+
     my $userallowed=0;
     # its for a different set of users
     if (defined($slot->{'allowedsections'})) {
@@ -561,6 +756,16 @@ sub allowed_slot {
 		    split(',',$slot->{'allowedsections'}))) {
 	    $userallowed=1;
 	}
+	if (defined($env{'request.course.groups'})) {
+	    my @groups = split(/:/,$env{'request.course.groups'});
+	    my @allowed_sec = split(',',$slot->{'allowedsections'});
+	    foreach my $group (@groups) {
+		if (grep {$_ eq $group} (@allowed_sec)) {
+		    $userallowed=1;
+		    last;
+		}
+	    }
+	}
     }
     &Apache::lonxml::debug("$slot_name sections is $userallowed");
 
@@ -587,7 +792,9 @@ sub allowed_slot {
 
     my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
 				       $consumed_uniqueperiods);
-    if ($conflict) {
+    if ($conflict =~ /^error: /) {
+        return 0;
+    } elsif ($conflict ne '') {
 	if ($slots->{$conflict}{'starttime'} < time) {
 	    return 0;
 	}
@@ -608,15 +815,33 @@ 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 $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
-    my $available;
-    $r->print('<table border="1">');
+    if (ref($consumed_uniqueperiods) eq 'HASH') {
+        if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
+            $r->print('<span class="LC_error">'.
+                      &mt('An error occurred determining slot availability').
+                      '</span>');
+            return;
+        }
+    } elsif ($consumed_uniqueperiods =~ /^error: /) {
+        $r->print('<span class="LC_error">'.
+                  &mt('An error occurred determining slot availability').
+                  '</span>');
+        return;
+    }
+    my (@available,$output);
     &Apache::lonxml::debug("Checking Slots");
     my @got_slots=&check_for_reservation($symb,'allslots');
+    if ($got_slots[0] =~ /^error: /) {
+        $r->print('<span class="LC_error">'.
+                  &mt('An error occurred determining slot availability').
+                  '</span>');
+        return;
+    }
     foreach my $slot (sort 
 		      { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
 		      (keys(%slots)))  {
@@ -625,59 +850,113 @@ sub show_choices {
 	next if (!&allowed_slot($slot,$slots{$slot},undef,\%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($output);
+        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');
 	    my $command='get';
 	    if (grep(/^\Q$slot\E$/,@got_slots)) {
-		$text=&mt('Free Reservation');
+		$text=&mt('Drop Reservation');
 		$command='release';
 	    } else {
 		my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
 						   \%slots,
 						   $consumed_uniqueperiods);
-		if ($conflict) {
-		    $text=&mt('Change Reservation');
-		    $command='get';
-		}
+                if ($conflict) {
+                    if ($conflict =~ /^error: /) {
+                        $form = '<span class="LC_error">'.
+                                &mt('Slot: [_1] has unknown status.',$description).
+                                '</span>';
+                    } else {
+		        $text=&mt('Change Reservation');
+		        $command='get';
+		    }
+                }
 	    }
-	    my $escsymb=&Apache::lonnet::escape($symb);
-	    $form=<<STUFF;
-   <form method="POST" action="/adm/slotrequest">
+	    my $escsymb=&escape($symb);
+            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>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 {
-    my ($slot,$when,$deleted) = @_;
+    my ($slotname,$slot,$when,$deleted,$name) = @_;
     my $time=time;
     my $week=60*60*24*7;
+
     if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') {
 	return 0;
     }
+
+    if ($name && $name->{'value'} =~ /\w/) {
+	if ($name->{'type'} eq 'substring') {
+	    if ($slotname !~ /\Q$name->{'value'}\E/) {
+		return 0;
+	    }
+	}
+	if ($name->{'type'} eq 'exact') {
+	    if ($slotname eq $name->{'value'}) {
+		return 0;
+	    }
+	}
+    }
+
     if ($when eq 'any') {
 	return 1;
     } elsif ($when eq 'now') {
@@ -722,16 +1001,22 @@ sub to_show {
 sub remove_link {
     my ($slotname,$entry,$uname,$udom,$symb) = @_;
 
-    $slotname  = &Apache::lonnet::escape($slotname);
-    $entry     = &Apache::lonnet::escape($entry);
-    $uname     = &Apache::lonnet::escape($uname);
-    $udom      = &Apache::lonnet::escape($udom);
-    $symb      = &Apache::lonnet::escape($symb);
+    my $remove = &mt('Remove');
 
-    my $remove= &mt('Remove');
+    if ($entry eq 'remove all') {
+	$remove = &mt('Remove All');
+	undef($uname);
+	undef($udom);
+    }
+
+    $slotname  = &escape($slotname);
+    $entry     = &escape($entry);
+    $uname     = &escape($uname);
+    $udom      = &escape($udom);
+    $symb      = &escape($symb);
 
     return <<"END_LINK";
- <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&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
 
@@ -747,21 +1032,33 @@ sub show_table {
     } 
     my $available;
     if ($mgr eq 'F') {
+    # FIXME: This line should be deleted once Slots uses breadcrumbs
+    $r->print(&Apache::loncommon::help_open_topic('Slot About', 'Help on slots'));
+
 	$r->print('<div>');
-	$r->print('<form method="POST" action="/adm/slotrequest">
+	$r->print('<form method="post" action="/adm/slotrequest">
 <input type="hidden" name="command" value="uploadstart" />
 <input type="submit" name="start" value="'.&mt('Upload Slot List').'" />
 </form>');
-	$r->print('<form method="POST" action="/adm/helper/newslot.helper">
+	$r->print(&Apache::loncommon::help_open_topic('Slot CommaDelimited'));
+	$r->print('<form method="post" action="/adm/helper/newslot.helper">
 <input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" />
 </form>');
+	$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface'));
 	$r->print('</div>');
     }
+
+    if (!keys(%slots)) {
+        $r->print('<div>'.&mt('No slots have been created in this course.').'</div>');
+        return;
+    }
     
-    my %Saveable_Parameters = ('show'    => 'array',
-			       'when'    => 'scalar',
-			       'order'   => 'scalar',
-			       'deleted' => 'scalar',
+    my %Saveable_Parameters = ('show'              => 'array',
+			       'when'              => 'scalar',
+			       'order'             => 'scalar',
+			       'deleted'           => 'scalar',
+			       'name_filter_type'  => 'scalar',
+			       'name_filter_value' => 'scalar',
 			       );
     &Apache::loncommon::store_course_settings('slotrequest',
 					      \%Saveable_Parameters);
@@ -771,6 +1068,7 @@ sub show_table {
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all');
     &Apache::grades::reset_perm();
 
+    # what to display filtering
     my %show_fields=&Apache::lonlocal::texthash(
 	     'name'            => 'Slot Name',
 	     'description'     => 'Description',
@@ -779,7 +1077,7 @@ sub show_table {
 	     'endtime'         => 'End Time',
              'startreserve'    => 'Time students can start reserving',
 	     'secret'          => 'Secret Word',
-	     'maxspace'        => 'Maximum # of students',
+	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
 	     'symb'            => 'Resource slot is restricted to.',
 	     'allowedsections' => 'Sections slot is restricted to.',
@@ -788,7 +1086,7 @@ sub show_table {
 	     'scheduled'       => 'Scheduled Students',
 	     'proctor'         => 'List of proctors');
     my @show_order=('name','description','type','starttime','endtime',
-		    'startreserve','secret','maxspace','ip','symb',
+		    'startreserve','secret','space','ip','symb',
 		    'allowedsections','allowedusers','uniqueperiod',
 		    'scheduled','proctor');
     my @show = 
@@ -796,6 +1094,7 @@ sub show_table {
 	                            : keys(%show_fields);
     my %show =  map { $_ => 1 } (@show);
 
+    #when filtering setup
     my %when_fields=&Apache::lonlocal::texthash(
 	     'now'      => 'Open now',
 	     'nextweek' => 'Open within the next week',
@@ -809,6 +1108,7 @@ sub show_table {
     my $when = 	(exists($env{'form.when'})) ? $env{'form.when'}
                                             : 'now';
 
+    #display of students setup
     my %stu_display_fields=
 	&Apache::lonlocal::texthash('username' => 'User name',
 				    'fullname' => 'Full name',
@@ -819,30 +1119,58 @@ sub show_table {
 	                                  : keys(%stu_display_fields);
     my %stu_display =  map { $_ => 1 } (@stu_display);
 
+    #name filtering setup
+    my %name_filter_type_fields=
+	&Apache::lonlocal::texthash('substring' => 'Substring',
+				    'exact'     => 'Exact',
+				    #'reg'       => 'Regular Expression',
+				    );
+    my @name_filter_type_order=('substring','exact');
+
+    $name_filter_type_fields{'select_form_order'} = \@name_filter_type_order;
+    my $name_filter_type = 
+	(exists($env{'form.name_filter_type'})) ? $env{'form.name_filter_type'}
+                                                : 'substring';
+    my $name_filter = {'type'  => $name_filter_type,
+		       'value' => $env{'form.name_filter_value'},};
+
+    
+    #deleted slot filtering
+    #default to hide if no value
+    $env{'form.deleted'} ||= 'hide';
     my $hide_radio = 
 	&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
     my $show_radio = 
 	&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show');
 	
-    $r->print('<form method="POST" action="/adm/slotrequest">
+    $r->print('<form method="post" action="/adm/slotrequest">
 <input type="hidden" name="command" value="showslots" />');
     $r->print('<div>');
     $r->print('<table class="inline">
       <tr><th>'.&mt('Show').'</th>
           <th>'.&mt('Student Display').'</th>
           <th>'.&mt('Open').'</th>
+          <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 valign="top">'.&Apache::loncommon::select_form($name_filter_type,
+						 'name_filter_type',
+						 %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>
@@ -858,23 +1186,28 @@ sub show_table {
     $r->print('</div>');
     $r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>');
     my $linkstart='<a href="/adm/slotrequest?command=showslots&amp;order=';
-    $r->print('<table class="thinborder">
-<tr>
-  <th></th>');
+    $r->print(&Apache::loncommon::start_data_table().
+	      &Apache::loncommon::start_data_table_header_row().'
+	       <th></th>');
     foreach my $which (@show_order) {
 	if ($which ne 'proctor' && exists($show{$which})) {
 	    $r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
 	}
     }
+    $r->print(&Apache::loncommon::end_data_table_header_row());
 
     my %name_cache;
     my $slotsort = sub {
-	if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) {
+	if ($env{'form.order'}=~/^(type|description|endtime|startreserve|ip|symb|allowedsections|allowedusers)$/) {
 	    if (lc($slots{$a}->{$env{'form.order'}})
 		ne lc($slots{$b}->{$env{'form.order'}})) {
 		return (lc($slots{$a}->{$env{'form.order'}}) 
 			cmp lc($slots{$b}->{$env{'form.order'}}));
 	    }
+	} elsif ($env{'form.order'} eq 'space') {
+	    if ($slots{$a}{'maxspace'} ne $slots{$b}{'maxspace'}) {
+		return ($slots{$a}{'maxspace'} cmp $slots{$b}{'maxspace'});
+	    }
 	} elsif ($env{'form.order'} eq 'name') {
 	    if (lc($a) cmp lc($b)) {
 		return lc($a) cmp lc($b);
@@ -894,34 +1227,46 @@ sub show_table {
 	}
 	return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
     };
+
+    my %consumed;
+    if (exists($show{'scheduled'}) || exists($show{'space'}) ) {
+	%consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum);
+	my ($tmp)=%consumed;
+	if ($tmp =~ /^error: /) { undef(%consumed); }
+    }
+
     foreach my $slot (sort $slotsort (keys(%slots)))  {
-	if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { next; }
+	if (!&to_show($slot,$slots{$slot},$when,
+		      $env{'form.deleted'},$name_filter)) { next; }
 	if (defined($slots{$slot}->{'type'})
 	    && $slots{$slot}->{'type'} ne 'schedulable_student') {
 	    #next;
 	}
 	my $description=&get_description($slot,$slots{$slot});
-	my $ids;
-	if (exists($show{'scheduled'})) {
-	    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
-					       "^$slot\0");
-	    my ($tmp)=%consumed;
-	    if ($tmp !~ /^error: /) {
-		foreach my $entry (sort(keys(%consumed))) {
+	my ($id_count,$ids);
+	    
+	if (exists($show{'scheduled'}) || exists($show{'space'}) ) {
+	    my $re_str = "$slot\0";
+	    my @this_slot = grep(/^\Q$re_str\E/,keys(%consumed));
+	    $id_count = scalar(@this_slot);
+	    if (exists($show{'scheduled'})) {
+		foreach my $entry (sort { $consumed{$a}{name} cmp 
+					      $consumed{$b}{name} }
+				   (@this_slot)) {
 		    my (undef,$id)=split("\0",$entry);
-		    my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
-		    $ids.= '<nobr>';
+		    my ($uname,$udom) = split(':',$consumed{$entry}{'name'});
+		    $ids.= '<span class="LC_nobreak">';
 		    foreach my $item (@stu_display_order) {
 			if ($stu_display{$item}) {
 			    if ($item eq 'fullname') {
 				$ids.=$fullname->{"$uname:$udom"}.' ';
 			    } elsif ($item eq 'username') {
-				$ids.="<tt>$uname\@$udom</tt> ";
+				$ids.="<tt>$uname:$udom</tt> ";
 			    }
 			}
 		    }
 		    $ids.=&remove_link($slot,$entry,$uname,$udom,
-				       $consumed{$entry}{'symb'}).'</nobr><br />';
+				       $consumed{$entry}{'symb'}).'</span><br />';
 		}
 	    }
 	}
@@ -935,7 +1280,7 @@ sub show_table {
 	
 	my $unique;
 	if (ref($slots{$slot}{'uniqueperiod'})) {
-	    $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','.
+	    $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).', '.
 		localtime($slots{$slot}{'uniqueperiod'}[1]);
 	}
 
@@ -976,7 +1321,7 @@ sub show_table {
 	if (exists($show{'proctor'})) {
 	    $rowspan=2;
 	    @proctors= map {
-		my ($uname,$udom)=split(/@/,$_);
+		my ($uname,$udom)=split(/:/,$_);
 		my $fullname=$name_cache{$_};
 		if (!defined($fullname)) {
 		    $fullname = &Apache::loncommon::plainname($uname,$udom);
@@ -988,16 +1333,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&slotname=$slot">Delete</a>
+<a href="/adm/slotrequest?command=delete&amp;slotname=$slot">$lt{'delete'}</a>
 DELETELINK
-        if ($ids ne '') { undef($delete); }
 
-        $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
+        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 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 $showlog</td>\n");
 	if (exists($show{'name'})) {
 	    $colspan++;$r->print("<td>$slot</td>");
 	}
@@ -1019,8 +1387,15 @@ DELETELINK
 	if (exists($show{'secret'})) {
 	    $colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n");
 	}
-	if (exists($show{'maxspace'})) {
-	    $colspan++;$r->print("<td>$slots{$slot}{'maxspace'}</td>\n");
+	if (exists($show{'space'})) {
+	    my $display = $id_count;
+	    if ($slots{$slot}{'maxspace'}>0) {
+		$display.='/'.$slots{$slot}{'maxspace'};
+		if ($slots{$slot}{'maxspace'} <= $id_count) {
+		    $display = '<strong>'.$display.' (full) </strong>';
+		}
+	    }
+	    $colspan++;$r->print("<td>$display</td>\n");
 	}
 	if (exists($show{'ip'})) {
 	    $colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n");
@@ -1034,28 +1409,667 @@ DELETELINK
 	if (exists($show{'allowedusers'})) {
 	    $colspan++;$r->print("<td>$allowedusers</td>\n");
 	}
+	if (exists($show{'uniqueperiod'})) {
+	    $colspan++;$r->print("<td>$unique</td>\n");
+	}
 	if (exists($show{'scheduled'})) {
-	    $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+	    $colspan++;$r->print("<td>$remove_all $ids</td>\n");
 	}
+	$r->print("$row_end\n");
 	if (exists($show{'proctor'})) {
 	    $r->print(<<STUFF);
-<tr>
+$row_start
  <td colspan="$colspan">$proctors</td>
-</tr>
+$row_end
 STUFF
         }
     }
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table().'</form>');
+    return;
+}
+
+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>'
+    );
+    if (!defined($navmap)) {
+        $r->print('<div class="LC_error">'.
+                  &mt('Unable to retrieve information about course contents').
+                  '</div>');
+        &Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($type).':'.$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");
+    $r->print('<table class="LC_data_table LC_tableOfContent">'."\n");
+    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->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];
+                        $r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n");
+                    }
+                }
+                $rownum ++;
+                my $bgcolor = $backgrounds[$rownum % $numcolors];
+                $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 (!$reservable) {
+        $r->print('<span class="LC_info">'.&mt('No course items currently require a reservation to gain access.').'</span>');
+    }
+    $r->print('</table>'.
+              '<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 %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-reservable slots for: [_1]',
+                      &Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'},
+                                                    'firstname')).'</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();
+    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;
+    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'};
+    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">'.
+              &mt('Reservation changes for student-reservable slot: [_1]',$description).'</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();
+    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 %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', 
+                                         );
+    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 %lt = &reservationlog_contexts();
+    $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.6.99.0');
+    if ($version) {
+        $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+    }
+    $output .= '</p><hr /><br />';
+    return $output;
 }
 
 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";
-    $result.='<tr bgcolor=#ffffe6><td>'."\n";
+    $result.='<tr bgcolor="#ffffe6"><td>'."\n";
     my $upfile_select=&Apache::loncommon::upfile_select_html();
     my $ignore=&mt('Ignore First Line');
     $result.=<<ENDUPFORM;
@@ -1082,14 +2096,16 @@ sub csvuploadmap_header {
 
     my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
     my $ignore=&mt('Ignore First Line');
+	my $help_field = &Apache::loncommon::help_open_topic('Slot SelectingField');
+
     $r->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<h3>Identify fields</h3>
+<h3>Identify fields $help_field</h3>	
 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>
+<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'}" />
@@ -1108,11 +2124,12 @@ ENDPICK
 
 sub csvuploadmap_footer {
     my ($request,$i,$keyfields) =@_;
+    my $buttontext = &mt('Create Slots');
     $request->print(<<ENDPICK);
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onClick="javascript:verify(this.form)" value="Create Slots" /><br />
+<input type="button" onClick="javascript:verify(this.form)" value="$buttontext" /><br />
 </form>
 ENDPICK
 }
@@ -1229,7 +2246,7 @@ sub csv_upload_assign {
     my @slotdata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@slotdata); }
     my %fields=&Apache::grades::get_fields();
-    $r->print('<h3>Creating Slots</h3>');
+    $r->print('<h3>'.&mt('Creating Slots').'</h3>');
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $countdone=0;
@@ -1267,36 +2284,80 @@ sub csv_upload_assign {
 	if ($entries{$fields{'endtime'}}) {
 	    $slot{'endtime'}=&UnixDate($entries{$fields{'endtime'}},"%s");
 	}
+
+	# start/endtime must be defined and greater than zero
+	if (!$slot{'starttime'}) {
+	    push(@errors,"$name not created -- Invalid start time");
+	    next;
+	}
+	if (!$slot{'endtime'}) {
+	    push(@errors,"$name not created -- Invalid end time");
+	    next;
+	}
+	if ($slot{'starttime'} > $slot{'endtime'}) {
+	    push(@errors,"$name not created -- Slot starts after it ends");
+	    next;
+	}
+
 	if ($entries{$fields{'startreserve'}}) {
 	    $slot{'startreserve'}=
 		&UnixDate($entries{$fields{'startreserve'}},"%s");
 	}
+	if (defined($slot{'startreserve'})
+	    && $slot{'startreserve'} > $slot{'starttime'}) {
+	    push(@errors,"$name not created -- Slot's reservation start time is after the slot's start time.");
+	    next;
+	}
+
 	foreach my $key ('ip','proctor','description','maxspace',
 			 'secret','symb') {
 	    if ($entries{$fields{$key}}) {
 		$slot{$key}=$entries{$fields{$key}};
 	    }
 	}
+
 	if ($entries{$fields{'uniqueperiod'}}) {
 	    my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
 	    my @times=(&UnixDate($start,"%s"),
 		       &UnixDate($end,"%s"));
 	    $slot{'uniqueperiod'}=\@times;
 	}
+	if (defined($slot{'uniqueperiod'})
+	    && $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) {
+	    push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time.");
+	    next;
+	}
 
 	&Apache::lonnet::cput('slots',{$name=>\%slot},$cdom,$cname);
 	$r->print('.');
 	$r->rflush();
 	$countdone++;
     }
-    $r->print("<p>Created $countdone slots\n</p>");
+    $r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>');
     foreach my $error (@errors) {
-	$r->print("<p>$error\n</p>");
+	$r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n");
     }
     &show_table($r,$mgr);
     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 handler {
     my $r=shift;
 
@@ -1308,21 +2369,74 @@ 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'}}});
+            }
+            
+        }
     }
-    &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);
     } elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') {
-	&release_slot($r,undef,undef,undef,$mgr);
+	if ($env{'form.entry'} eq 'remove all') {
+	    &release_all_slot($r,$mgr);
+	} else {
+	    &release_slot($r,undef,undef,undef,$mgr);
+	}
     } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') {
 	&delete_slot($r);
     } elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {
@@ -1340,12 +2454,20 @@ sub handler {
 	    }
 	    &csv_upload_map($r);
 	}
+    } elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') {
+        &show_reservations_log($r);
     } else {
-	my $symb=&Apache::lonnet::unescape($env{'form.symb'});
+	my $symb=&unescape($env{'form.symb'});
+	if (!defined($symb)) {
+	    &fail($r,'not_valid');
+	    return OK;
+	}
 	my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
 	my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
-	if ($useslots ne 'resource') {
-	    &fail($r,'not_valid');
+	if ($useslots ne 'resource' 
+	    && $useslots ne 'map' 
+	    && $useslots ne 'map_map') {
+	    &fail($r,'not_available');
 	    return OK;
 	}
 	$env{'request.symb'}=$symb;
@@ -1365,11 +2487,11 @@ sub handler {
 	} elsif ($env{'form.command'} eq 'get') {
 	    &get_slot($r,$symb);
 	} elsif ($env{'form.command'} eq 'change') {
-	    if (&release_slot($r,$symb,$env{'form.releaseslot'},1)) {
-		&get_slot($r,$symb);
+	    if (&get_slot($r,$symb,$env{'form.releaseslot'},1)) {
+		&release_slot($r,$symb,$env{'form.releaseslot'});
 	    }
 	} else {
-	    $r->print("<p>Unknown command: ".$env{'form.command'}."</p>");
+	    $r->print('<p>'.&mt('Unknown command: [_1]',$env{'form.command'}).'</p>');
 	}
     }
     &end_page($r);