--- loncom/interface/lonhtmlcommon.pm	2008/11/21 15:22:04	1.184
+++ loncom/interface/lonhtmlcommon.pm	2008/12/01 21:54:23	1.189
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.184 2008/11/21 15:22:04 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.189 2008/12/01 21:54:23 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1708,6 +1708,7 @@ sub email_default_row {
 
 sub submit_row {
     my ($title,$cmd,$submit_text,$css_class) = @_;
+    $submit_text = &mt($submit_text);
     my $output = &row_title($title,$css_class,'LC_pick_box_submit');
     $output .= qq|
              <br />
@@ -2020,6 +2021,7 @@ END
 #			permission  =>	'Contains permissions as returned from lonnet::allowed(),
 #					 must evaluate to true in order to activate the link',
 #			icon        =>  'icon filename',
+#			alttext	    =>	'alt text for the icon',
 #			help	    =>	'Name of the corresponding helpfile',
 #			linktitle   =>	'Description of the link (used for title tag)'
 #		    },
@@ -2037,32 +2039,38 @@ END
 # Don't rely on its current functionality as it might be 
 # changed or removed.
 # TODO:
-# add icon field
-# add alt tag for icon
 # check for empty values
 # --------------------------
 
 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="ContentBox">
+			<h3 class="">'.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 .= $item->{'alttext'}.'"/></a>';
+		} else { #use linktext as alt text for the icon
+		    $menu_html .= qq|$item->{'linktext'}"/></a>|;
+                } 
             }
-            $menu_html .= &mt($item->{'linktext'}).'</a>';
-#	    if (exists($item->{'help'})) {
-#		$menu_html .= &Apache::loncommon::help_open_topic($item->{'help'});
-#	    }
+	    $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 .= '</li>';
 	}
 	$menu_html .= '</div>';
     }
+    $menu_html .= qq|</div>|;
     return $menu_html;
 }