--- loncom/homework/bridgetask.pm 2006/03/28 18:27:03 1.120 +++ loncom/homework/bridgetask.pm 2006/04/20 07:00:20 1.143 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.120 2006/03/28 18:27:03 albertel Exp $ +# $Id: bridgetask.pm,v 1.143 2006/04/20 07:00:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,7 +66,7 @@ sub proctor_check_auth { my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { - my ($puser,$pdom)=(split('@',$possible)); + my ($puser,$pdom)=(split(':',$possible)); if ($puser eq $user && $pdom eq $domain) { my $authenticated=0; if ( $slot->{'secret'} =~ /\S/ && @@ -95,7 +95,7 @@ sub proctor_check_auth { #setup new version and who did it $Apache::lonhomework::results{'resource.0.version'}=$version; $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $user.'@'.$domain; + $user.':'.$domain; $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= $slot_name; @@ -103,7 +103,7 @@ sub proctor_check_auth { } elsif ($authenticated && $type eq 'problem') { &Apache::lonxml::debug("authed $slot_name"); $Apache::lonhomework::results{"resource.0.checkedin"}= - $user.'@'.$domain; + $user.':'.$domain; $Apache::lonhomework::results{"resource.0.checkedin.slot"}= $slot_name; } @@ -176,10 +176,10 @@ sub add_grading_button { if (scalar(keys(%sections)) < 3) { $size=scalar(keys(%sections))+2; } - my $sec_select = '
'; } return $result; } @@ -258,64 +259,14 @@ sub preserve_grade_info { } sub style { - return (< + my ($target) = @_; + if ($target eq 'web' + || $target eq 'webgrade') { + return (< STYLE - + } + return; } sub show_task { @@ -398,12 +349,15 @@ sub webgrade_standard_info { my %lt=&Apache::lonlocal::texthash('done' => 'Next Item', 'stop' => 'Quit Grading', + 'fail' => 'Fail Rest', ); my $result=<