--- loncom/interface/loncommon.pm 2005/04/22 20:50:07 1.260 +++ loncom/interface/loncommon.pm 2005/06/06 19:51:05 1.266 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.260 2005/04/22 20:50:07 albertel Exp $ +# $Id: loncommon.pm,v 1.266 2005/06/06 19:51:05 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -673,7 +673,6 @@ sub help_open_menu { foreach (\$color,\$function,\$topic,\$component_help,\$faq,\$bug,\$origurl) { $$_ = &Apache::lonnet::escape($$_); } - if (!$stayOnPage) { $link = "javascript:helpMenu('open')"; } else { @@ -684,9 +683,10 @@ sub help_open_menu { my $template; if ($text ne "") { $template .= - "". - "
$text"; + "". + "'); $i++; }
$text"; } + my $nothing=&Apache::lonhtmlcommon::javascript_nothing(); my $html=&Apache::lonxml::xmlbegin(); my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif"); $template .= <<"ENDTEMPLATE"; @@ -698,7 +698,7 @@ function helpMenu(target) { if (target == 'open') { var newWindow = null; try { - newWindow = window.open("/adm/rat/empty.html","helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" ) + newWindow = window.open($nothing,"helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" ) } catch(error) { writeHelp(caller); @@ -712,9 +712,9 @@ function helpMenu(target) { return; } function writeHelp(caller) { - caller.document.write('$htmlLON-CAPA Help Menu') - caller.document.write("") - caller.document.write("") + caller.document.writeln('$htmlLON-CAPA Help Menu') + caller.document.writeln("") + caller.document.writeln("") caller.document.close() caller.focus() } @@ -2000,7 +2000,51 @@ sub track_student_link { 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 = ''; + } + return qq{$linktext}; +} =pod @@ -3263,6 +3307,11 @@ Separate a record into fields $record sh =cut +sub takeleft { + my $index=shift; + return substr('0000'.$index,-4,4); +} + sub record_sep { my $record=shift; my %components=(); @@ -3273,7 +3322,7 @@ sub record_sep { my $field=$_; $field=~s/^(\"|\')//; $field=~s/(\"|\')$//; - $components{$i}=$field; + $components{&takeleft($i)}=$field; $i++; } } elsif ($env{'form.upfiletype'} eq 'tab') { @@ -3282,7 +3331,7 @@ sub record_sep { my $field=$_; $field=~s/^(\"|\')//; $field=~s/(\"|\')$//; - $components{$i}=$field; + $components{&takeleft($i)}=$field; $i++; } } else { @@ -3300,7 +3349,7 @@ sub record_sep { $field=~s/^\s*$delimiter//; $field=~s/$delimiter\s*$//; } - $components{$i}=$field; + $components{&takeleft($i)}=$field; $i++; } } @@ -3457,9 +3506,9 @@ sub csv_samples_select_table { $display.''); } $r->print(''); - if (defined($sone{$_})) { $r->print($sone{$_}."
\n"); } - if (defined($stwo{$_})) { $r->print($stwo{$_}."
\n"); } - if (defined($sthree{$_})) { $r->print($sthree{$_}."
\n"); } + if (defined($sone{$_})) { $r->print($sone{$_}."
\n"); } + if (defined($stwo{$_})) { $r->print($stwo{$_}."
\n"); } + if (defined($sthree{$_})) { $r->print($sthree{$_}."
\n"); } $r->print('