--- loncom/interface/lonnavmaps.pm	2015/06/19 15:36:53	1.508
+++ loncom/interface/lonnavmaps.pm	2016/03/02 00:51:15	1.513
@@ -1,8 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.508 2015/06/19 15:36:53 damieng Exp $
-
+# $Id: lonnavmaps.pm,v 1.513 2016/03/02 00:51:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -624,44 +623,52 @@ sub getDescription {
     if ($status == $res->OPEN_LATER) {
         return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part));
     }
+    my $slotinfo;
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
             my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
+            my $slotmsg;
             if ($slot_status == $res->UNKNOWN) {
-                return &mt('Reservation status unknown');
+                $slotmsg = &mt('Reservation status unknown');
             } elsif ($slot_status == $res->RESERVED) {
-                return &mt('Reserved - ends [_1]',
+                $slotmsg = &mt('Reserved - ends [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVED_LOCATION) {
-                return &mt('Reserved - specific location(s) - ends [_1]',
+                $slotmsg = &mt('Reserved - specific location(s) - ends [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVED_LATER) {
-                return &mt('Reserved - next open [_1]',
+                $slotmsg = &mt('Reserved - next open [_1]',
                            timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->RESERVABLE) {
-                return &mt('Reservable, reservations close [_1]',
+                $slotmsg = &mt('Reservable, reservations close [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
-                return &mt('Reservable, reservations open [_1]',
+                $slotmsg = &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');
+                $slotmsg = &mt('Reserve a time/place to work');
             } elsif ($slot_status == $res->NOTRESERVABLE) {
-                return &mt('Reservation not available');
+                $slotmsg = &mt('Reservation not available');
             } elsif ($slot_status == $res->WAITING_FOR_GRADE) {
-                return &mt('Submission in grading queue');
+                $slotmsg = &mt('Submission in grading queue');
+            }
+            if ($slotmsg) {
+                if ($res->is_task() || !$due) {
+                     return $slotmsg;
+                }
+                $slotinfo = (' ' x 2).'('.$slotmsg.')';
             }
         }
     }
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part));
+		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part)).$slotinfo;
 	    } else {
-		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part));
+		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)).$slotinfo;
 	    }
         } else {
-            return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part);
+            return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
@@ -907,6 +914,9 @@ sub render_resource {
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
+    if ($resource->ext()) {
+        $link =~ s/\#.+(\?)/$1/g;
+    }
 
     #  The URL part is not escaped at this point, but the symb is... 
 
@@ -2871,7 +2881,7 @@ sub getcourseparam {
     # 
     # We want the course level stuff from the way
     # parmval_real operates 
-    # TODO: Fator some of this stuff out of
+    # TODO: Factor some of this stuff out of
     # both parmval_real and here
     #
     my $courselevel = $cid . '.' .  $what;
@@ -2888,7 +2898,7 @@ sub getcourseparam {
     }
     # Try for the group's course level option:
 
-    if ($uname ne '' and defined($courseopt)) {
+    if ($cgroup ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$grplevel})) {
 	    return $$courseopt{$grplevel};
 	}
@@ -2896,12 +2906,12 @@ sub getcourseparam {
 
     #  Try for section level parameters:
 
-    if ($csec and defined($courseopt)) {
+    if ($csec ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$seclevel})) {
 	    return $$courseopt{$seclevel};
 	}
     }
-    # Try for 'additional' course parameterse:
+    # Try for 'additional' course parameters:
 
     if (defined($courseopt)) {
 	if (defined($$courseopt{$courselevel})) {
@@ -5465,18 +5475,61 @@ sub check_for_slot {
         my $reservable = &Apache::lonnet::get_reservable_slots($cnum,$cdom,$env{'user.name'},
                                                                $env{'user.domain'});
         if (ref($reservable) eq 'HASH') {
+            my ($map) = &Apache::lonnet::decode_symb($symb);
             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)) {
+                    my $canuse;
+                    if ($reservable->{'now'}{$slot}{'symb'} eq '') {
+                        $canuse = 1;
+                    } else {
+                        my %oksymbs;
+                        my @slotsymbs = split(/\s*,\s*/,$reservable->{'now'}{$slot}{'symb'});
+                        map { $oksymbs{$_} = 1; } @slotsymbs;
+                        if ($oksymbs{$symb}) {
+                            $canuse = 1;
+                        } else {
+                            foreach my $item (@slotsymbs) {
+                                if ($item =~ /\.(page|sequence)$/) {
+                                    (undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
+                                    if (($map ne '') && ($map eq $sloturl)) {
+                                        $canuse = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if ($canuse) {
                         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)) {
+                    my $canuse;
+                    if ($reservable->{'future'}{$slot}{'symb'} eq '') {
+                        $canuse = 1;
+                    } elsif ($reservable->{'future'}{$slot}{'symb'} =~ /,/) {
+                        my %oksymbs;
+                        my @slotsymbs = split(/\s*,\s*/,$reservable->{'future'}{$slot}{'symb'});
+                        map { $oksymbs{$_} = 1; } @slotsymbs;
+                        if ($oksymbs{$symb}) {
+                            $canuse = 1;
+                        } else {
+                            foreach my $item (@slotsymbs) {
+                                if ($item =~ /\.(page|sequence)$/) {
+                                    (undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
+                                    if (($map ne '') && ($map eq $sloturl)) {
+                                        $canuse = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    } elsif ($reservable->{'future'}{$slot}{'symb'} eq $symb) {
+                        $canuse = 1;
+                    }
+                    if ($canuse) {
                         return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'});
                     }
                 }