--- loncom/interface/lonhtmlcommon.pm	2008/11/11 20:12:17	1.183
+++ loncom/interface/lonhtmlcommon.pm	2009/01/12 01:37:57	1.197
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.183 2008/11/11 20:12:17 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.197 2009/01/12 01:37:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -467,7 +467,7 @@ document.$formname.$dname\_year.value,
     }
 </script>
 ENDJS
-    $result .= '  <span style="white-space: nowrap;">';
+    $result .= '  <span class="LC_nobreak">';
     my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
     # Month
     my @Months = qw/January February  March     April   May      June 
@@ -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,10 @@ 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>';
+        my $Str = "\n".'<table class="'.$css_class.'"><tr><td><ol id="LC_MenuBreadcrumbs">';
         #
         # Make the faq and bug data cascade
         my $faq = '';
@@ -1342,25 +1344,25 @@ returns: nothing
                      $faq = $_->{'faq'} if (exists($_->{'faq'}));
                      $bug = $_->{'bug'} if (exists($_->{'bug'}));
                      $help = $_->{'help'} if (exists($_->{'help'}));
-                     my $result = '<a href="'.$_->{'href'}.'" ';
+                     my $result = '<li><a href="'.$_->{'href'}.'" ';
                      if (defined($_->{'target'}) && $_->{'target'} ne '') {
                          $result .= 'target="'.$_->{'target'}.'" ';
                      }
 		     if ($_->{'no_mt'}) {
 			 $result .='title="'.$_->{'title'}.'">'.
-			     $_->{'text'}.'</a>';
+			     $_->{'text'}.'</a></li>';
 		     } else {
 			 $result .='title="'.&mt($_->{'title'}).'">'.
-			     &mt($_->{'text'}).'</a>';
+			     &mt($_->{'text'}).'</a></li>';
 		     }
                      $result;
                      } @Crumbs
                  );
         $links .= $crumbsymbol if ($links ne '');
 	if ($last->{'no_mt'}) {
-	    $links .= '<b>'.$last->{'text'}.'</b>';
+	    $links .= '<li><b>'.$last->{'text'}.'</b></li>';
 	} else {
-	    $links .= '<b>'.&mt($last->{'text'}).'</b>';
+	    $links .= '<li><b>'.&mt($last->{'text'}).'</b></li>';
 	}
         #
         my $icons = '';
@@ -1380,11 +1382,15 @@ returns: nothing
 							 $faq,$bug);
 	}
         #
-        $Str .= $links.'</td>';
+        $Str .= $links.'</ol></td>';
         #
         if (defined($component)) {
-            $Str .= '<td class="'.$css_class.'_component">'.
-                &mt($component);
+            $Str .= '<td class="'.$css_class.'_component">';
+            if ($no_mt) {
+                $Str .= $component;
+            } else {
+                $Str .= &mt($component);
+            }
 	    if ($icons ne '') {
 		$Str .= '&nbsp;'.$icons;
 	    }
@@ -1465,6 +1471,9 @@ returns: nothing
 # routines, but can also be called directly to start and end rows which have 
 # needs that are not accommodated by the *_select_row() routines.    
 
+{ # Start: row_count block for pick_box
+my @row_count;
+
 sub start_pick_box {
     my ($css_class) = @_;
     if (defined($css_class)) {
@@ -1472,6 +1481,7 @@ sub start_pick_box {
     } else {
 	$css_class= 'class="LC_pick_box"';
     }
+    unshift(@row_count,0);
     my $output = <<"END";
  <table $css_class>
 END
@@ -1479,6 +1489,7 @@ END
 }
 
 sub end_pick_box {
+    shift(@row_count);
     my $output = <<"END";
        </table>
 END
@@ -1493,12 +1504,13 @@ END
 }
 
 sub row_title {
+    $row_count[0]++;
+    my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
     my ($title,$css_title_class,$css_value_class) = @_;
     $css_title_class ||= 'LC_pick_box_title';
     $css_title_class = 'class="'.$css_title_class.'"';
 
     $css_value_class ||= 'LC_pick_box_value';
-    $css_value_class = 'class="'.$css_value_class.'"';
 
     if ($title ne '') {
         $title .= ':';
@@ -1508,7 +1520,7 @@ sub row_title {
             <td $css_title_class>
 	       $title
             </td>
-            <td $css_value_class>
+            <td class="$css_value_class $css_class">
 ENDONE
     return $output;
 }
@@ -1530,6 +1542,9 @@ ENDTWO
     return $output;
 }
 
+} # End: row_count block for pick_box
+
+
 sub role_select_row {
     my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
     my $output;
@@ -1708,6 +1723,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 />
@@ -2019,6 +2035,8 @@ END
 #			url	    =>	'URL the link is pointing to, i.e. /adm/site?action=dosomething',
 #			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)'
 #		    },
@@ -2035,26 +2053,39 @@ END
 # subject to change during this project.
 # Don't rely on its current functionality as it might be 
 # changed or removed.
+# TODO:
+# check for empty values
 # --------------------------
 
 sub generate_menu {
     my @menu = @_;
-    my $menu_html = '';
+    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=""><h3 class="">'.$category->{'categorytitle'}.'</h3><ul class="">';
-	foreach my $item (@{ $category->{items} }) {
-	    next if (! $item->{'permission'});
-	    $menu_html .= '<li class="">'.
-			    qq{<a href="$item->{'url'}" title="$item->{'linktitle'}">}.
-			    &mt($item->{'linktext'}).'</a>';
+	$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 ="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
+		    $menu_html .= qq|$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 .= '</ul></div>';
     }
+    $menu_html .= qq|</div>|;
     return $menu_html;
 }