--- loncom/interface/lonhtmlcommon.pm	2008/12/10 10:29:43	1.194
+++ loncom/interface/lonhtmlcommon.pm	2009/01/22 14:26:04	1.199
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.194 2008/12/10 10:29:43 amueller Exp $
+# $Id: lonhtmlcommon.pm,v 1.199 2009/01/22 14:26:04 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1278,6 +1278,8 @@ Inputs: $component (the large text on th
         $menulink (boolean, controls whether to include a link to /adm/menu)
         $helplink (if 'nohelp' don't include the orange help link)
         $css_class (optional name for the class to apply to the table for CSS)
+        $no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
+           when including the text on the right.
 Returns a string containing breadcrumbs for the current page.
 
 =item clear_breadcrumbs
@@ -1303,10 +1305,11 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
+        my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_;
         #
 	$css_class ||= 'LC_breadcrumbs';
-        my $Str = "\n".'<table class="'.$css_class.'"><tr><td><ol id="MenuBreadcrumbs">';
+        my $Str1 = '<ol id="LC_MenuBreadcrumbs">';
+        my $Str = '';
         #
         # Make the faq and bug data cascade
         my $faq = '';
@@ -1380,23 +1383,27 @@ returns: nothing
 							 $faq,$bug);
 	}
         #
-        $Str .= $links.'</ol></td>';
+        $Str1 .= $links.'</ol>';
         #
         if (defined($component)) {
-            $Str .= '<td class="'.$css_class.'_component">'.
-                &mt($component);
+            $Str .= "\n".'<table class="'.$css_class.'">'
+                   .'<tr><td class="'.$css_class.'_component">';
+            if ($no_mt) {
+                $Str .= $component;
+            } else {
+                $Str .= &mt($component);
+            }
 	    if ($icons ne '') {
 		$Str .= '&nbsp;'.$icons;
 	    }
-	    $Str .= '</td>';
+	    $Str .= '</td></tr></table>'."\n";
         }
-        $Str .= '</tr></table>'."\n";
         #
         # Return the @Crumbs stack to what we started with
         push(@Crumbs,$last);
         shift(@Crumbs);
         #
-        return $Str;
+        return "$Str\n$Str1";
     }
 
     sub clear_breadcrumbs {
@@ -1546,7 +1553,7 @@ sub role_select_row {
         $output = &row_title($title,$css_class);
     }
     $output .= qq|
-                                  <select name="roles" multiple >\n|;
+                                  <select name="roles" multiple="multiple">\n|;
     foreach my $role (@$roles) {
         my $plrole;
         if ($role eq 'ow') {
@@ -1673,7 +1680,7 @@ sub status_select_row {
         $output = &row_title($title,$css_class,'LC_pick_box_select');
     }
     $output .= qq|
-                                    <select name="types" multiple>\n|;
+                                    <select name="types" multiple="multiple">\n|;
     foreach my $status_type (sort(keys(%{$types}))) {
         $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
     }
@@ -2053,17 +2060,17 @@ END
 
 sub generate_menu {
     my @menu = @_;
-    my $menu_html = qq|<div class="columnSection">|;
+    my $menu_html = qq|<div class="LC_columnSection">|;
 
     foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
-	$menu_html .='<div class="ContentBoxSpecial">
-			<h3 class="hcell">'.mt($category->{'categorytitle'}).'</h3>
-			<ul class="ListStyleNormal">';
+	$menu_html .='<div class="LC_ContentBoxSpecial">
+			<h3 class="LC_hcell">'.mt($category->{'categorytitle'}).'</h3>
+			<ul class="LC_ListStyleNormal">';
 	foreach my $item ( @{ $category->{items} } ) {
 	    next unless $item->{'permission'};
 	    $menu_html .= qq|<li class="LC_menubuttons_inline_text"><a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">';
             if($item->{'icon'}){
-                $menu_html .= qq|<img class ="noBorder middle" src="/res/adm/pages/$item->{'icon'}" alt="|;
+                $menu_html .= qq|<img class ="LC_noBorder LC_middle" src="/res/adm/pages/$item->{'icon'}" alt="|;
 		if($item->{'alttext'}){
 		    $menu_html .= $item->{'alttext'}.'"/></a>';
 		} else { #use linktext as alt text for the icon
@@ -2077,7 +2084,7 @@ sub generate_menu {
 	    }
 	    $menu_html .= '</li>';
 	}
-	$menu_html .= '</div>';
+	$menu_html .= '</ul></div>';
     }
     $menu_html .= qq|</div>|;
     return $menu_html;