--- loncom/interface/slotrequest.pm	2014/02/28 19:20:06	1.120
+++ loncom/interface/slotrequest.pm	2017/12/22 02:00:46	1.136
@@ -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.120 2014/02/28 19:20:06 bisitz Exp $
+# $Id: slotrequest.pm,v 1.136 2017/12/22 02:00:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use Apache::lonnet;
 use Apache::lonnavmaps();
 use Date::Manip;
 use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub fail {
     my ($r,$code)=@_;
@@ -56,12 +56,22 @@ sub fail {
 }
 
 sub start_page {
-    my ($r,$title,$brcrum)=@_;
+    my ($r,$title,$brcrum,$js)=@_;
     my $args;
     if (ref($brcrum) eq 'ARRAY') {
         $args = {bread_crumbs => $brcrum};
     }
-    $r->print(&Apache::loncommon::start_page($title,undef,$args));
+    if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
+        my %loaditems = (
+                           onload => 'javascript:uncheckSlotRadio();',
+                        );
+        if (ref($args) eq 'HASH') {
+            $args->{'add_entries'} = \%loaditems;
+        } else {
+            $args = { 'add_entries' => \%loaditems };
+        }
+    }
+    $r->print(&Apache::loncommon::start_page($title,$js,$args));
 }
 
 sub end_page {
@@ -69,6 +79,291 @@ sub end_page {
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub reservation_js {
+    my ($slots,$consumed_uniqueperiods,$available,$got_slots,$symb) = @_;
+    return unless ((ref($slots) eq 'HASH') && (ref($available) eq 'ARRAY'));
+    my $toskip;
+    if ($symb eq '') {
+        $toskip = { symb => 1, };
+    }
+    my ($i,$j) = (0,0);
+    my $js;
+    foreach my $slot (sort
+        { return $slots->{$a}->{'starttime'} <=> $slots->{$b}->{'starttime'} }
+                    (keys(%{$slots})))  {
+
+        next if (!&allowed_slot($slot,$slots->{$slot},$symb,$slots,
+                                $consumed_uniqueperiods,$toskip));
+        $js .= "    slotstart[$i]='$slots->{$slot}->{'starttime'}';\n".
+               "    slotend[$i]='$slots->{$slot}->{'endtime'}';\n".
+               "    slotname[$i]='$slot';\n";
+        if (($symb) && (ref($got_slots) eq 'ARRAY')) {
+            if (grep(/^\Q$slot\E$/,@{$got_slots})) {
+                $js .= "    currslot[$j]='$slot';\n";
+                $j++;
+            }
+        }
+        $i++;
+        push(@{$available},$slot);
+    }
+    if ($j) {
+        $js = "    var currslot = new Array($j);\n\n$js";
+    }
+    my %alerts = &Apache::lonlocal::texthash (
+                                                none    => 'No reservable time slots found',
+                                                invalid => 'Invalid date format',
+                                             );
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function updateSlotDisplay(form,num,slotpickradio) {
+    var slotstart = new Array($i);
+    var slotend = new Array($i);
+    var slotname = new Array($i);
+$js
+
+    if (slotpickradio == 'all') {
+        for (var i=0; i<$i; i++) {
+            if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+                document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = '';
+            }
+            if (document.getElementById('LC_slotsearch_'+num)) {
+                document.getElementById('LC_slotsearch_'+num).style.display = 'block';
+            }
+        }
+    } else {
+        if (slotpickradio == 'show') {
+            for (var i=0; i<$i; i++) {
+                if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+                    document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = 'none';
+                }
+            }
+            for (var j=0; j<$j; j++) {
+                if (document.getElementById('LC_slotrow_'+num+'_'+currslot[j])) {
+                    document.getElementById('LC_slotrow_'+num+'_'+currslot[j]).style.display = '';
+                }
+            }
+            if (document.getElementById('LC_slotsearch_'+num)) {
+                document.getElementById('LC_slotsearch_'+num).style.display = 'block';
+            }
+        } else {
+            var numberRegExp = /^[0-9]+\$/;
+            var startm = form.start_month.options[form.start_month.selectedIndex].value;
+            var startd = form.start_day.value;
+            startd=startd.trim();
+            var starty = form.start_year.value;
+            starty=starty.trim();
+            var endm = form.end_month.options[form.end_month.selectedIndex].value;
+            var endd = form.end_day.value;
+            endd=endd.trim();
+            var endy = form.end_year.value;
+            endy=endy.trim();
+            if (numberRegExp.test(endd) && numberRegExp.test(endy) && numberRegExp.test(startd) && numberRegExp.test(starty)) {
+                var startdate = startm+"/"+startd+"/"+starty;
+                var starttime = new Date(startdate).getTime();
+                starttime = starttime/1000;
+                var starth = form.start_hour.options[form.start_hour.selectedIndex].value;
+                if (numberRegExp.test(starth)) {
+                    starth = parseInt(starth);
+                    if (starth > 0 && starth <= 23) {
+                        starttime += 3600 * starth;
+                    }
+                }
+                var enddate = endm+"/"+endd+"/"+endy;
+                var endtime = new Date(enddate).getTime();
+                endtime = endtime/1000;
+                var endh = form.end_hour.options[form.end_hour.selectedIndex].value;
+                if (numberRegExp.test(endh)) {
+                    endh = parseInt(endh);
+                    if (endh > 0 && endh <= 23) {
+                        endtime += 3600 * endh;
+                    }
+                }
+
+                var shown = 0;
+                for (var i=0; i<$i; i++) {
+                    if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) {
+                        if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+                            document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = '';
+                            shown ++;
+                        }
+                    } else {
+                        if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+                            document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = 'none';
+                        }
+                    }
+                }
+                if (document.getElementById('LC_slotsearch_'+num)) {
+                    if (shown) {
+                        document.getElementById('LC_slotsearch_'+num).style.display = 'block';
+                    } else {
+                        document.getElementById('LC_slotsearch_'+num).style.display = 'none';
+                    }
+                }
+                if (shown == 0) {
+                    alert('$alerts{"none"}');
+                }
+            } else {
+                alert('$alerts{"invalid"}');
+            }
+        }
+    }
+    return;
+}
+
+function toggleSlotDisplay(form,num) {
+    if (form.slotpick.length) {
+        for (var i=0; i<form.slotpick.length; i++) {
+            if (form.slotpick[i].checked) {
+                var val = form.slotpick[i].value;
+                if (document.getElementById('LC_slotfilter_'+num)) {
+                    document.getElementById('LC_slotsearch_'+num).style.display = 'none';
+                    if (val == 'filter') {
+                        document.getElementById('LC_slotfilter_'+num).style.display = 'block';
+                    } else {
+                        document.getElementById('LC_slotfilter_'+num).style.display = 'none';
+                        if (val == 'all') {
+                            updateSlotDisplay(form,num,val);
+                        } else {
+                            updateSlotDisplay(form,num,val);
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return false;
+}
+
+if (!document.getElementsByClassName) {
+    function getElementsByClassName(node, classname) {
+        var a = [];
+        var re = new RegExp('(^| )'+classname+'( |$)');
+        var els = node.getElementsByTagName("*");
+        for(var i=0,j=els.length; i<j; i++)
+            if(re.test(els[i].className))a.push(els[i]);
+        return a;
+    }
+}
+
+function uncheckSlotRadio() {
+    var slotpicks;
+    if (document.getElementsByClassName) {
+        slotpicks = document.getElementsByClassName('LC_slotpick_radio');
+    } else {
+        slotpicks = getElementsByClassName(document.body,'LC_slotpick_radio');
+    }
+    if (slotpicks.length) {
+        for (var i=0; i<slotpicks.length; i++) {
+            slotpicks[i].checked = false;  
+        }
+    }
+}
+
+function toggleSlotMap(maprownum,rownum) {
+    if (document.getElementById('arrow'+maprownum)) {
+        var img = document.getElementById('arrow'+maprownum);
+        var rowdisplay;
+        var celldisplay = '';
+        if (img.src.indexOf('arrow.open.gif')!=-1) {
+            img.src = '/adm/lonIcons/arrow.closed.gif';
+            rowdisplay = 'none';
+        }
+        else {
+            img.src = '/adm/lonIcons/arrow.open.gif';
+            rowdisplay = 'table-row';
+            celldisplay = 'none';
+        }
+        var resrows;
+        var maptext;
+        if (document.getElementsByClassName) {
+            resrows = document.getElementsByClassName('LC_slotresrow_'+maprownum);
+            maptext = document.getElementsByClassName('LC_slotmaptext_'+maprownum);
+        } else {
+            resrows = getElementsByClassName(document.body,'LC_slotresrow_'+maprownum);
+            maptext = getElementsByClassName(document.body,'LC_slotmaptext_'+maprownum);
+        }
+        if (maptext.length) {
+            for (var i=0; i<maptext.length; i++) {
+                maptext[i].style.display = celldisplay;
+            }
+        }
+        if (resrows.length) {
+           var mapbgidx = 0;
+           var rowclasses = ['LC_even_row','LC_odd_row'];
+           var mapbgClass = 'LC_even_row';
+           var regExpBg = /LC_odd_row/i;
+           if (rowdisplay == 'table-row') {
+                if (document.getElementById('LC_slotmaprow_'+rownum)) {
+                    mapbgClass = document.getElementById('LC_slotmaprow_'+rownum).className;
+                    if (regExpBg.test(mapbgClass)) {
+                        mapbgidx = 1;
+                    }
+                }
+            }
+            for (var i=0; i<resrows.length; i++) {
+                resrows[i].style.display = rowdisplay;
+                if (rowdisplay == 'table-row') {
+                    mapbgidx ++;        
+                    var bgcolnew = mapbgidx % 2;
+                    var bgcolold = (mapbgidx+1) % 2;
+                    var k = i+parseInt(rownum)+1; 
+                    if (document.getElementById('LC_slotresrow_'+k)) {
+                        document.getElementById('LC_slotresrow_'+k).className = document.getElementById('LC_slotresrow_'+k).className.replace(rowclasses[bgcolold],rowclasses[bgcolnew]);
+                    }
+                }
+            }
+            if (document.getElementById('LC_slot_reservations')) {
+                var numrowsOdd = resrows.length % 2;
+                if (numrowsOdd) {
+                    var lastbgClass = 'LC_even_row';
+                    var idx = 0;
+                    var lastresnum = parseInt(rownum) + resrows.length; 
+                    if (rowdisplay == 'none') {
+                        lastresnum = rownum;
+                        if (document.getElementById('LC_slotmaprow_'+rownum)) {
+                            lastbgClass = document.getElementById('LC_slotmaprow_'+rownum).className;
+                        }
+                    } else {
+                        lastresnum = parseInt(rownum) + resrows.length;
+                        if (document.getElementById('LC_slotresrow_'+lastresnum)) {
+                            lastbgClass = document.getElementById('LC_slotresrow_'+lastresnum).className;
+                        }
+                    }
+                    if (regExpBg.test(lastbgClass)) {
+                        idx = 1;
+                    }
+                    var table = document.getElementById('LC_slot_reservations');
+                    if ((table.rows.length) && (table.rows.length >= lastresnum)) {
+                        for (var i=lastresnum; i<table.rows.length; i++) {
+                            if (table.rows[i].style.display != 'none') {
+                                idx ++;
+                                var bgcolnew = idx % 2;
+                                var bgcolold = (idx+1) % 2;  
+                                j = i+1;
+                                if (document.getElementById('LC_slotmaprow_'+j)) {
+                                    document.getElementById('LC_slotmaprow_'+j).className = rowclasses[bgcolnew];
+                                } else {
+                                    if (document.getElementById('LC_slotresrow_'+j)) {
+                                        document.getElementById('LC_slotresrow_'+j).className = document.getElementById('LC_slotresrow_'+j).className.replace(rowclasses[bgcolold],rowclasses[bgcolnew]);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+// ]]>
+</script>
+ENDSCRIPT
+
+}
+
+
 =pod
 
  slot_reservations db
@@ -121,7 +416,6 @@ sub check_for_reservation {
     my ($symb,$mode)=@_;
     my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
 				       $env{'user.domain'}, $env{'user.name'});
-
     my $course = &Apache::lonnet::EXT("resource.0.available", $symb,
 				    $env{'user.domain'}, $env{'user.name'});
     my @slots = (split(/:/,$student), split(/:/, $course));
@@ -171,7 +465,7 @@ sub get_consumed_uniqueperiods {
         return 'error: Unable to determine current status';
     }
     my @problems = $navmap->retrieveResources(undef,
-					      sub { $_[0]->is_problem() },1,0);
+					      sub { $_[0]->is_gradable() },1,0);
     my %used_slots;
     foreach my $problem (@problems) {
 	my $symb = $problem->symb();
@@ -218,16 +512,19 @@ sub check_for_conflict {
     if (!defined($new_slot->{'uniqueperiod'})) { return undef; }
 
     if (!ref($consumed_uniqueperiods)) {
-	$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
-        if (ref($consumed_uniqueperiods) eq 'HASH') {
-	    if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
-	        return 'error: Unable to determine current status';
-	    }
+        if ($consumed_uniqueperiods =~ /^error: /) {
+            return $consumed_uniqueperiods;
         } else {
-            return 'error: Unable to determine current status';
+	    $consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
+            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'}};
     foreach my $slot_name (keys(%$consumed_uniqueperiods)) {
 	my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}};
@@ -504,14 +801,20 @@ sub release_reservation {
         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();
+    if (ref($passed_resource)) {
+        if ($passed_resource->is_map()) {
+	    my ($a_resource) = 
+                $navmap->retrieveResources($passed_resource, 
+                                           sub {$_[0]->is_gradable()},0,1);
+            $symb = $a_resource->symb();
+        }
+    } else {
+        unless ($mgr eq 'F') {
+            return (0,'error: Unable to determine current status');
+        }
     }
 
-    # get parameter string, check for existance, rebuild string with the slot
+    # get parameter string, check for existence, rebuild string with the slot
     my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
                                        $symb,$udom,$uname);
     my @slots = split(/:/,$student);
@@ -735,7 +1038,7 @@ STUFF
 }
 
 sub allowed_slot {
-    my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_;
+    my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods,$toskip)=@_;
 
     #already started
     if ($slot->{'starttime'} < time) {
@@ -809,9 +1112,33 @@ sub allowed_slot {
     return 0 if (!$userallowed);
 
     # not allowed for this resource
-    if (defined($slot->{'symb'})
-	&& $slot->{'symb'} ne $symb) {
-	return 0;
+    if (defined($slot->{'symb'})) {
+        my $exclude = 1;
+        my @symbs;
+        if ($slot->{'symb'} =~ /,/) {
+            @symbs = split(/\s*,\s*/,$slot->{'symb'});
+        } else {
+            @symbs = ($slot->{'symb'});
+        }
+        my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+        foreach my $reqsymb (@symbs) {
+            next if ($reqsymb eq '');
+            my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($reqsymb);
+            if ($sloturl=~/\.(page|sequence)$/) {
+                if (($map ne '') && ($map eq $sloturl)) {
+                    $exclude = 0;
+                    last;
+                }
+            } elsif ($reqsymb eq $symb) {
+                $exclude = 0;
+                last;
+            }
+        }
+        if ($exclude) {
+            unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
+	        return 0;
+            }
+        }
     }
 
     my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
@@ -839,77 +1166,119 @@ sub get_description {
 }
 
 sub show_choices {
-    my ($r,$symb,$formname)=@_;
-
-    my ($cnum,$cdom)=&get_course();
-    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)) {
-            $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);
+    my ($symb,$formname,$num,$class,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_;
+    my $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>');
+    if (!ref($available) eq 'ARRAY') {
         return;
     }
-    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},$symb,\%slots,
-				$consumed_uniqueperiods));
-
-        push(@available,$slot);
-    }
-    if (!@available) {
-        $output = '<div class="LC_info">'.&mt('No available times.');
+    if (!@{$available}) {
+        $output = '<span class="LC_info">'.&mt('No available times.').'</span>';
         if ($env{'form.command'} ne 'manageresv') {
             $output .= ' <a href="/adm/flip?postdata=return:">'.
                        &mt('Return to last resource').'</a>';
         }
-        $output .= '</div>';
-        $r->print($output);
-        return;
+        if ($class) {
+            return '<div class="'.$class.'">'.$output.'</div>';
+        } else {
+            return $output;
+        }
+    }
+    if (@{$available} > 1) {
+        my $numavailable = scalar(@{$available});
+        my $numreserved = 0;
+        my $js;
+        my $j = 0;
+        foreach my $got (@{$got_slots}) {
+            unless (($got eq '') || (!defined($got))) {
+                $numreserved ++;
+                if ($env{'form.command'} eq 'manageresv') {
+                    $js .= "    currslot[$j]='$got';\n";
+                    $j++;
+                }
+            }
+        }
+        my $showfilter = 'none';
+        $output .= '<fieldset><legend>'.&mt('Actions').'</legend>'."\n".
+                   '<form method="post" name="reservationdisplay_'.$num.
+                   '" action="" onsubmit="toggleSlotDisplay(this.form,'."'$num'".');">';
+        my @options = ('all','filter');
+        if ($numreserved) {
+            unshift(@options,'show');
+        }
+        my %resmenu = &Apache::lonlocal::texthash (
+                                         show   => 'Show current reservation',
+                                         all    => 'Show all', 
+                                         filter => 'Search by date',
+                     );
+        foreach my $option (@options) {
+            my $onclick = "toggleSlotDisplay(this.form,'$num');";
+            if (($option eq 'show') && ($env{'form.command'} eq 'manageresv')) {  
+                $onclick .= "currSlotDisplay$num(this.form,'$num');"; 
+            }
+            $output .= '<span class="LC_nobreak"><label>'.
+                       '<input type="radio" class="LC_slotpick_radio" name="slotpick" value="'.
+                       $option.'" onclick="'.$onclick.'" />'.
+                       $resmenu{$option}.
+                       '</label></span>'.('&nbsp;' x3)."\n";
+        }
+        $output .= '</form>';
+        my $chooserform = 'reservationchooser_'.$num;
+        my $starttime = $slots->{$available->[0]}->{'starttime'};
+        my $endtime = $slots->{$available->[-1]}->{'starttime'};
+        if ($env{'form.command'} eq 'manageresv') {
+            $output .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+function currSlotDisplay$num() {
+    var currslot = new Array($numreserved);
+$js    
+    for (var j=0; j<$numreserved; j++) {
+        if (document.getElementById('LC_slotrow_$num\_'+currslot[j])) {
+            document.getElementById('LC_slotrow_$num\_'+currslot[j]).style.display = '';
+        }
+    }
+}
+// ]]>
+</script>
+
+ENDSCRIPT
+        }
+        $output .=
+            '<div id="LC_slotfilter_'.$num.'" style="display:'.$showfilter.'">'.
+            '<form method="post" name="'.$chooserform.'" action="">'.
+            '<table><tr><td>'.&mt('Open after').'</td><td>'.
+            &Apache::lonhtmlcommon::date_setter($chooserform,'start',$starttime,'','','','','','','',1,1).
+            '</td></tr><tr><td>'.&mt('Closed before').'</td><td>'.
+            &Apache::lonhtmlcommon::date_setter($chooserform,'end',$endtime,'','','','','','','',1,1).
+            '</td></tr></table><br />'.
+            '<input type="button" name="slotfilter" value="Search for reservable slots" onclick="updateSlotDisplay(this.form,'."'$num'".');" />'.
+            '</form></div><div id="LC_slotsearch_'.$num.'" style="display:none"><hr />';
     }
     if ($env{'form.command'} eq 'manageresv') {
-        $output = '<table border="0">';
+        $output .= '<table border="0">';
     } else {
-        $output = &Apache::loncommon::start_data_table();
+        $output .= &Apache::loncommon::start_data_table();
     }
-    foreach my $slot (@available) { 
-	my $description=&get_description($slot,$slots{$slot});
+    foreach my $slot (@{$available}) {
+	my $description=&get_description($slot,$slots->{$slot});
 	my $form;
-	if ((grep(/^\Q$slot\E$/,@got_slots)) ||
-	    &space_available($slot,$slots{$slot},$symb)) {
+	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)) {
+	    if (grep(/^\Q$slot\E$/,@{$got_slots})) {
 		$text=&mt('Drop Reservation');
 		$command='release';
 	    } else {
-		my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
-						   \%slots,
-						   $consumed_uniqueperiods);
+		my $conflict = &check_for_conflict($symb,$slot,$slots->{$slot},
+						   $slots,$consumed_uniqueperiods);
                 if ($conflict) {
                     if ($conflict =~ /^error: /) {
                         $form = '<span class="LC_error">'.
-                                &mt('Slot: [_1] has unknown status.',$description).
-                                '</span>';
+                                 &mt('Slot: [_1] has unknown status.',$description).
+                                 '</span>';
                     } else {
 		        $text=&mt('Change Reservation');
 		        $command='get';
@@ -918,15 +1287,16 @@ sub show_choices {
 	    }
 	    my $escsymb=&escape($symb);
             if (!$form) {
+                my $name;
                 if ($formname) {
-                    $formname = 'name="'.$formname.'" ';
+                     $name = 'name="'.$formname.'"';
                 }
                 my $context = 'user';
                 if ($env{'form.command'} eq 'manageresv') {
                     $context = 'usermanage';
                 }
 	        $form=<<STUFF;
-   <form method="post" action="/adm/slotrequest" $formname>
+   <form method="post" action="/adm/slotrequest" $name>
      <input type="submit" name="Select" value="$text" />
      <input type="hidden" name="symb" value="$escsymb" />
      <input type="hidden" name="slotname" value="$slot" />
@@ -939,9 +1309,9 @@ STUFF
             $form = &mt('Unavailable');
         }
         if ($env{'form.command'} eq 'manageresv') {
-            $output .= '<tr>';
+            $output .= '<tr id="LC_slotrow_'.$num.'_'.$slot.'" >';
         } else {
-	    $output .= &Apache::loncommon::start_data_table_row();
+	    $output .= &Apache::loncommon::start_data_table_row('','LC_slotrow_'.$num.'_'.$slot);
         }
         $output .= " 
  <td>$form</td>
@@ -955,9 +1325,16 @@ STUFF
     if ($env{'form.command'} eq 'manageresv') {
         $output .= '</table>';
     } else {
-       $output .= &Apache::loncommon::end_data_table();
+        $output .= &Apache::loncommon::end_data_table();
+    }
+    if (@{$available} > 1) {
+        $output .= '</div></fieldset>';
+    }
+    if ($class) {
+        return '<div class="'.$class.'">'.$output.'</div>';
+    } else {
+        return $output;
     }
-    $r->print($output);
 }
 
 sub to_show {
@@ -1112,12 +1489,13 @@ sub show_table {
 	     'secret'          => 'Secret Word',
 	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
-	     'symb'            => 'Resource slot is restricted to.',
+	     'symb'            => 'Resource(s)/Map(s) slot is restricted to.',
 	     'allowedsections' => 'Sections slot is restricted to.',
 	     'allowedusers'    => 'Users slot is restricted to.',
 	     'uniqueperiod'    => 'Period of time slot is unique',
 	     'scheduled'       => 'Scheduled Students',
-	     'proctor'         => 'List of proctors');
+	     'proctor'         => 'List of proctors',
+	     'iptied'          => 'Unique IP each student',);
     if ($crstype eq 'Community') {
         $show_fields{'startreserve'} = &mt('Time members can start reserving');
         $show_fields{'endreserve'} = &mt('Time members can no longer reserve');
@@ -1125,7 +1503,7 @@ sub show_table {
     }
     my @show_order=('name','description','type','starttime','endtime',
 		    'startreserve','endreserve','reservationmsg','secret','space',
-		    'ip','symb','allowedsections','allowedusers','uniqueperiod',
+		    'ip','iptied','symb','allowedsections','allowedusers','uniqueperiod',
 		    'scheduled','proctor');
     my @show = 
 	(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
@@ -1224,15 +1602,16 @@ 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(&Apache::loncommon::start_data_table().
-	      &Apache::loncommon::start_data_table_header_row().'
-	       <th></th>');
+    my $tableheader = &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>');
+	    $tableheader .= '<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>';
 	}
     }
-    $r->print(&Apache::loncommon::end_data_table_header_row());
+    $tableheader .= &Apache::loncommon::end_data_table_header_row();
+    my $shownheader = 0;
 
     my %name_cache;
     my $slotsort = sub {
@@ -1327,13 +1706,21 @@ sub show_table {
 		localtime($slots{$slot}{'uniqueperiod'}[1]);
 	}
 
-	my $title;
+	my @titles;
 	if (exists($slots{$slot}{'symb'})) {
-	    my (undef,undef,$res)=
-		&Apache::lonnet::decode_symb($slots{$slot}{'symb'});
-	    $res =   &Apache::lonnet::clutter($res);
-	    $title = &Apache::lonnet::gettitle($slots{$slot}{'symb'});
-	    $title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>';
+            my @symbs;
+            if ($slots{$slot}{'symb'} =~ /,/) {
+                @symbs = split(/\s*,\s*/,$slots{$slot}{'symb'});
+            } else {
+                @symbs = ($slots{$slot}{'symb'});
+            }
+            foreach my $reqsymb (@symbs) {
+	        my (undef,undef,$res) =
+		    &Apache::lonnet::decode_symb($reqsymb);
+	        $res = &Apache::lonnet::clutter($res);
+	        my $title = &Apache::lonnet::gettitle($reqsymb);
+	        push(@titles,'<a href="'.$res.'?symb='.$reqsymb.'">'.$title.'</a>');
+            }
 	}
 
 	my $allowedsections;
@@ -1381,30 +1768,39 @@ sub show_table {
                                                delete => 'Delete',
                                                slotlog => 'History',
         );
-	my $edit=(<<"EDITLINK");
+        my ($edit,$delete,$showlog,$remove_all);
+        if ($mgr) {
+	    $edit=(<<"EDITLINK");
 <a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a>
 EDITLINK
 
-	my $delete=(<<"DELETELINK");
+	    $delete=(<<"DELETELINK");
 <a href="/adm/slotrequest?command=delete&amp;slotname=$slot">$lt{'delete'}</a>
 DELETELINK
 
-        my $showlog=(<<"LOGLINK");
+            $remove_all=&remove_link($slot,'remove all').'<br />';
+
+            if ($ids eq '') {
+                undef($remove_all);
+            } else {
+                undef($delete);
+            }
+        }
+
+        $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);
 	}
 
+        unless ($shownheader) {
+            $r->print($tableheader);
+            $shownheader = 1;
+        }
+
 	my $row_start=&Apache::loncommon::start_data_table_row();
 	my $row_end=&Apache::loncommon::end_data_table_row();
         $r->print($row_start.
@@ -1449,8 +1845,18 @@ LOGLINK
 	if (exists($show{'ip'})) {
 	    $colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n");
 	}
+        if (exists($show{'iptied'})) {
+            $colspan++;
+            if ($slots{$slot}{'iptied'} eq 'yes') {
+                $r->print('<td>'.&mt('Yes')."</td>\n");
+            } elsif ($slots{$slot}{'iptied'} eq 'answer') {
+                $r->print('<td>'.&mt('Yes, including post-answer date')."</td>\n");
+            } else {
+                $r->print('<td>'.&mt('No')."</td>\n");
+            }
+        }
 	if (exists($show{'symb'})) {
-	    $colspan++;$r->print("<td>$title</td>\n");
+	    $colspan++;$r->print("<td>".join('<br />',@titles)."</td>\n");
 	}
 	if (exists($show{'allowedsections'})) {
 	    $colspan++;$r->print("<td>$allowedsections</td>\n");
@@ -1473,12 +1879,17 @@ $row_end
 STUFF
         }
     }
-    $r->print(&Apache::loncommon::end_data_table().'</form>');
+    if ($shownheader) {
+        $r->print(&Apache::loncommon::end_data_table());
+    } else {
+        $r->print('<p>'.&mt('No slots meet the criteria for display').'</p>');
+    }
+    $r->print('</form>');
     return;
 }
 
 sub manage_reservations {
-    my ($r,$crstype) = @_;
+    my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_;
     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.')
@@ -1497,17 +1908,33 @@ sub manage_reservations {
         &Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
         return;
     }
+    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 (%parent,%shownparent,%container,%container_title,%contents);
-    my ($depth,$count,$reservable,$lastcontainer,$rownum) = (0,0,0,0,0);
+    my ($depth,$count,$reservable,$lastcontainer,$rownum,$shown) = (0,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";
+                 '<table class="LC_data_table LC_tableOfContent" id="LC_slot_reservations">'."\n";
     my $shownheader = 0;
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+    my (@ordered,%output,$mapitem,$got_map_slot,$currmapoutput,$mapnum);
+    $mapnum = 0;
+    $shown = 0;
     while (my $resource = $it->next()) {
         if ($resource == $it->BEGIN_MAP()) {
             $depth++;
@@ -1516,12 +1943,92 @@ sub manage_reservations {
         if ($resource == $it->END_MAP()) {
             $depth--;
             $lastcontainer = $parent{$depth};
+            my %allstatuses;
+            foreach my $symb (@ordered) {
+                if (ref($output{$symb}) eq 'HASH') {
+                    if (($output{$symb}{'type'} eq 'map_map') || ($output{$symb}{'type'} eq 'map')) {
+                        if ($output{$symb}{'slotstatus'} ne '') {
+                            if (ref($allstatuses{$output{$symb}{'slotstatus'}}) eq 'ARRAY') {
+                                push(@{$allstatuses{$output{$symb}{'slotstatus'}}},$symb);
+                            } else {
+                                $allstatuses{$output{$symb}{'slotstatus'}} = [$symb];
+                            }
+                        }
+                    }
+                }
+            }
+            if (keys(%allstatuses) == 1) {
+                $got_map_slot = 1;
+                my $repsymb;
+                my @values = values(%allstatuses);
+                if (ref($values[0]) eq 'ARRAY') {
+                    if (ref($output{$values[0][0]}) eq 'HASH') {
+                        $repsymb = $values[0][0];
+                    }
+                }
+                if (($mapitem) && ($repsymb)) {
+                    my $formnum = $mapnum.'_'.$output{$repsymb}{'reservable'};
+                    my $class = 'LC_slotmaptext_'.$mapnum;
+                    if ($output{$repsymb}{'hasaction'}) {
+                        $mapitem .= '<td valign="top"><span class="'.$class.'">'.
+                                    $output{$repsymb}{'msg'}.
+                                    '</span></td><td valign="top">'.
+                                    &slot_chooser($repsymb,$class,$formnum,$allavailable,$slots,
+                                                  $consumed_uniqueperiods).
+                                   '</td>';
+
+                    } else {
+                        $mapitem .= '<td colspan="2" valign="middle"><span class="'.$class.'">'.
+                                    $output{$repsymb}{'msg'}.
+                                    '</span></td>';
+                    }
+                }
+                my $counter = 0;
+                foreach my $symb (@ordered) {
+                    if (ref($output{$symb}) eq 'HASH') {
+                        $counter ++;
+                        my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors];
+                        $currmapoutput .= $output{$symb}{'header'}.
+                                          '<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'.
+                                          ' style="display:none" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'.
+                                          $output{$symb}{'info'}.
+                                          $output{$symb}{'data'}.'</tr>'."\n";
+                    }
+                }
+            } else {
+                my $counter = 0;
+                foreach my $symb (@ordered) {
+                    if (ref($output{$symb}) eq 'HASH') {
+                        $counter ++;
+                        my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors];
+                        $currmapoutput .= $output{$symb}{'header'}.
+                                          '<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'.
+                                          ' style="display:table-row" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'.
+                                          $output{$symb}{'info'}.
+                                          $output{$symb}{'data'}.'</tr>'."\n";
+                        $shown ++;
+                    }
+                }
+            }
+            if ($mapitem) {
+                if ($got_map_slot) {
+                    $mapitem =~ s{(<img src=\"/adm/lonIcons/arrow\.)open(\.gif\")}{$1closed$2};
+                    $mapitem .= '</tr>'."\n";
+                } else {
+                    $mapitem .= '<td colspan="2">&nbsp;</td></tr>'."\n";
+                }
+            }
+            $r->print($mapitem.$currmapoutput);
+            @ordered=();
+            undef(%output);
+            $currmapoutput = '';
+            $got_map_slot = '';
+            $mapitem = '';
         }
         if (ref($resource)) {
             my $symb = $resource->symb();
-            my $ressymb = $symb;
             $contents{$lastcontainer} ++;
-            next if (!$resource->is_problem() && !$resource->is_sequence() && 
+            next if (!$resource->is_gradable() && !$resource->is_sequence() && 
                      !$resource->is_page());
             $count ++;
             if (($resource->is_sequence()) || ($resource->is_page())) {
@@ -1529,13 +2036,18 @@ sub manage_reservations {
                 $container{$lastcontainer} = $resource;
                 $container_title{$lastcontainer} = $resource->compTitle();
             }
-            if ($resource->is_problem()) {
+            if ($resource->is_gradable()) {
                 my ($useslots) = $resource->slot_control();
                 next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i));
+                push(@ordered,$symb); 
+                $output{$symb}{type} = $useslots;  
                 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');
+
+                $output{$symb}{'slotstatus'} = $slot_status;
+                $output{$symb}{'slotname'} = $slot_name; 
                 if ($slot_name ne '') {
                     my %slot=&Apache::lonnet::get_slot($slot_name);
                     $slotdescription=&get_description($slot_name,\%slot);
@@ -1579,7 +2091,9 @@ sub manage_reservations {
                         $msg = &Apache::lonnavmaps::getDescription($resource,'0'); 
                     }
                 }
+                $output{$symb}{'msg'} = $msg;
                 $reservable ++;
+                $output{$symb}{'reservable'} = $reservable;
                 my $treelevel = $depth;
                 my $higherup = $lastcontainer;
                 if ($depth > 1) {
@@ -1600,53 +2114,71 @@ sub manage_reservations {
                         $treelevel --;
                         $higherup = $parent{$treelevel};
                     }
-                    foreach my $item (@maprows) {
+                    for (my $i=0; $i<@maprows; $i++) {
+                        $mapnum ++;
                         $rownum ++;
-                        my $bgcolor = $backgrounds[$rownum % $numcolors];
+                        $shown ++;
+                        my $bgcolor = $backgrounds[$shown % $numcolors];
                         if (!$shownheader) {
-                            $r->print($slotheader);
+                            $mapitem .= $slotheader;
                             $shownheader = 1;
                         }
-                        $r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n");
+                        if (ref($maprows[$i]) eq 'ARRAY') {
+                            if ($i < scalar(@maprows)-1) {
+                                $mapitem .= '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'.
+                                            '<td>'.join('',@{$maprows[$i]}).'</td>'.
+                                            '<td colspan="2">&nbsp;</td></tr>'."\n";
+                            } else {
+                                $mapitem .= 
+                                   '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'.
+                                   '<td>'.$maprows[$i][0].
+                                   '<img src="/adm/lonIcons/arrow.open.gif" id="arrow'.$mapnum.'" '.
+                                   'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '.
+                                   'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
+                                   $maprows[$i][1].('&nbsp;' x6).'</td>'."\n";
+                            }
+                        }
                     }
+                    $output{$symb}{'mapnum'} = $mapnum;
                 }
                 $rownum ++;
-                my $bgcolor = $backgrounds[$rownum % $numcolors];
+                $output{$symb}{'rownum'} = $rownum;
+                $output{$symb}{'shown'} = $shown;
                 if (!$shownheader) {
-                    $r->print($slotheader);
+                    $output{$symb}{'header'} = $slotheader;
                     $shownheader = 1;
                 }
-                $r->print('<tr class="'.$bgcolor.'"><td>'."\n");
+                $output{$symb}{'info'} = '<td>';
                 for (my $i=0; $i<$depth; $i++) {
-                    $r->print('<img src="'.$location.'" alt="" />');
+                    $output{$symb}{'info'} .= '<img src="'.$location.'" alt="" />';
                 }
-                my $result = '<a href="'.$resource->src().'?symb='.$symb.'">'.
-                             '<img class="LC_contentImage" src="/adm/lonIcons/';
+                $output{$symb}{'info'} .= '<a href="'.$resource->src().'?symb='.$symb.'">'.
+                                         '<img class="LC_contentImage" src="/adm/lonIcons/';
                 if ($resource->is_task()) {
-                    $result .= 'task.gif" alt="'.&mt('Task');
+                    $output{$symb}{'info'} .= 'task.gif" alt="'.&mt('Task');
                 } else {
-                    $result .= 'problem.gif" alt="'.&mt('Problem');
+                    $output{$symb}{'info'} .= 'problem.gif" alt="'.&mt('Problem');
                 }
-                $result .= '" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>';
+                $output{$symb}{'info'} .= '" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>';
+
                 my $hasaction;
                 if ($status == $resource->OPEN) {
                     if ($get_choices) {
                         $hasaction = 1;
+                        $output{$symb}{'hasaction'} = $hasaction;
                     }
                 }
+                my $class = 'LC_slottext_'.$mapnum;
                 if ($hasaction) {
-                    $result .= '<td valgn="middle">'.$msg.'</td>'.
-                               '<td valign="middle">'.('&nbsp;' x6);
+                    $output{$symb}{'data'} = '<td valign="top"><span class="'.$class.'">'.$msg.'</span></td>'.
+                                             '<td valign="top">'.
+                                             &slot_chooser($symb,$class,$reservable,$allavailable,$slots,
+                                                           $consumed_uniqueperiods).'</td>';
                 } 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>');
+                    $output{$symb}{'data'} = '<td colspan="2" valign="middle">'.
+                                             '<span class="'.$class.'">'.$msg.'</span>'.
+                                             '</td>';
                 }
-                $r->print('</tr>');
             }
         }
     }
@@ -1668,20 +2200,70 @@ sub manage_reservations {
 
 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="" />';
+    my $spacers;
+    for (my $i=0; $i<$depth-2; $i++) {
+        $spacers .= '<img src="'.$location.'" alt="" />';
     }
+    my $icon;
     if ($type eq 'page') {
-        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
+        $icon = '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
     } else {
-        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
+        $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
     }
-    $output .= $title.'</td><td colspan="2">&nbsp;</td>'."\n";
-    unshift (@{$maprows},$output);
+    $icon .= $title;
+    unshift (@{$maprows},[$spacers,$icon]);
     return;
 }
 
+sub slot_chooser {
+    my ($symb,$class,$formnum,$allavailable,$slots,$consumed_uniqueperiods) = @_;
+    my $output;
+    my @got_slots=&check_for_reservation($symb,'allslots');
+    if ($got_slots[0] =~ /^error: /) {
+        $output = '<span class="'.$class.'"><span class="LC_error">'.
+                  &mt('An error occurred determining slot availability.').
+                  '</span></span>';
+    } else {
+        my $formname = 'manageres_'.$formnum;
+        if (ref($allavailable) eq 'ARRAY') {
+            my @available;
+            if (ref($slots) eq 'HASH') {
+                foreach my $slot (@{$allavailable}) {
+                    # not allowed for this resource
+                    if (ref($slots->{$slot}) eq 'HASH') {
+                        if ($slots->{$slot}->{'symb'} ne '') {
+                            my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+                            my $exclude = 1;
+                            my @reqsymbs = split(/\s*,\s*/,$slots->{$slot}->{'symb'});
+                            if (@reqsymbs) {
+                                if (grep(/^\Q$symb\E$/,@reqsymbs)) {
+                                    $exclude = 0;
+                                } else {
+                                    foreach my $reqsymb (@reqsymbs) {
+                                        my (undef,undef,$sloturl) = &Apache::lonnet::decode_symb($reqsymb);
+                                        if ($sloturl=~/\.(page|sequence)$/) {
+                                            if (($map ne '') && ($map eq $sloturl)) {
+                                                $exclude = 0;
+                                                last;
+                                            }
+                                        }
+                                    }
+                                }
+                                next if ($exclude);   
+                            }
+                        }
+                    }
+                    push(@available,$slot);
+                }
+            }
+            $output .= &show_choices($symb,$formname,$formnum,$class,
+                                     $slots,$consumed_uniqueperiods,
+                                     \@available,\@got_slots);
+        }
+    }
+    return $output;
+}
+
 sub show_reservations {
     my ($r,$uname,$udom) = @_;
     if (!defined($uname)) {
@@ -1793,16 +2375,19 @@ sub show_reservations {
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
         if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<table><tr>');
+            $r->print('<p>');
             if ($curr{'page'} > 1) {
-                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'.
+                          &mt('Previous [_1] changes',$curr{'show'}).'" />');
             }
             if ($more_records) {
-                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'.
+                          &mt('Next [_1] changes',$curr{'show'}).'" />');
             }
-            $r->print('</tr></table>');
+            $r->print('</p>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
+// <![CDATA[
 function chgPage(caller) {
     if (caller == 'previous') {
         document.$formname.page.value --;
@@ -1813,6 +2398,7 @@ function chgPage(caller) {
     document.$formname.submit();
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
         }
@@ -2002,14 +2588,16 @@ sub show_reservations_log {
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
         if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<table><tr>');
+            $r->print('<p>');
             if ($curr{'page'} > 1) {
-                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'.
+                          &mt('Previous [_1] changes',$curr{'show'}).'" />');
             }
             if ($more_records) {
-                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'.
+                          &mt('Next [_1] changes',$curr{'show'}).'" />');
             }
-            $r->print('</tr></table>');
+            $r->print('</p>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 function chgPage(caller) {
@@ -2149,8 +2737,9 @@ sub display_filter {
         }
         $output .= '</select></td>';
     }
-    $output .= '<td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
-               &mt('Update Display').'" /></tr></table>'.
+    $output .= '<td>&nbsp;&nbsp;</td></tr></table>'.
+               '<p><input type="submit" value="'.
+               &mt('Update Display').'" /></p>'.
                '<p class="LC_info">'.
                &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
                   ,'2.9.0');
@@ -2356,8 +2945,10 @@ sub csv_upload_map {
     if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($r);
     } else {
-	$datatoken=$env{'form.datatoken'};
-	&Apache::loncommon::load_tmp_file($r);
+        $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+        if ($datatoken ne '') {
+            &Apache::loncommon::load_tmp_file($r,$datatoken);
+        }
     }
     my @records=&Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@records); }
@@ -2394,10 +2985,11 @@ sub csvupload_fields {
             ['endreserve','Reservation End Time'],
             ['reservationmsg','Message when reservation changed'],
 	    ['ip','IP or DNS restriction'],
+            ['iptied','Unique IP each student'],
 	    ['proctor','List of proctor ids'],
 	    ['description','Slot Description'],
 	    ['maxspace','Maximum number of reservations'],
-	    ['symb','Resource Restriction'],
+	    ['symb','Resource(s)/Map(s) Restriction'],
 	    ['uniqueperiod','Date range of slot exclusion'],
 	    ['secret','Secret word proctor uses to validate'],
 	    ['allowedsections','Sections slot is restricted to'],
@@ -2407,7 +2999,10 @@ sub csvupload_fields {
 
 sub csv_upload_assign {
     my ($r,$mgr)= @_;
-    &Apache::loncommon::load_tmp_file($r);
+    my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+    if ($datatoken ne '') {
+        &Apache::loncommon::load_tmp_file($r,$datatoken);
+    }
     my @slotdata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@slotdata); }
     my %fields=&Apache::grades::get_fields();
@@ -2465,8 +3060,12 @@ sub csv_upload_assign {
 	}
 
 	if ($entries{$fields{'startreserve'}}) {
-	    $slot{'startreserve'}=
-		&UnixDate($entries{$fields{'startreserve'}},"%s");
+            my $date = &UnixDate($entries{$fields{'startreserve'}},"%s");
+            if ($date eq '') {
+                push(@errors,"$name -- No reservation start time set for slot -- value provided had invalid format");
+            } else {
+                $slot{'startreserve'} = $date;
+            }
 	}
 	if (defined($slot{'startreserve'})
 	    && $slot{'startreserve'} > $slot{'starttime'}) {
@@ -2475,8 +3074,12 @@ sub csv_upload_assign {
 	}
 
         if ($entries{$fields{'endreserve'}}) {
-            $slot{'endreserve'}=
-                &UnixDate($entries{$fields{'endreserve'}},"%s");
+            my $date = &UnixDate($entries{$fields{'endreserve'}},"%s");
+            if ($date eq '') {
+                push(@errors,"$name -- No reservation end time set for slot -- value provided had invalid format");
+            } else {
+                $slot{'endreserve'} = $date;
+            }
         }
         if (defined($slot{'endreserve'})
             && $slot{'endreserve'} > $slot{'starttime'}) {
@@ -2504,14 +3107,51 @@ sub csv_upload_assign {
 		$slot{$key}=$entries{$fields{$key}};
 	    }
 	}
-
+        if ($entries{$fields{'iptied'}} =~ /^\s*(yes|1)\s*$/i) {
+            $slot{'iptied'}='yes'; 
+        } elsif ($entries{$fields{'iptied'}} =~ /^\s*answer\s*$/i) {
+            $slot{'iptied'}='answer';
+        }
+        if ($entries{$fields{'allowedusers'}}) {
+            $entries{$fields{'allowedusers'}} =~ s/^\s+//;
+            $entries{$fields{'allowedusers'}} =~ s/\s+$//;
+            my @allowedusers;
+            foreach my $poss (split(/\s*,\s*/,$entries{$fields{'allowedusers'}})) {
+                my ($possuname,$possudom) = split(/:/,$poss);
+                if (($possuname =~ /^$match_username$/) && ($possudom =~ /^$match_domain$/)) {
+                    unless (grep(/^\Q$poss\E$/,@allowedusers)) {
+                        push(@allowedusers,$poss);
+                    }
+                }
+            }
+            if (@allowedusers > 0) {
+                $slot{'allowedusers'} = join(',',@allowedusers);
+            }
+        }
+        if ($entries{$fields{'allowedsections'}}) {
+            $entries{$fields{'allowedsections'}} =~ s/^\s+//;
+            $entries{$fields{'allowedsections'}} =~ s/\s+$//;
+            my @allowedsections;
+            foreach my $poss (split(/\s*,\s*/,$entries{$fields{'allowedsections'}})) {
+                if (($poss !~ /\W/) && ($poss ne 'none')) {
+                    unless (grep(/^\Q$poss\E$/,@allowedsections)) {
+                        push(@allowedsections,$poss);
+                    }
+                }
+            }
+            if (@allowedsections > 0) {
+                $slot{'allowedsections'} = join(',',@allowedsections);
+            }
+        }
 	if ($entries{$fields{'uniqueperiod'}}) {
-	    my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
-	    my @times=(&UnixDate($start,"%s"),
-		       &UnixDate($end,"%s"));
-	    $slot{'uniqueperiod'}=\@times;
+            my ($start,$end)= map { &UnixDate($_,"%s"); } split(',',$entries{$fields{'uniqueperiod'}});
+            if (($start ne '') && ($end ne '')) {
+                $slot{'uniqueperiod'}=[$start,$end];
+            } else {
+                push(@errors,"$name -- Slot's unique period ignored -- one or both of the comma separated values for start and end had an invalid format");
+            }
 	}
-	if (defined($slot{'uniqueperiod'})
+	if (ref($slot{'uniqueperiod'}) eq 'ARRAY' 
 	    && $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;
@@ -2576,6 +3216,7 @@ sub handler {
 
     my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    my (%slots,$consumed_uniqueperiods);
     if ($env{'form.command'} eq 'showslots') {
         if (($vgr ne 'F') && ($mgr ne 'F')) {
             $env{'form.command'} = 'manageresv'; 
@@ -2596,9 +3237,14 @@ sub handler {
         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 (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {  
+        if ($env{'form.command'} eq 'manageresv') {
+            $title = 'Manage Reservations';
+            $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
+        }
+        my ($cnum,$cdom)=&get_course();
+        %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
+        $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
     } elsif ($vgr eq 'F') {
         if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) {
             $brcrum =[{href=>"/adm/slotrequest?command=showslots",
@@ -2622,11 +3268,23 @@ sub handler {
     } else {
         $brcrum =[];
     }
-    &start_page($r,$title,$brcrum);
+    my ($symb,$js,$available,$allavailable,$got_slots);
+    $available = [];
+    if ($env{'form.requestattempt'}) {
+        $symb=&unescape($env{'form.symb'});
+        @{$got_slots}=&check_for_reservation($symb,'allslots');
+    }
+    if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
+        $js = &reservation_js(\%slots,$consumed_uniqueperiods,$available,$got_slots,$symb);
+    }
+    &start_page($r,$title,$brcrum,$js);
 
     if ($env{'form.command'} eq 'manageresv') {
+        $allavailable = $available;
+        undef($available);
+        undef($got_slots);
         my $crstype = &Apache::loncommon::course_type();
-        &manage_reservations($r,$crstype);
+        &manage_reservations($r,$crstype,\%slots,$consumed_uniqueperiods,$allavailable);
     } elsif ($env{'form.command'} eq 'showresv') {
         &show_reservations($r,$env{'form.uname'},$env{'form.udom'});
     } elsif ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
@@ -2656,7 +3314,7 @@ sub handler {
 	    }
 	    &csv_upload_map($r);
 	}
-    } elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') {
+    } elsif (($env{'form.command'} eq 'slotlog') && ($vgr eq 'F')) {
         &show_reservations_log($r);
     } else {
 	my $symb=&unescape($env{'form.symb'});
@@ -2678,12 +3336,15 @@ sub handler {
 	my ($status) = &Apache::lonhomework::check_slot_access('0',$type);
 	if ($status eq 'CAN_ANSWER' ||
 	    $status eq 'NEEDS_CHECKIN' ||
-	    $status eq 'WAITING_FOR_GRADE') {
+	    $status eq 'WAITING_FOR_GRADE' ||
+            $status eq 'NEED_DIFFERENT_IP') {
 	    &fail($r,'not_allowed');
 	    return OK;
 	}
 	if ($env{'form.requestattempt'}) {
-	    &show_choices($r,$symb);
+            $r->print('<div class="LC_left_float">'); 
+	    $r->print(&show_choices($symb,undef,undef,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots));
+            $r->print('</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
 	} elsif ($env{'form.command'} eq 'release') {
 	    &release_slot($r,$symb);
 	} elsif ($env{'form.command'} eq 'get') {