--- loncom/interface/lonnavmaps.pm	2011/11/29 11:58:53	1.470
+++ loncom/interface/lonnavmaps.pm	2011/12/25 19:39:08	1.476
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.470 2011/11/29 11:58:53 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.476 2011/12/25 19:39:08 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -464,7 +464,7 @@ returns 4
 
 =item add_linkitem()
 
-=item show_linkitems()
+=item show_linkitems_toolbar()
 
 =back
 
@@ -542,9 +542,6 @@ my %colormap =
 # is not yet done and due in less than 24 hours
 my $hurryUpColor = "#FF0000";
 
-my $future_slots_checked = 0;
-my $future_slots = 0;
-
 sub addToFilter {
     my $hashIn = shift;
     my $addition = shift;
@@ -635,10 +632,10 @@ sub getDescription {
                 return &mt('Reserved - next open [_1]',
                            timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->RESERVABLE) {
-                return &mt('Reservable ending [_1]',
+                return &mt('Reservable, reservations close [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
-                return &mt('Reservable starting [_1]',
+                return &mt('Reservable, reservations open [_1]',
                            timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->NOT_IN_A_SLOT) {
                 return &mt('Reserve a time/place to work');
@@ -1013,8 +1010,8 @@ sub render_resource {
     # Is this the current resource?
     if (!$params->{'displayedHereMarker'} && 
         $resource->symb() eq $params->{'here'} ) {
-        $curMarkerBegin = '<em>';
-        $curMarkerEnd = '</em>';
+        $curMarkerBegin = '<span class="LC_current_nav_location">';
+        $curMarkerEnd = '</span>';
 	$params->{'displayedHereMarker'} = 1;
     }
 
@@ -1506,19 +1503,20 @@ END
             }
 	}
 	$result.='</form>';
+        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
+                "uploaded/$cdom/$cnum/default.sequence") {
+                &add_linkitem($args->{'linkitems'},'edittoplevel',
+                              "javascript:gocmd('/adm/coursedocs','direct');",
+                              'Content Editor');
+            }
+        }
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
-        $result .= '<table><tr><td>'.
-                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
-	    $result .= '<td>&nbsp;</td>'; 
-	$result.='<td class="LC_middle">'.&mt('Tools:').'</td>';
-	$result.=&show_linkitems_toolbar($args->{'linkitems'});
-        if ($args->{'sort_html'}) {
-            $result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
-                '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
-        }
-        $result .= '</table>';
+        $result .= &show_linkitems_toolbar($args,$condition);
     } elsif ($args->{'sort_html'}) { 
         $result.=$args->{'sort_html'}; 
     }
@@ -1856,37 +1854,52 @@ sub add_linkitem {
 }
 
 sub show_linkitems_toolbar {
-    my ($linkitems,$condition)=@_;
-    my @linkorder = ('firsthomework','everything','uncompleted',
-                     'changefolder','clearbubbles');
-    my $result .='<td align="left">'."\n". 
-                 '<span class="LC_nobreak">'."\n".
-                 '<ul id="LC_toolbar">';
-    foreach my $link (@linkorder) {
-        my $link_id = 'LC_content_toolbar_'.$link;
-        if (defined($linkitems->{$link})) {
-            if ($linkitems->{$link}{'text'} ne '') {
-                $linkitems->{$link}{'cmd'}=~s/"/'/g;
-                if ($linkitems->{$link}{'cmd'}) {
-                    if ($link eq 'changefolder') {
-                        if ($condition) {
-                            $link_id='LC_content_toolbar_changefolder_toggled';
-                        } else {
-                            $link_id='LC_content_toolbar_changefolder';
+    my ($args,$condition) = @_;
+    my $result = 
+        '<table><tr><td>'.
+        &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').
+        '</td>'.
+        '<td>&nbsp;</td>'.
+        '<td class="LC_middle">'.&mt('Tools:').'</td>';
+    if (ref($args) eq 'HASH') {
+        if (ref($args->{'linkitems'}) eq 'HASH') {
+            my @linkorder = ('firsthomework','everything','uncompleted',
+                             'changefolder','clearbubbles','edittoplevel');
+            $result .='<td align="left">'."\n". 
+                      '<span class="LC_nobreak">'."\n".
+                      '<ul id="LC_toolbar">';
+            foreach my $link (@linkorder) {
+                my $link_id = 'LC_content_toolbar_'.$link;
+                if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
+                    if ($args->{'linkitems'}{$link}{'text'} ne '') {
+                        $args->{'linkitems'}{$link}{'cmd'}=~s/"/'/g;
+                        if ($args->{'linkitems'}{$link}{'cmd'}) {
+                            if ($link eq 'changefolder') {
+                                if ($condition) {
+                                    $link_id='LC_content_toolbar_changefolder_toggled';
+                                } else {
+                                    $link_id='LC_content_toolbar_changefolder';
+                                }
+                            }
+                            $result .= '<li><a href="#" '.
+                                       'onclick="'.$args->{'linkitems'}{$link}{'cmd'}.'" '.
+                                       'id="'.$link_id.'" '.
+                                       'class="LC_toolbarItem" '.
+                                       'title="'.$args->{'linkitems'}{$link}{'text'}.'">'.
+                                       '</a></li>'."\n";
                         }
                     }
-                    $result .= '<li><a href="#" '.
-                               'onclick="'.$linkitems->{$link}{'cmd'}.'" '.
-                               'id="'.$link_id.'" '.
-                               'class="LC_toolbarItem" '.
-                               'title="'.$linkitems->{$link}{'text'}.'">'.
-                               '</a></li>'."\n";
                 }
             }
+            $result .= '</ul>'.
+                       '</span></td>'."\n";
+        }
+        if ($args->{'sort_html'}) {
+            $result .= '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+                       '<td align="right">'.$args->{'sort_html'}.'</td>';
         }
     }
-    $result .= '</ul>'.
-               '</span></td>'."\n";
+    $result .= '</tr></table>';
     return $result;
 }
 
@@ -5090,12 +5103,13 @@ sub status {
     }
 
     # Otherwise, it's untried and open
-    return OPEN; 
+    return OPEN;
 }
 
 sub check_for_slot {
     my $self = shift;
     my $part = shift;
+    my $symb = $self->symb();
     my ($use_slots,$available,$availablestudent) = $self->slot_control($part);
     if (($use_slots ne '') && ($use_slots !~ /^\s*no\s*$/i)) {
         my @slots = (split(/:/,$availablestudent),split(/:/,$available));
@@ -5103,50 +5117,45 @@ sub check_for_slot {
         my $cdom=$env{'course.'.$cid.'.domain'};
         my $cnum=$env{'course.'.$cid.'.num'};
         my $now = time;
+        my $num_usable_slots = 0;
         if (@slots > 0) {
             my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
             if (&Apache::lonnet::error(%slots)) {
                 return (UNKNOWN);
             }
-            my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots);
+            my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
             my ($checkedin,$checkedinslot);
             foreach my $slot_name (@sorted_slots) {
-                next if (!defined($slots{$slot_name}) ||
-                         !ref($slots{$slot_name}));
+                next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name}));
                 my $end = $slots{$slot_name}->{'endtime'};
                 my $start = $slots{$slot_name}->{'starttime'};
                 my $ip = $slots{$slot_name}->{'ip'};
                 if ($self->simpleStatus() == OPEN) {
-                    my $startreserve = $slots{$slot_name}->{'startreserve'};
-                    my @proctors;
-                    if ($slots{$slot_name}->{'proctor'} ne '') {
-                        @proctors = split(',',$slots{$slot_name}->{'proctor'});
-                    }
                     if ($end > $now) {
-                        ($checkedin,$checkedinslot) = $self->checkedin();
-                        if ($startreserve < $now) {
-                            if ($start > $now) {
-                                return (RESERVED_LATER,$start,$slot_name);
-                            } else {
-                                if ($ip ne '') {
-                                    if (!&Apache::loncommon::check_ip_acc($ip)) {
-                                        return (RESERVED_LOCATION,$ip,$slot_name);
-                                    }
-                                } 
-                                if (@proctors > 0) {
-                                    unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
-                                        ($checkedinslot eq $slot_name)) {
-                                        return (NEEDS_CHECKIN,undef,$slot_name); 
-                                    }
+                        if ($start > $now) {
+                            return (RESERVED_LATER,$start,$slot_name);
+                        } else {
+                            if ($ip ne '') {
+                                if (!&Apache::loncommon::check_ip_acc($ip)) {
+                                    return (RESERVED_LOCATION,$ip,$slot_name);
                                 }
-                                return (RESERVED,$end,$slot_name);
                             }
-                        } else {
-                            if ($start > $now) {
-                                return (RESERVABLE,$startreserve,$slot_name);
+                            my @proctors;
+                            if ($slots{$slot_name}->{'proctor'} ne '') {
+                                @proctors = split(',',$slots{$slot_name}->{'proctor'});
                             }
+                            if (@proctors > 0) {
+                                ($checkedin,$checkedinslot) = $self->checkedin();
+                                unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
+                                        ($checkedinslot eq $slot_name)) {
+                                    return (NEEDS_CHECKIN,undef,$slot_name); 
+                                }
+                            }
+                            return (RESERVED,$end,$slot_name);
                         }
                     }
+                } elsif ($end > $now) {
+                    $num_usable_slots ++;
                 }
             }
             my ($is_correct,$got_grade);
@@ -5167,32 +5176,33 @@ sub check_for_slot {
                     return (CORRECT); 
                 }
             }
-            return(NOT_IN_A_SLOT);
-        } else {
-            if (!$future_slots_checked) {
-                $future_slots = &get_future_slots($cdom,$cnum,$now);
-                $future_slots_checked = 1;
-            }
-            if ($future_slots) {
+            if ($num_usable_slots) {
                 return(NOT_IN_A_SLOT);
             }
-            return(NOTRESERVABLE);
         }
-    }
-    return;
-}
-
-sub get_future_slots {
-    my ($cdom,$cnum,$now) = @_;
-    my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
-    my $future_slots = 0;
-    foreach my $slot (keys(%slots)) {
-        if (($slots{$slot}->{'starttime'} > $now) &&
-            ($slots{$slot}->{'endtime'} > $now)) {
-            $future_slots ++;
+        my $reservable = &Apache::lonnet::get_reservable_slots($cnum,$cdom,$env{'user.name'},
+                                                               $env{'user.domain'});
+        if (ref($reservable) eq 'HASH') {
+            if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {
+                foreach my $slot (reverse (@{$reservable->{'now_order'}})) {
+                    if (($reservable->{'now'}{$slot}{'symb'} eq '') ||
+                        ($reservable->{'now'}{$slot}{'symb'} eq $symb)) {
+                        return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'});
+                    }
+                }
+            }
+            if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {
+                foreach my $slot (@{$reservable->{'future_order'}}) {
+                    if (($reservable->{'future'}{$slot}{'symb'} eq '') ||
+                        ($reservable->{'future'}{$slot}{'symb'} eq $symb)) {
+                        return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'});
+                    }
+                }
+            }
         }
+        return(NOTRESERVABLE);
     }
-    return $future_slots;
+    return;
 }
 
 sub CLOSED { return 23; }