--- loncom/interface/lonnavmaps.pm	2009/02/24 22:05:26	1.427
+++ loncom/interface/lonnavmaps.pm	2009/02/25 21:06:27	1.430
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.427 2009/02/24 22:05:26 droeschl Exp $
+# $Id: lonnavmaps.pm,v 1.430 2009/02/25 21:06:27 schulted Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -865,7 +865,7 @@ 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' alt='Branch' />";
+        $newBranchText = "<img src='$location/branch.gif' alt=".mt('Branch')." />";
     }
 
     # links to open and close the folder
@@ -962,7 +962,7 @@ sub render_resource {
     # Is this the current resource?
     if (!$params->{'displayedHereMarker'} && 
         $resource->symb() eq $params->{'here'} ) {
-        $curMarkerBegin = '<em style="font-weight:bold;">';
+        $curMarkerBegin = '<em>';
         $curMarkerEnd = '</em>';
 	$params->{'displayedHereMarker'} = 1;
     }
@@ -1463,7 +1463,7 @@ END
         } else {
 	    $result .= '</tr><tr>'; 
         }
-	$result.=&show_linkitems($args->{'linkitems'});
+	$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>'.
@@ -1486,7 +1486,6 @@ END
     }
     # End parameter setting
     
-    $result .= "\n<table id=\"LC_nav_location\">\n<tbody>\n<tr>\n<td class=\"LC_current_location\"> &nbsp; </td>\n</tr>\n</tbody>\n</table>\n";
     $result .= "<br />\n";
 
     # Data
@@ -1505,7 +1504,7 @@ END
     $args->{'isNewBranch'} = 0;
     $args->{'condensed'} = 0;   
 
-    my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21_21.gif");
+    my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
     $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' alt='' />");
     $args->{'displayedHereMarker'} = 0;
 
@@ -1847,6 +1846,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;