--- loncom/homework/bridgetask.pm 2008/08/13 09:10:44 1.239
+++ loncom/homework/bridgetask.pm 2009/03/09 01:58:47 1.244
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.239 2008/08/13 09:10:44 bisitz Exp $
+# $Id: bridgetask.pm,v 1.244 2009/03/09 01:58:47 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -473,7 +473,7 @@ sub file_list {
my $file=$file_url.$partial_file;
$file=~s|/+|/|g;
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
- $file_list.='
![]('.
+ $file_list.='<li><span class=)
'.$file.
''."\n";
}
@@ -545,7 +545,7 @@ sub done_screen {
.&mt('[_1]Nonexistent file:[_2]'
,' '
,' '.$file.'');
- $msg .= "".&mt('Submitted non-existant file [_1]',$file)."
\n";
+ $msg .= "".&mt('Submitted non-existent file [_1]',$file)."
\n";
} else {
$file = ''.$file.'';
$msg .= "".&mt('Submitted file [_1]',$file)."
\n";
@@ -579,7 +579,7 @@ sub done_screen {
.''.&mt('Logout').'
'
.''.&mt('Change to a different course').'
'
.$message_status
-.$comment_status
+.$comment_status;
}
@@ -1091,10 +1091,11 @@ sub end_Task {
if (!$previous && $status ne 'SHOW_ANSWER' &&
&show_task($status,$previous)) {
my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
+ my $donetext = &mt('Done');
$result.=<
-
+
DONEBUTTON
}
@@ -1325,7 +1326,7 @@ DONEBUTTON
}
}
if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
- # instance generation occured and hasn't yet been stored
+ # instance generation occurred and hasn't yet been stored
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
@@ -2080,6 +2081,7 @@ sub select_user {
$seclist.='';
}
+ my $buttontext=&mt('Regrade');
$result.=&Apache::loncommon::start_data_table_row();
$result.=<
@@ -2088,7 +2090,7 @@ sub select_user {
-
+
$seclist
$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student) Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()] |
@@ -2647,17 +2649,11 @@ sub question_status_message {
}
$status .= '.';
if ($counts->{'opt'}) {
- # FIXME &mt() missing!
- $status .= ' You were required to pass '.$counts->{'opt_req'}.
- ' optional ';
- if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
- $status .=
- ($counts->{'opt_req'} == 1?'criterion':'criteria');
- } else {
- $status .=
- 'component'.($counts->{'opt_req'} == 1?'':'s');
- }
- $status .= '.';
+ if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+ $status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'});
+ } else {
+ $status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'});
+ }
}
return $status;
}
@@ -3139,33 +3135,45 @@ sub proctor_validation_screen {
if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
my $uri = &Apache::lonenc::check_encrypt($env{'request.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/Employee ID:",
+ 'unam' => "Username:",
+ );
my $result= (<Proctor Validation
- Your room's proctor needs to validate your access to this resource.
+$lt{'prva'}
+ $lt{'yoro'}
$msg
ENDCHECKOUT
+
return $result;
}