--- loncom/interface/lonnavmaps.pm	2009/09/23 14:30:45	1.423.4.2
+++ loncom/interface/lonnavmaps.pm	2009/12/27 01:31:05	1.441
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.423.4.2 2009/09/23 14:30:45 gci Exp $
+# $Id: lonnavmaps.pm,v 1.441 2009/12/27 01:31:05 raeburn Exp $
+
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -504,10 +505,13 @@ my %statusIconMap =
      $resObj->ERROR        => ''
      );
 
-my %iconAltTags = 
-    ( 'navmap.correct.gif' => 'Correct',
-      'navmap.wrong.gif'   => 'Incorrect',
-      'navmap.open.gif'    => 'Open' );
+my %iconAltTags =   #texthash does not work here
+    ( 'navmap.correct.gif'  => 'Correct',
+      'navmap.wrong.gif'    => 'Incorrect',
+      'navmap.open.gif'     => 'Open',
+      'navmap.partial.gif'  => 'Partially Correct',
+      'navmap.ellipsis.gif' => 'Attempted',
+     );
 
 # Defines a status->color mapping, null string means don't color
 my %colormap = 
@@ -597,7 +601,7 @@ sub getLinkForResource {
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
 	    if ($map=~/\.page$/) {
 		my $url=&Apache::lonnet::clutter($map);
-		$anchor=&escape($src->shown_symb());
+		$anchor=&escape($res->shown_symb());
 		return ($url,$res->shown_symb(),$anchor);
 	    }
         }
@@ -695,11 +699,7 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt("Answer submitted, not yet graded");
-        }
+        return &mt("Answer submitted, not yet graded");
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -719,11 +719,7 @@ sub getDescription {
         }
     }
     if ($status == $res->ANSWER_SUBMITTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt('Answer submitted');
-        }
+        return &mt('Answer submitted');
     }
 }
 
