--- loncom/interface/loncommon.pm 2010/10/04 22:30:42 1.925.2.15 +++ loncom/interface/loncommon.pm 2010/10/11 16:00:57 1.925.2.16 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.925.2.15 2010/10/04 22:30:42 raeburn Exp $ +# $Id: loncommon.pm,v 1.925.2.16 2010/10/11 16:00:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4650,7 +4650,7 @@ ENDSCRIPT if (($custommenu) && ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) { $bodytag .= &Apache::lonmenu::gci_secondary_menu(); - } else { + } elsif ($env{'request.role'} ne 'cm' || &check_for_gci_dc()) { $bodytag .= Apache::lonmenu::secondary_menu(); } $bodytag .= Apache::lonmenu::serverform(); @@ -4662,8 +4662,16 @@ ENDSCRIPT $bodytag .= &Apache::lonmenu::innerregister($forcereg); } elsif ($custommenu && $env{'request.course.id'} && &Apache::lonnet::allowed('mdc', $env{'request.course.id'})) { - if ($env{'request.noversionuri'} eq '/adm/navmaps') { + if (($env{'request.noversionuri'} eq '/adm/navmaps') || + ($env{'request.noversionuri'} eq '/adm/coursedocs') || + ($env{'request.noversionuri'} eq '/adm/createuser') || + ($env{'request.noversionuri'} eq '/adm/whatsnew') || + ($env{'request.noversionuri'} eq '/cgi-bin/printout.pl') || + ($env{'request.noversionuri'} eq '/adm/printout') || + ($env{'request.noversionuri'} eq '/adm/statistics')) { + my @advtools = &concept_test_manager(); + &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb_tool( 'advtools',@advtools); my $advlinks; @@ -6620,7 +6628,7 @@ ul.LC_funclist li { } #gciheader ul { margin:0; - padding:10px 5px 0; + padding:10px 10px 0; list-style:none; } #gciheader li { @@ -6935,7 +6943,9 @@ sub start_page { #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 { + } elsif (exists($args->{'bread_crumbs_menulink'})) { + $result .= &Apache::lonhtmlcommon::breadcrumbs('','',$args->{'bread_crumbs_menulink'}); + } else { $result .= &Apache::lonhtmlcommon::breadcrumbs(); } } @@ -11032,7 +11042,7 @@ sub existing_gcitest_courses { } else { next; } - my ($tstart,$tend) = split('.',$env{$envkey}); + my ($tstart,$tend) = split(/\./,$env{$envkey}); if (((!$tstart) || ($tstart < $now)) && ((!$tend) || ($tend > $now))) { my $descr = $env{'course.'.$cdom.'_'.$cnum.'.description'}; if ($descr ne '') {