--- loncom/interface/lonnavmaps.pm	2004/08/29 04:09:27	1.282
+++ loncom/interface/lonnavmaps.pm	2004/08/31 15:28:03	1.285
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.282 2004/08/29 04:09:27 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.285 2004/08/31 15:28:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -262,13 +262,13 @@ ENDSUBM
               &Apache::loncommon::bodytag('Navigate Course Contents','',
 					  $addentries,$body_only,'',
 					  $ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>'.
-	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+    $r->print('<script>window.focus();</script>');
      
     $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
+	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
                   '</body></html>');
         return OK;
@@ -396,7 +396,7 @@ ENDSUBM
                  </nobr>
                </form>");
     # renderer call
-    my $renderArgs = { 'cols' => [0,2,3],
+    my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $ENV{'form.sort'},
                        'url' => '/adm/navmaps',
                        'navmap' => $navmap,
@@ -1580,6 +1580,13 @@ END
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
+        $result .= '<table><tr><td>'.
+                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+	if ($ENV{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
+        } else {
+	    $result .= '</tr><tr>'; 
+        }
 	$result.=&show_linkitems($args->{'linkitems'});
         if ($args->{'sort_html'}) {
 	    if ($ENV{'environment.remotenavmap'} ne 'on') {
@@ -1916,6 +1923,7 @@ sub show_linkitems {
 		     "uncompleted","changefolder","clearbubbles");
     
     my $result .= (<<ENDBLOCK);
+              <td align="left">
 <script type="text/javascript">
     function changeNavDisplay () {
 	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
@@ -1926,7 +1934,6 @@ ENDBLOCK
     }
     $result.='}
               </script>
-              <table><tr><td align="left">
                    <form name="linkitems" method="post">
                        <nobr><select name="toplink">'."\n";
     foreach my $link (@linkorder) {
@@ -4026,6 +4033,7 @@ sub extractParts {
         }
         
 
+        # These hashes probably do not need names that end with "Hash"....
         my %responseIdHash;
         my %responseTypeHash;
 
@@ -4041,6 +4049,8 @@ sub extractParts {
         # So we have to use our knowlege of part names to figure out 
         # where the part names begin and end, and even then, it is possible
         # to construct ambiguous situations.
+        #
+        my %response_type_by_id;
         foreach (split /,/, $metadata) {
             if ($_ =~ /^([a-zA-Z]+)response_(.*)/) {
                 my $responseType = $1;
@@ -4056,11 +4066,14 @@ sub extractParts {
                         my $responseId = join('_', @otherChunks);
                         push @{$responseIdHash{$partIdSoFar}}, $responseId;
                         push @{$responseTypeHash{$partIdSoFar}}, $responseType;
+                        $response_type_by_id{$responseId} = $responseType;
                     }
                 }
             }
         }
 	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+        #
+        # Reorder the arrays in the %responseIdHash and %responseTypeHash
 	if ($resorder) {
 	    my @resorder=split(/,/,$resorder);
 	    foreach my $part (keys(%responseIdHash)) {
@@ -4074,6 +4087,15 @@ sub extractParts {
 		$responseIdHash{$part}=\@neworder;	
 	    }
 	}
+        #
+        # Reorder the response types
+        foreach my $partid (keys(%responseIdHash)) {
+            delete($responseTypeHash{$partid});
+            foreach my $respid (@{$responseIdHash{$partid}}) {
+                push(@{$responseTypeHash{$partid}},
+                     $response_type_by_id{$respid});
+            }
+        }
         $self->{RESPONSE_IDS} = \%responseIdHash;
         $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }