--- loncom/interface/lonhtmlcommon.pm	2009/01/12 01:37:57	1.197
+++ 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.197 2009/01/12 01:37:57 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.204 2009/03/31 21:09:36 kaisler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1308,14 +1308,15 @@ returns: nothing
         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="LC_MenuBreadcrumbs">';
+        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);
         #
@@ -1338,31 +1339,31 @@ 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'}));
                      $help = $_->{'help'} if (exists($_->{'help'}));
-                     my $result = '<li><a href="'.$_->{'href'}.'" ';
+                     my $result = '<a href="'.$_->{'href'}.'" ';
                      if (defined($_->{'target'}) && $_->{'target'} ne '') {
                          $result .= 'target="'.$_->{'target'}.'" ';
                      }
 		     if ($_->{'no_mt'}) {
 			 $result .='title="'.$_->{'title'}.'">'.
-			     $_->{'text'}.'</a></li>';
+			     $_->{'text'}.'</a>';
 		     } else {
 			 $result .='title="'.&mt($_->{'title'}).'">'.
-			     &mt($_->{'text'}).'</a></li>';
+			     &mt($_->{'text'}).'</a>';
 		     }
                      $result;
                      } @Crumbs
-                 );
-        $links .= $crumbsymbol if ($links ne '');
+                 ).'</li>';
+        $links .= '<li>'.$crumbsymbol if ($links ne '');
 	if ($last->{'no_mt'}) {
-	    $links .= '<li><b>'.$last->{'text'}.'</b></li>';
+	    $links .= '<b>'.$last->{'text'}.'</b></li>';
 	} else {
-	    $links .= '<li><b>'.&mt($last->{'text'}).'</b></li>';
+	    $links .= '<b>'.&mt($last->{'text'}).'</b></li>';
 	}
         #
         my $icons = '';
@@ -1382,10 +1383,11 @@ returns: nothing
 							 $faq,$bug);
 	}
         #
-        $Str .= $links.'</ol></td>';
+        $Str1 .= $links.'</ol>';
         #
         if (defined($component)) {
-            $Str .= '<td class="'.$css_class.'_component">';
+            $Str .= "\n".'<table class="'.$css_class.'">'
+                   .'<tr><td class="'.$css_class.'_component">';
             if ($no_mt) {
                 $Str .= $component;
             } else {
@@ -1394,15 +1396,14 @@ returns: nothing
 	    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 {
@@ -1552,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') {
@@ -1679,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>';
     }
@@ -2031,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',
@@ -2053,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="LC_columnSection">|;
 
-    foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
-	$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 .= '</li>';
-	}
-	$menu_html .= '</ul></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;