@@ -888,11 +884,6 @@ sub render_resource {
     my $link = $params->{"resourceLink"};
 
     #  The URL part is not escaped at this point, but the symb is... 
-    #  The stuff to the left of the ? must have ' replaced by \' since
-    #  it will be quoted with ' in the href.
-
-    my ($left,$right) = split(/\?/, $link);
-    $link = $left.'?'.$right;
 
     my $src = $resource->src();
     my $it = $params->{"iterator"};
@@ -905,35 +896,32 @@ sub render_resource {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = '<img src="'.$location.'/branch.gif" border="0" alt="'.
-                         &mt('Branch').'" />';
+        $newBranchText = "<img src='$location/branch.gif' alt=".mt('Branch')." />";
     }
 
     # links to open and close the folder
 
-    
-    my $linkopen = "<a href=\"$link\">";
-
-
+    my $whitespace = $location.'/whitespace_21.gif';
+    my $linkopen = "<img src='$whitespace' alt='' />"."<a href=\"$link\">";
     my $linkclose = "</a>";
 
     # Default icon: unknown page
-    my $icon = "<img src='$location/unknown.gif' alt='' border='0' alt='&nbsp;&nbsp;' ' />";
+    my $icon = "<img class=\"LC_contentImage\" src='$location/unknown.gif' alt='' />";
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-	    $icon = '<img src="'.$location.'/';
+	    $icon = '<img class="LC_contentImage" src="'.$location.'/';
 	    if ($resource->is_task()) {
 		$icon .= 'task.gif" alt="'.&mt('Task');
 	    } else {
 		$icon .= 'problem.gif" alt="'.&mt('Problem');
 	    }
-	    $icon .='" border="0" />';
+	    $icon .='" />';
         } else {
             $icon = $params->{'indentString'};
         }
     } else {
-	$icon = "<img src='".&Apache::loncommon::icon($resource->src)."' alt='&nbsp;&nbsp;' border='0' />";
+	$icon = "<img class=\"LC_contentImage\" src='".&Apache::loncommon::icon($resource->src)."' alt='' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -943,15 +931,15 @@ sub render_resource {
         if ($it->{CONDITION}) {
             $nowOpen = !$nowOpen;
         }
-
+	
 	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
         my $title=$resource->title;
-        $title=~s/\"/\&quot;/g;
+		$title=~s/\"/\&qout;/g;
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-	    $icon = "<img src='$location/$icon' alt=\"".
-		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
-
+            $icon = "<img src='$location/arrow." . ($nowOpen ? 'closed' : 'open') . ".gif' alt='' />"
+                    ."<img class=\"LC_contentImage\" src='$location/$icon' alt=\""
+                    .($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" />";			
             $linkopen = "<a href=\"" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&amp;filter=';
             $linkopen .= ($nowOpen xor $it->{CONDITION}) ?
@@ -966,10 +954,8 @@ sub render_resource {
 
         } else {
             # Don't allow users to manipulate folder
-            $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
-                '.nomanip.gif';
-            $icon = "<img src='$location/$icon' alt=\"".
-		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
+            $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
+            $icon = "<img class=\"LC_space\" src='$whitespace' alt='' />"."<img class=\"LC_contentImage\" src='$location/$icon' alt=\"".($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" />";
 
             $linkopen = "";
             $linkclose = "";
@@ -985,10 +971,11 @@ sub render_resource {
     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
         $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
     }
- 
-    # We're done preparing and finally ready to start the rendering
-    my $result = "<td align='left' valign='middle'>";
 
+    # We're done preparing and finally ready to start the rendering
+    my $result = '<td class="LC_middle">';
+    my $newfolderType = $resource->is_sequence() ? 'folder' : 'page';
+	
     my $indentLevel = $params->{'indentLevel'};
     if ($newBranchText) { $indentLevel--; }
 
@@ -998,7 +985,6 @@ sub render_resource {
     }
 
     # Decide what to display
-
     $result .= "$newBranchText$linkopen$icon$linkclose";
     
     my $curMarkerBegin = '';
@@ -1007,9 +993,9 @@ sub render_resource {
     # Is this the current resource?
     if (!$params->{'displayedHereMarker'} && 
         $resource->symb() eq $params->{'here'} ) {
-        $curMarkerBegin = '<span class="LC_fontcolor_red LC_fontsize_large">&gt;</span>';
-        $curMarkerEnd = '<span class="LC_fontcolor_red LC_fontsize_large">&lt;</span>';
-        $params->{'displayedHereMarker'} = 1;
+        $curMarkerBegin = '<em>';
+        $curMarkerEnd = '</em>';
+	$params->{'displayedHereMarker'} = 1;
     }
 
     if ($resource->is_problem() && $part ne '0' && 
@@ -1029,9 +1015,9 @@ sub render_resource {
 	$target=' target="loncapaclient" ';
     }
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "  $curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
+        $result .= "$curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
     } else {
-        $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
+        $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
     }
 
     return $result;
@@ -1051,7 +1037,7 @@ sub render_communication_status {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img alt="'.&mt('New Discussion').'" border="0" src="'.$location.'/chat.gif" />' .
+            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -1061,8 +1047,7 @@ sub render_communication_status {
             if ($msgid) {
                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" '
-                    . 'border="0" /></a>';
+                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" /></a>';
             }
         }
     }
@@ -1076,8 +1061,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" '
-                    . 'border="0" /></a>';
+                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" /></a>';
             }
         }
     }
@@ -1085,8 +1069,7 @@ sub render_communication_status {
     if ($params->{'multipart'} && $part != '0') {
 	$discussionHTML = $feedbackHTML = $errorHTML = '';
     }
-
-    return "<td width=\"75\" align=\"left\" valign=\"middle\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
+    return "<td class=\"LC_middle\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
 
 }
 sub render_quick_status {
@@ -1102,28 +1085,28 @@ sub render_quick_status {
     }
     my $linkopen = "<a $target href=\"$link\">";
     my $linkclose = "</a>";
-
+	
+	$result .= '<td class="LC_middle">';
     if ($resource->is_problem() &&
         !$firstDisplayed) {
-	
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
         if ($icon) {
 	    my $location=
 		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
-            $result .= "<td valign='middle' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
+		$result .= $linkopen.'<img src="'.$location.'" alt="'.&mt($alt).'" title="'.&mt($alt).'" />'.$linkclose;            
         } else {
-            $result .= "<td width='30'>&nbsp;</td>\n";
+            $result .= "&nbsp;";
         }
     } else { # not problem, no icon
-        $result .= "<td width='30'>&nbsp;</td>\n";
+        $result .= "&nbsp;";
     }
-
+	$result .= "</td>\n";
     return $result;
 }
 sub render_long_status {
     my ($resource, $part, $params) = @_;
-    my $result = "<td align='right' valign='middle'>\n";
+    my $result = '<td class="LC_middle LC_right">';
     my $firstDisplayed = !$params->{'condensed'} && 
         $params->{'multipart'} && $part eq "0";
                 
@@ -1427,7 +1410,7 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-
+   
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
@@ -1502,6 +1485,7 @@ END
 	$result.='</form>';
     }
 
+   
     if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.
                    &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
@@ -1510,7 +1494,8 @@ END
         } else {
 	    $result .= '</tr><tr>'; 
         }
-	$result.=&show_linkitems($args->{'linkitems'});
+	$result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";
+	$result.=&show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {
 	    if ($env{'environment.remotenavmap'} ne 'on') {
 		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
@@ -1525,31 +1510,33 @@ END
         $result.=$args->{'sort_html'}; 
     }
 
-    $result .= "<br />\n";
+    #$result .= "<br />\n";
     if ($r) {
         $r->print($result);
         $r->rflush();
         $result = "";
     }
     # End parameter setting
-            
+    
+    $result .= "<br />\n";
+
     # Data
-    $result .= '<table cellspacing="0" cellpadding="3" border="0" bgcolor="#FFFFFF">' ."\n";
+    $result.=&Apache::loncommon::start_data_table("LC_tableOfContent");    
+
     my $res = "Apache::lonnavmaps::resource";
     my %condenseStatuses =
         ( $res->NETWORK_FAILURE    => 1,
           $res->NOTHING_SET        => 1,
           $res->CORRECT            => 1 );
-    my @backgroundColors = ("#FFFFFF", "#F6F6F6");
 
     # Shared variables
     $args->{'counter'} = 0; # counts the rows
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
-    $args->{'condensed'} = 0;    
-    my $location=
-	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='&nbsp;&nbsp;' border='0' />");
+    $args->{'condensed'} = 0;   
+
+    my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
+    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' alt='' />");
     $args->{'displayedHereMarker'} = 0;
 
     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
@@ -1775,9 +1762,8 @@ END
         # show them.
         foreach my $part (@parts) {
             $rownum ++;
-            my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)];
             
-            $result .= "  <tr bgcolor='$backgroundColor'>\n";
+            $result .= &Apache::loncommon::start_data_table_row();
 
             # Set up some data about the parts that the cols might want
             my $filter = $it->{FILTER};
@@ -1803,7 +1789,7 @@ END
                 }
                 $result .= $colHTML . "\n";
             }
