--- loncom/interface/lonhtmlcommon.pm 2008/12/06 17:29:34 1.193
+++ 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.193 2008/12/06 17:29:34 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.197 2009/01/12 01:37:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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".'
';
+ my $Str = "\n".' | ';
+ $Str .= $links.'';
#
if (defined($component)) {
- $Str .= ''.
- &mt($component);
+ $Str .= ' | ';
+ if ($no_mt) {
+ $Str .= $component;
+ } else {
+ $Str .= &mt($component);
+ }
if ($icons ne '') {
$Str .= ' '.$icons;
}
@@ -2053,17 +2059,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|';
}
- $menu_html .= ' ';
+ $menu_html .= ' ';
}
$menu_html .= qq| |;
return $menu_html;
|
|