--- loncom/interface/lonhtmlcommon.pm 2009/04/25 20:22:07 1.209 +++ loncom/interface/lonhtmlcommon.pm 2009/05/20 17:39:06 1.216 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.209 2009/04/25 20:22:07 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.216 2009/05/20 17:39:06 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -76,13 +76,15 @@ Successful completion of an operation me sub confirm_success { my ($message,$failure)=@_; if ($failure) { - return ''. - $message. - ' '; + return ''."\n" + .' '."\n" + .$message."\n" + .''."\n"; } else { - return ''. - $message. - ' '; + return ''."\n" + .' '."\n" + .$message."\n" + .''."\n"; } } @@ -978,7 +980,7 @@ sub Create_PrgWin { popwin=open(\'\',\'popwin\',\'width=400,height=100\');". "popwin.document.writeln(\'".$start_page. "

".&mt("$heading")."<\/h4>". - "
". + "". '<\\/form>'.$end_page. "\');". @@ -1328,13 +1330,13 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $no_realBreadcrumb) = @_; + my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $CourseBreadcrumbs) = @_; # - $css_class ||= 'LC_breadcrumbs'; - my $Str1 = '
    '; + $css_class ||= 'LC_breadcrumbs'; + my $Str1 = '
      '; - if($no_realBreadcrumb){ - $Str1 = '
        '; + if($CourseBreadcrumbs){ + $Str1 = '
          '; } my $Str = ''; @@ -1342,14 +1344,14 @@ returns: nothing # Make the faq and bug data cascade my $faq = ''; my $bug = ''; - my $help=''; - # Crumb Symbol - my $crumbsymbol = '» '; + my $help=''; + # Crumb Symbol + my $crumbsymbol = '» '; # The last breadcrumb does not have a link, so handle it separately. my $last = pop(@Crumbs); # # The first one should be the course or a menu link - if (!defined($menulink)) { $menulink=1; } + if (!defined($menulink)) { $menulink=1; } if ($menulink) { my $description = 'Menu'; my $no_mt_descr = 0; @@ -1359,13 +1361,18 @@ returns: nothing $env{'course.'.$env{'request.course.id'}.'.description'}; $no_mt_descr = 1; } - unshift(@Crumbs,{ - href =>'/adm/menu', - title =>'Go to main menu', - target =>'_top', - text =>$description, - no_mt =>$no_mt_descr, - }); + $menulink = { href =>'/adm/menu', + title =>'Go to main menu', + target =>'_top', + text =>$description, + no_mt =>$no_mt_descr, }; + if($last) { + #$last set, so we have some crumbs + unshift(@Crumbs,$menulink); + } else { + #only menulink crumb present + $last = $menulink; + } } my $links .= '
        • '. join('
        • '.$crumbsymbol, @@ -1420,10 +1427,10 @@ returns: nothing # - if($no_realBreadcrumb){ + if($CourseBreadcrumbs){ $Str1 .= $links.'
        '; } else { - $Str1 .= $links.'
    '; + $Str1 .= $links.'
'; } # if (defined($component)) { @@ -1546,9 +1553,9 @@ END } sub row_title { + my ($title,$css_title_class,$css_value_class) = @_; $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.'"'; @@ -1807,7 +1814,7 @@ sub topic_bar { return '
'.&mt('Step [_1]',$imgnum).
-              '  + ' "src="/res/adm/pages/bl_step'.$imgnum.'.gif" />  '.$title.'
';