-            $result .= "    </tr>\n";
+            $result .= &Apache::loncommon::end_data_table_row();
             $args->{'isNewBranch'} = 0;
         }
 
@@ -1839,8 +1825,8 @@ if (location.href.indexOf('#curloc')==-1
 </script>";
     }
 
-    $result .= "</table>";
-    
+    $result.=&Apache::loncommon::end_data_table();
+
     if ($r) {
         $r->print($result);
         $result = "";
@@ -1890,6 +1876,41 @@ ENDBLOCK
     return $result;
 }
 
+sub show_linkitems_toolbar {
+    my ($linkitems,$condition)=@_;
+    my @linkorder = ("blank","launchnav","closenav","firsthomework",
+		     "everything","uncompleted","changefolder","clearbubbles");
+    
+    my $result .=' 
+              <td align="left">
+                       <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'}
+                   }
+                          $result .=  ' <li><a href="#"'.
+			    	' onClick="'.$linkitems->{$link}{'cmd'}.'"'.
+                                ' id="'.$link_id.'"'.
+                                ' class="LC_toolbarItem"'.
+			   	' title="'.$linkitems->{$link}{'text'}.'"></a></li>'."\n";
+		}
+
+	    }
+	}
+    }
+    $result .= '</ul>';
+    $result .= ' </span></td>'."\n";
+	
+    return $result;
+}
+
+
 1;
 
 
