--- loncom/interface/lonhtmlcommon.pm 2008/12/05 10:23:56 1.192 +++ loncom/interface/lonhtmlcommon.pm 2008/12/17 12:59:49 1.196 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.192 2008/12/05 10:23:56 bisitz Exp $ +# $Id: lonhtmlcommon.pm,v 1.196 2008/12/17 12:59:49 harmsja Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1306,7 +1306,7 @@ returns: nothing my ($component,$component_help,$menulink,$helplink,$css_class) = @_; # $css_class ||= 'LC_breadcrumbs'; - my $Str = "\n".'
'; + my $Str = "\n".''; + $Str .= $links.''; # if (defined($component)) { $Str .= ' -
    '; # # Make the faq and bug data cascade my $faq = ''; @@ -1342,25 +1342,25 @@ returns: nothing $faq = $_->{'faq'} if (exists($_->{'faq'})); $bug = $_->{'bug'} if (exists($_->{'bug'})); $help = $_->{'help'} if (exists($_->{'help'})); - my $result = '{'href'}.'" '; if (defined($_->{'target'}) && $_->{'target'} ne '') { $result .= 'target="'.$_->{'target'}.'" '; } if ($_->{'no_mt'}) { $result .='title="'.$_->{'title'}.'">'. - $_->{'text'}.''; + $_->{'text'}.''; } else { $result .='title="'.&mt($_->{'title'}).'">'. - &mt($_->{'text'}).''; + &mt($_->{'text'}).''; } $result; } @Crumbs ); $links .= $crumbsymbol if ($links ne ''); if ($last->{'no_mt'}) { - $links .= ''.$last->{'text'}.''; + $links .= '
  1. '.$last->{'text'}.'
  2. '; } else { - $links .= ''.&mt($last->{'text'}).''; + $links .= '
  3. '.&mt($last->{'text'}).'
  4. '; } # my $icons = ''; @@ -1380,7 +1380,7 @@ returns: nothing $faq,$bug); } # - $Str .= $links.'
'. @@ -1465,6 +1465,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 +1475,7 @@ sub start_pick_box { } else { $css_class= 'class="LC_pick_box"'; } + unshift(@row_count,0); my $output = <<"END"; END @@ -1479,6 +1483,7 @@ END } sub end_pick_box { + shift(@row_count); my $output = <<"END";
END @@ -1493,12 +1498,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 +1514,7 @@ sub row_title {
$title + ENDONE return $output; } @@ -1530,6 +1536,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; @@ -2044,17 +2053,17 @@ END sub generate_menu { my @menu = @_; - my $menu_html = qq|
|; + my $menu_html = qq|
|; foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished. - $menu_html .='
-

'.mt($category->{'categorytitle'}).'

-
    '; + $menu_html .='
    +

    '.mt($category->{'categorytitle'}).'

    +
      '; foreach my $item ( @{ $category->{items} } ) { next unless $item->{'permission'}; $menu_html .= qq|
    • '; if($item->{'icon'}){ - $menu_html .= qq||;
+                $menu_html .= qq|<img class ='; } else { #use linktext as alt text for the icon @@ -2068,7 +2077,7 @@ sub generate_menu { } $menu_html .= '
    • '; } - $menu_html .= '
    '; + $menu_html .= '
'; } $menu_html .= qq|
|; return $menu_html;