--- loncom/interface/lonhtmlcommon.pm 2004/05/06 17:54:11 1.69 +++ loncom/interface/lonhtmlcommon.pm 2004/06/02 16:41:46 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.69 2004/05/06 17:54:11 matthew Exp $ +# $Id: lonhtmlcommon.pm,v 1.71 2004/06/02 16:41:46 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -868,17 +868,19 @@ sub crumbs { # ------------------------------------------------- Output headers for HTMLArea sub htmlareaheaders { - unless (&htmlareablocked()) { return ''; } + if (&htmlareablocked()) { return ''; } my $lang='en'; + if (&mt('htmlarea_lang') ne 'htmlarea_lang') { + $lang=&mt('htmlarea_lang'); + } return (< _editor_url="/htmlarea/"; - - - ENDHEADERS } @@ -886,7 +888,7 @@ ENDHEADERS # ---------------------------------------------------------- Script to activate sub htmlareaactive { - unless (&htmlareablocked()) { return ''; } + if (&htmlareablocked()) { return ''; } return (< HTMLArea.replaceAll(); @@ -897,8 +899,8 @@ ENDSCRIPT # --------------------------------------------------------------------- Blocked sub htmlareablocked { - unless (&htmlareabrowser()) { return ''; } - return 1; + unless (&htmlareabrowser()) { return 1; } + return 0; } # ---------------------------------------- Browser capable of running HTMLArea? @@ -975,16 +977,21 @@ returns: nothing # The last breadcrumb does not have a link, so handle it separately. my $last = pop(@Crumbs); # - # The first one should be the course, I guess. + # The first one should be the course or a menu link if (!defined($menulink)) { $menulink=1; } - if ($menulink && exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') { - my $cid = $ENV{'request.course.id'}; + if ($menulink) { + my $description = 'Menu'; + if (exists($ENV{'request.course.id'}) && + $ENV{'request.course.id'} ne '') { + $description = + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + } unshift(@Crumbs,{ - href =>'/adm/menu', - title =>'Go to main menu', - target =>'_top', - text =>$ENV{'course.'.$cid.'.description'}, - }); + href =>'/adm/menu', + title =>'Go to main menu', + target =>'_top', + text =>$description, + }); } my $links .= join('->',