loncom/homework/bridgetask.pm - diff

Return to bridgetask.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.240 and 1.241

version 1.240, 2008/09/11 14:47:17	version 1.241, 2008/09/19 22:06:49
Line 545 sub done_screen {	Line 545 sub done_screen {
.&mt('[_1]Nonexistent file:[_2]'	.&mt('[_1]Nonexistent file:[_2]'
,'<span class="LC_error"> '	,'<span class="LC_error"> '
,'</span> <span class="LC_filename">'.$file.'</span>');	,'</span> <span class="LC_filename">'.$file.'</span>');
$msg .= "<p>".&mt('Submitted non-existant file [_1]',$file)."</p>\n";	$msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";
} else {	} else {
$file = '<span class="LC_filename">'.$file.'</span>';	$file = '<span class="LC_filename">'.$file.'</span>';
$msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";	$msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
Line 579 sub done_screen {	Line 579 sub done_screen {
.'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'	.'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
.'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>'	.'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>'
.$message_status	.$message_status
.$comment_status	.$comment_status;

}	}

Line 1091 sub end_Task {	Line 1091 sub end_Task {
if (!$previous && $status ne 'SHOW_ANSWER' &&	if (!$previous && $status ne 'SHOW_ANSWER' &&
&show_task($status,$previous)) {	&show_task($status,$previous)) {
my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});	my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
	my $donetext = &mt('Done');
$result.=<<DONEBUTTON;	$result.=<<DONEBUTTON;
<form name="done" method="post" action="$action">	<form name="done" method="post" action="$action">
<input type="hidden" name="donescreen" value="1" />	<input type="hidden" name="donescreen" value="1" />
<input type="submit" value="Done" />	<input type="submit" value="$donetext" />
</form>	</form>
DONEBUTTON	DONEBUTTON
}	}
Line 2647 sub question_status_message {	Line 2648 sub question_status_message {
}	}
$status .= '.';	$status .= '.';
if ($counts->{'opt'}) {	if ($counts->{'opt'}) {
# FIXME &mt() missing!	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
$status .= ' You were required to pass '.$counts->{'opt_req'}.	$status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'});
' optional ';	} else {
if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {	$status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'});
$status .=	}
($counts->{'opt_req'} == 1?'criterion':'criteria');
} else {
$status .=
'component'.($counts->{'opt_req'} == 1?'':'s');
}
$status .= '.';
}	}
return $status;	return $status;
}	}
Line 3139 sub proctor_validation_screen {	Line 3134 sub proctor_validation_screen {
if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }	if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
$uri = &HTML::Entities::encode($uri,'<>&"');	$uri = &HTML::Entities::encode($uri,'<>&"');
# FIXME &mt() missing!	my %lt = &Apache::lonlocal::texthash(
	'prva' => "Proctor Validation",
	'yoro' => "Your room's proctor needs to validate your access to this resource.",
	'prus' => "Proctor's Username:",
	'pasw' => "Password:",
	'prdo' => "Proctor's Domain:",
	'vali' => 'Validate',
	'stui' => "Student who should be logged in is:",
	'name' => "Name:",
	'sid' => "Student ID:",
	'unam' => "Username:",
	);
my $result= (<<ENDCHECKOUT);	my $result= (<<ENDCHECKOUT);
<h2>Proctor Validation</h2>	<h2>$lt{'prva'}</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>	<p>$lt{'yoro'}</p>
$msg	$msg
<form name="checkout" method="post" action="$uri">	<form name="checkout" method="post" action="$uri">
<input type="hidden" name="validate" value="yes" />	<input type="hidden" name="validate" value="yes" />
<input type="hidden" name="submitted" value="yes" />	<input type="hidden" name="submitted" value="yes" />
<table>	<table>
<tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>	<tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
<tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>	<tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
<tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>	<tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
</table>	</table>
<input type="submit" name="checkoutbutton" value="Validate" /><br />	<input type="submit" name="checkoutbutton" value="$lt{'vali'}" /><br />
<table border="1">	<table border="1">
<tr><td>	<tr><td>
<table>	<table>
<tr><td colspan="2">Student who should be logged in is:</td></tr>	<tr><td colspan="2">$lt{'stui'}</td></tr>
<tr><td>Name:</td><td>$name</td></tr>	<tr><td>$lt{'name'}</td><td>$name</td></tr>
<tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>	<tr><td>$lt{'sid'}</td><td>$env{'environment.id'}</td></tr>
<tr><td>Usename</td><td>$user:$domain</td></tr>	<tr><td>$lt{'unam'}</td><td>$user:$domain</td></tr>
$url	$url
</table>	</table>
</tr></td>	</tr></td>
</table>	</table>
</form>	</form>
ENDCHECKOUT	ENDCHECKOUT

return $result;	return $result;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.240
changed lines
	Added in v.1.241