--- loncom/interface/lonhtmlcommon.pm	2008/12/01 17:45:20	1.188
+++ loncom/interface/lonhtmlcommon.pm	2009/03/31 21:09:36	1.204
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.188 2008/12/01 17:45:20 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.204 2009/03/31 21:09:36 kaisler 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,17 +1305,18 @@ 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 $Str1 = '<ol id="LC_MenuBreadcrumbs">';
+        my $Str = '';
         #
         # Make the faq and bug data cascade
         my $faq = '';
         my $bug = '';
 	my $help='';
 	# Crumb Symbol
-	my $crumbsymbol = ' &#x25b6; ';
+	my $crumbsymbol = '&raquo;&nbsp;';
         # The last breadcrumb does not have a link, so handle it separately.
         my $last = pop(@Crumbs);
         #
@@ -1336,8 +1339,8 @@ returns: nothing
                     no_mt  =>$no_mt_descr,
                 });
         }
-        my $links .= 
-            join($crumbsymbol,
+        my $links .= '<li>'.
+            join('</li><li>'.$crumbsymbol,
                  map {
                      $faq = $_->{'faq'} if (exists($_->{'faq'}));
                      $bug = $_->{'bug'} if (exists($_->{'bug'}));
@@ -1355,12 +1358,12 @@ returns: nothing
 		     }
                      $result;
                      } @Crumbs
-                 );
-        $links .= $crumbsymbol if ($links ne '');
+                 ).'</li>';
+        $links .= '<li>'.$crumbsymbol if ($links ne '');
 	if ($last->{'no_mt'}) {
-	    $links .= '<b>'.$last->{'text'}.'</b>';
+	    $links .= '<b>'.$last->{'text'}.'</b></li>';
 	} else {
-	    $links .= '<b>'.&mt($last->{'text'}).'</b>';
+	    $links .= '<b>'.&mt($last->{'text'}).'</b></li>';
 	}
         #
         my $icons = '';
@@ -1380,23 +1383,27 @@ returns: nothing
 							 $faq,$bug);
 	}
         #
-        $Str .= $links.'</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 {
@@ -1465,6 +1472,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 +1482,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 +1490,7 @@ END
 }
 
 sub end_pick_box {
+    shift(@row_count);
     my $output = <<"END";
        </table>
 END
@@ -1493,12 +1505,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 +1521,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 +1543,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;
@@ -1537,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') {
@@ -1664,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>';
     }
@@ -2016,10 +2032,11 @@ END
 # An array of following structure:
 #   ({	categorytitle => 'Categorytitle',
 #	items => [
-#		    {	linktext    =>	'Text to be displayed',
-#			url	    =>	'URL the link is pointing to, i.e. /adm/site?action=dosomething',
+#		    {	
+#           linktext    =>	'Text to be displayed',
+#			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',
+#					         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',
@@ -2038,42 +2055,74 @@ 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 = qq|<div class="columnSection">|;
 
-    foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
-	$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=""><a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">';
-            if($item->{'icon'}){
-                $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 .= 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>';
+    # usage: $wrap->(element, content, {attribute => value,...});
+    # output: content enclosed in html conform tags
+    my $wrap = sub {
+        return
+            qq|<$_[0]|
+          . join( '', map { qq| $_="${$_[2]}{$_}"| } keys %{ $_[2] } )
+          . ($_[1] ? qq|>$_[1]</$_[0]>| : qq|/>|). "\n";
+    };
+    
+    # subs for specific html elements
+    my $h3  = sub { return $wrap->( "h3",  @_ ) };
+    my $div = sub { return $wrap->( "div", @_ ) };
+    my $ul  = sub { return $wrap->( "ul",  @_ ) };
+    my $li  = sub { return $wrap->( "li",  @_ ) };
+    my $a   = sub { return $wrap->( "a",   @_ ) };
+    my $img = sub { return $wrap->( "img", @_ ) };
+    
+    my @categories; # each element represents the entire markup for a category
+   
+    foreach my $category (@menu) {
+        my @links;  # contains the links for the current $category
+        foreach my $link (@{$$category{items}}) {
+            next unless $$link{permission};
+            
+            # create the markup for the current $link and push it into @links.
+            # each entry consists of an image and a text optionally followed 
+            # by a help link.
+            push @links, $li->(
+                        $a->(
+                            $img->("", {
+                                class => "LC_noBorder LC_middle",
+                                src   => "/res/adm/pages/$$link{icon}",
+                                alt   => mt(defined($$link{alttext}) ?
+                                $$link{alttext} : $$link{linktext})
+                            }), {
+                            href  => $$link{url},
+                            title => mt($$link{linktitle})
+                            }).
+                        $a->(mt($$link{linktext}), {
+                            href  => $$link{url},
+                            title => mt($$link{linktitle}),
+                            class => "LC_menubuttons_link"
+                            }).
+                         (defined($$link{help}) ? 
+                         Apache::loncommon::help_open_topic($$link{help}) : ''),
+                         {class => "LC_menubuttons_inline_text"});
+        }
+
+        # wrap categorytitle in <h3>, concatenate with 
+        # joined and in <ul> tags wrapped @links
+        # and wrap everything in an enclosing <div> and push it into
+        # @categories
+        # such that each element looks like:
+        # <div><h3>title</h3><ul><li>...</li>...</ul></div>
+        # the category won't be added if there aren't any links
+        push @categories, 
+            $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
+            $ul->(join('' ,@links),  {class =>"LC_ListStyleNormal" }),
+            {class=>"LC_ContentBoxSpecial LC_400Box"}) if scalar(@links);
     }
-    $menu_html .= qq|</div>|;
-    return $menu_html;
-}
 
+    # wrap the joined @categories in another <div> (column layout)
+    return $div->(join('', @categories), {class => "LC_columnSection"});
+}
 
 1;