--- loncom/interface/lonhtmlcommon.pm	2008/11/26 23:20:56	1.186
+++ loncom/interface/lonhtmlcommon.pm	2008/12/03 18:53:54	1.190
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.186 2008/11/26 23:20:56 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.190 2008/12/03 18:53:54 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2044,30 +2044,33 @@ END
 
 sub generate_menu {
     my @menu = @_;
-    my $menu_html = '';
+    my $menu_html = qq|<div class="columnSection">|;
 
     foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
-	$menu_html .='<div class="DivContentBox"><h3 class="">'.$category->{'categorytitle'}.'</h3><ul class="ListStyleNormal">';
-	foreach my $item (@{ $category->{items} }) {
-	    next if (! $item->{'permission'});
-	    $menu_html .= '<li class="">'.
-			    qq{<a href="$item->{'url'}" title="$item->{'linktitle'}">};
+	$menu_html .='<div class="ContentBoxSpecial">
+			<h3 class="hcell">'.mt($category->{'categorytitle'}).'</h3>
+			<ul class="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 = "" src="/res/adm/pages/$item->{'icon'}" alt="};
+                $menu_html .= qq|<img class ="noBorder" src="/res/adm/pages/$item->{'icon'}" alt="|;
 		if($item->{'alttext'}){
-		    $menu_html .= qq{$item->{'alttext'}"/>};
+		    $menu_html .= $item->{'alttext'}.'"/></a>';
 		} else { #use linktext as alt text for the icon
-		    $menu_html .= qq{$item->{'linktext'}"/>};
+		    $menu_html .= qq|$item->{'linktext'}"/></a>|;
                 } 
             }
-            $menu_html .= &mt($item->{'linktext'}).'</a>';
+	    $menu_html .= qq|<a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">';
+            $menu_html .= mt($item->{'linktext'}).'</a>';
 	    if (exists($item->{'help'})) {
-		$menu_html .= &Apache::loncommon::help_open_topic($item->{'help'});
+		$menu_html .= Apache::loncommon::help_open_topic($item->{'help'});
 	    }
 	    $menu_html .= '</li>';
 	}
 	$menu_html .= '</div>';
     }
+    $menu_html .= qq|</div>|;
     return $menu_html;
 }