--- loncom/interface/lonpickcode.pm 2007/11/13 01:47:56 1.15 +++ loncom/interface/lonpickcode.pm 2013/02/01 18:46:37 1.16 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a CODE from the list of possible CODEs # -# $Id: lonpickcode.pm,v 1.15 2007/11/13 01:47:56 albertel Exp $ +# $Id: lonpickcode.pm,v 1.16 2013/02/01 18:46:37 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,7 +69,7 @@ sub handler { if (!($env{'request.course.id'}) && (&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) { $r->print(&Apache::loncommon::start_page(). - &mt('Access not allowed.'). + '

'.&mt('Access not allowed.').'

'. &Apache::loncommon::end_page()); return OK; } @@ -145,10 +145,12 @@ sub show_codes { sub picking_a_code { my ($r)=@_; - $r->print(&Apache::loncommon::start_page("Selecting a CODE",undef, + my $title = 'Selecting a CODE'; + $r->print(&Apache::loncommon::start_page($title,undef, {'no_nav_bar' => 1})); - $r->print(< + $r->print('

'.&mt($title).'

'); + + $r->print(&Apache::lonhtmlcommon::scripttag(" function gochoose(newcode) { opener.document.$env{'form.form'}.scantron_CODE_selectedvalue.value=newcode; var slct=opener.document.$env{'form.form'}.scantron_CODE_resolution; @@ -158,18 +160,27 @@ function gochoose(newcode) { } self.close(); } - -ENDSCRIPT - +")); - $r->print("

The CODE on the paper is ".$env{'form.curCODE'}. - ". Please Select a new one.

\n".'
'); + $r->print( + '

' + .&mt('The CODE on the paper is [_1]. Please select a new one.', + ''.$env{'form.curCODE'}.'') + ."

\n".'' + ); my %codes=&Apache::grades::get_codes(); my %code_freq=&get_code_freq($r); my $num_matches=length($env{'form.curCODE'}); for (my $i=$num_matches;$i>=0;$i--) { - my $to_print="

".&mt("CODEs with [_1] matching letters",$i)."

"; - $to_print.=''; + my $to_print = + '

'.&mt('CODEs with [_1] matching letters:',$i)."

\n" + .&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .'' + .&Apache::loncommon::end_data_table_header_row(); + my $print; foreach my $code (sort(keys(%codes))) { if (&Apache::grades::num_matches($env{'form.curCODE'},$code) != $i) { next; } @@ -181,15 +192,17 @@ ENDSCRIPT $count=scalar(@{$code_freq{$code}}); $list=' - '.join(', ',@{$code_freq{$code}}); } - $to_print.=''. - ''; - delete($codes{$code}); - } - $to_print.='
CODEexams using this CODE '.&mt('CODE').''.&mt('Bubblesheet Exams using this CODE').'
'. - ''.$code.''.$count. - $list.'
'; - if ($print) { $r->print($to_print); } + $to_print .= + &Apache::loncommon::start_data_table_row() + .'' + .''.$code.'' + .''.$count.$list.'' + .&Apache::loncommon::end_data_table_row(); + delete($codes{$code}); + } + $to_print .= &Apache::loncommon::end_data_table(); + if ($print) { $r->print($to_print); } } $r->print('
'); }