--- loncom/interface/lonnavmaps.pm	2010/03/16 19:55:49	1.445
+++ loncom/interface/lonnavmaps.pm	2010/03/29 14:50:46	1.446
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.445 2010/03/16 19:55:49 droeschl Exp $
+# $Id: lonnavmaps.pm,v 1.446 2010/03/29 14:50:46 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1400,19 +1400,22 @@ sub render {
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
 	my ($link,$text);
         if ($condition) {
-	    $link='"navmaps?condition=0&filter=&'.$queryString.
-		'&here='.&escape($here).'"';
+	    $link='navmaps?condition=0&filter=&'.$queryString.
+		'&here='.&escape($here);
 	    $text='Close all folders';
         } else {
-	    $link='"navmaps?condition=1&filter=&'.$queryString.
-		'&here='.&escape($here).'"';
+	    $link='navmaps?condition=1&filter=&'.$queryString.
+		'&here='.&escape($here);
 	    $text='Open all folders';
         }
+        if ($env{'form.register'}) {
+            $link .= '&register='.$env{'form.register'};
+        }
 	if ($args->{'caller'} eq 'navmapsdisplay') {
 	    &add_linkitem($args->{'linkitems'},'changefolder',
-			  'location.href='.$link,$text);
+			  "location.href='$link'",$text);
 	} else {
-	    $result.='<a href='.$link.'>'.&mt($text).'</a>';
+	    $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
 	}
         $result .= "\n";
     }
@@ -1428,6 +1431,9 @@ sub render {
 	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
 	<input type="hidden" name="navtime" value="$time" />
 END
+        if ($env{'form.register'}) {
+            $result .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />';
+        }
         if ($args->{'sort'} eq 'discussion') { 
 	    my $totdisc = 0;
 	    my $haveDisc = '';
@@ -1449,12 +1455,11 @@ END
 	$result.='</form>';
     }
 
-   
     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.='<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>'.
@@ -1825,7 +1830,7 @@ ENDBLOCK
 	}
     }
     $result .= '</select>&nbsp;<input type="button" name="chgnav"
-                   value="Go" onClick="javascript:changeNavDisplay()" />
+                   value="Go" onclick="javascript:changeNavDisplay()" />
                 </span></form></td>'."\n";
 	
     return $result;
@@ -1833,35 +1838,36 @@ ENDBLOCK
 
 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";
-		}
-
-	    }
-	}
+    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';
+                        }
+                    }
+                    $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";
-	
+    $result .= '</ul>'.
+               '</span></td>'."\n";
     return $result;
 }