@@ -3511,7 +3532,11 @@ sub navHash {
     my $self = shift;
     my $param = shift;
     my $id = shift;
-    return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+    my $arg = $param . ($id?$self->{ID}:"");
+    if (defined($arg)) {
+        return $self->{NAV_MAP}->navhash($arg);
+    }
+    return;
 }
 
 =pod
@@ -3783,7 +3808,7 @@ sub map_contains_problem {
 sub is_sequence {
     my $self=shift;
     return $self->navHash("is_map_", 1) && 
-	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
+    $self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
 sub is_survey {
     my $self = shift();
@@ -4114,7 +4139,7 @@ sub slot_control {
     if (!defined($part)) { $part = '0'; }
     my $useslots = $self->parmval("useslots", $part);
     my $availablestudent = $self->parmval("availablestudent", $part);
-    my $available = $self->parmval("available", $part);
+    my $available = $self->parmval("available", $part); 
     return ($useslots,$availablestudent,$available);
 }
 
@@ -4549,7 +4574,7 @@ sub OPEN                   { return 1; }
 sub PAST_DUE_NO_ANSWER     { return 2; }
 sub PAST_DUE_ANSWER_LATER  { return 3; }
 sub ANSWER_OPEN            { return 4; }
-sub NOTHING_SET            { return 5; } 
+sub NOTHING_SET            { return 5; }
 sub NETWORK_FAILURE        { return 100; }
 
 # getDateStatus gets the date status for a given problem part. 
@@ -4761,9 +4786,9 @@ An answer has been submitted, but the st
 
 =cut
 
-sub TRIES_LEFT       { return 20; }
-sub ANSWER_SUBMITTED { return 21; }
-sub PARTIALLY_CORRECT{ return 22; }
+sub TRIES_LEFT        { return 20; }
+sub ANSWER_SUBMITTED  { return 21; }
+sub PARTIALLY_CORRECT { return 22; }
 
 sub RESERVED_LATER    { return 30; }
 sub RESERVED          { return 31; }
@@ -4906,11 +4931,11 @@ sub check_for_slot {
                                     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);
+                                        return (NEEDS_CHECKIN,undef,$slot_name); 
                                     }
                                 }
                                 return (RESERVED,$end,$slot_name);
@@ -4926,19 +4951,19 @@ sub check_for_slot {
             my ($is_correct,$got_grade);
             if ($self->is_task()) {
                 my $taskstatus = $self->taskstatus();
-                $is_correct = (($taskstatus eq 'pass') ||
+                $is_correct = (($taskstatus eq 'pass') || 
                                ($self->solved() =~ /^correct_/));
                 $got_grade = ($self->solved() =~ /^(?:pass|fail)$/);
             } else {
                 $got_grade = 1;
-                $is_correct = ($self->solved() =~ /^correct_/);
+                $is_correct = ($self->solved() =~ /^correct_/);   
             }
             ($checkedin,$checkedinslot) = $self->checkedin();
             if ($checkedin) {
                 if (!$got_grade) {
                     return (WAITING_FOR_GRADE);
                 } elsif ($is_correct) {
-                    return (CORRECT);
+                    return (CORRECT); 
                 }
             }
             return(NOT_IN_A_SLOT);