--- loncom/interface/loncommon.pm 2005/06/06 19:51:05 1.266 +++ loncom/interface/loncommon.pm 2005/07/12 15:54:19 1.270 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.266 2005/06/06 19:51:05 www Exp $ +# $Id: loncommon.pm,v 1.270 2005/07/12 15:54:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1984,65 +1984,20 @@ sub syllabuswrapper { } sub track_student_link { - my ($linktext,$sname,$sdom,$target) = @_; - my $link ="/adm/trackstudent"; + my ($linktext,$sname,$sdom,$target,$start) = @_; + my $link ="/adm/trackstudent?"; my $title = 'View recent activity'; if (defined($sname) && $sname !~ /^\s*$/ && defined($sdom) && $sdom !~ /^\s*$/) { - $link .= "?selected_student=$sname:$sdom"; + $link .= "selected_student=$sname:$sdom"; $title .= ' of this student'; - } - if (defined($target) && $target !~ /^\s*$/) { - $target = qq{target="$target"}; - } else { - $target = ''; - } - return qq{$linktext}; -} - -# --------------------------------------------------------- Links into grading, etc - -sub parm_direct_link { - my ($linktext,$sname,$sdom,$symb,$target)=@_; - unless ($sname) { return ''; } - unless ($sdom) { return ''; } - unless ($symb) { return ''; } - - my $link ="/adm/parmset"; - my $title = 'Change parameters'; - if (defined($sname) && $sname !~ /^\s*$/ && - defined($sdom) && $sdom !~ /^\s*$/) { - $link .= "?uname=$sname&udom=$sdom&action=settable&symb=". - &Apache::lonnet::escape($symb); - } - if (defined($target) && $target !~ /^\s*$/) { - $target = qq{target="$target"}; - } else { - $target = ''; - } - return qq{$linktext}; -} - -sub grds_direct_link { - my ($linktext,$sname,$sdom,$symb,$target)=@_; - unless ($sname) { return ''; } - unless ($sdom) { return ''; } - unless ($symb) { return ''; } - my $url=(&Apache::lonnet::decode_symb($symb))[2]; - my $link ="/adm/grades"; - my $title = 'Change grades'; - if (defined($sname) && $sname !~ /^\s*$/ && - defined($sdom) && $sdom !~ /^\s*$/) { - $link .= "?stuinfo=$sname:$sdom&symb=". - &Apache::lonnet::escape($symb)."&url=". - &Apache::lonnet::escape($url). - "&showgrading=yes&lastsub=all&vProp=yes&vAns=yes&command=processGroup"; - } + } if (defined($target) && $target !~ /^\s*$/) { $target = qq{target="$target"}; } else { $target = ''; } + if ($start) { $link.='&start='.$start; } return qq{$linktext}; } @@ -2773,11 +2728,9 @@ a:focus { color: red; background: yellow END + &Apache::lontexconvert::jsMath_reset(); if ($env{'environment.texengine'} eq 'jsMath') { - $bodytag.=''."\n". - ''."\n"; + $bodytag.=&Apache::lontexconvert::jsMath_header(); } my $upperleft=''. - ''. + ''. $titleinfo.''.$roleinfo.''; if ($env{'request.state'} eq 'construct') { $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable); @@ -2924,10 +2877,7 @@ Returns: A uniform footer for LON-CAPA w sub endbodytag { my $endbodytag=''; - if ($env{'environment.texengine'} eq 'jsMath') { - $endbodytag=''. - "\n".$endbodytag; - } + $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag; return $endbodytag; }