--- loncom/interface/loncommon.pm 2009/02/25 21:06:27 1.757 +++ loncom/interface/loncommon.pm 2009/03/01 20:24:39 1.760 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.757 2009/02/25 21:06:27 schulted Exp $ +# $Id: loncommon.pm,v 1.760 2009/03/01 20:24:39 harmsja Exp $ # # Copyright Michigan State University Board of Trustees # @@ -924,14 +924,14 @@ sub help_open_topic { # Add the text if ($text ne "") { - $template.="$text"; + $template.="$text"; } # Add the graphic my $title = &mt('Online Help'); my $helpicon=&lonhttpdurl("/adm/help/help.png"); $template .= <<"ENDTEMPLATE"; - (Help: $topic) + (Help: $topic) ENDTEMPLATE return $template; @@ -5591,7 +5591,14 @@ p, .LC_ContentBox { cursor:pointer; text-decoration:underline; } - +.LC_helptextbgcolor +{ + background-color:#5555FF; +} +.LC_helptextfontcolor +{ + color:#FFFFFF; +} dl,ul,div,fieldset { margin: 10px 10px 10px 0px; @@ -5616,7 +5623,7 @@ ol.LC_smallMenu a { color: RGB(80, 80, 80); text-decoration: none; } -ol#LC_TabMainMenueContent, ul.LC_TabContent , +ol#LC_TabMainMenuContent, ul.LC_TabContent , ul.LC_TabContentBigger { display:block; list-style:none; @@ -6247,16 +6254,23 @@ sub start_page { $result = &html_encode($result); } - if (exists($args->{'bread_crumbs'})) { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - if (ref($args->{'bread_crumbs'}) eq 'ARRAY') { - foreach my $crumb (@{$args->{'bread_crumbs'}}){ - &Apache::lonhtmlcommon::add_breadcrumb($crumb); - } - } - $result .= &Apache::lonhtmlcommon::breadcrumbs(); - } + #Breadcrumbs + if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + #if any br links exists, add them to the breadcrumbs + if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') { + foreach my $crumb (@{$args->{'bread_crumbs'}}){ + &Apache::lonhtmlcommon::add_breadcrumb($crumb); + } + } + #if bread_crumbs_component exists show it as headline else show only the breadcrumbs + if(exists($args->{'bread_crumbs_component'})){ + $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'}); + }else{ + $result .= &Apache::lonhtmlcommon::breadcrumbs(); + } + } return $result; }