--- loncom/interface/statistics/lonproblemanalysis.pm 2007/01/04 02:44:07 1.130 +++ loncom/interface/statistics/lonproblemanalysis.pm 2020/11/12 00:15:27 1.142.2.5 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.130 2007/01/04 02:44:07 albertel Exp $ +# $Id: lonproblemanalysis.pm,v 1.142.2.5 2020/11/12 00:15:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -73,19 +73,24 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis')); + $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; # if (@Students < 1 && exists($env{'form.firstrun'})) { - $r->print('<h2>There are no students in the sections/groups selected</h2>'); + $r->print('<div class="LC_warning">' + .&mt('There are no students in the sections/groups selected.') + .'</div>' + ); } # my @CacheButtonHTML = &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status'); $r->rflush(); # - my $problem_types = '(option|radiobutton|numerical)'; + my $problem_types = &analyzable_types(); if (exists($env{'form.problemchoice'}) && ! exists($env{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { @@ -111,21 +116,9 @@ sub BuildProblemAnalysisPage { $r->rflush(); # # Determine which problem we are to analyze - my $current_problem = &Apache::lonstathelpers::get_target_from_id - ($env{'form.problemchoice'}); - # - my ($navmap,$prev,$curr,$next) = - &Apache::lonstathelpers::get_prev_curr_next($current_problem, - $problem_types, - 'response', - ); - if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) { - $current_problem = $prev; - } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) { - $current_problem = $next; - } else { - $current_problem = $curr; - } + my ($navmap,$current_problem) = &get_current_problem(); # need to retrieve $navmap + # to support $resource->* calls + # for src and compTitle (below) # # Store the current problem choice and send it out in the form $env{'form.problemchoice'} = @@ -139,9 +132,12 @@ sub BuildProblemAnalysisPage { my $resource = $current_problem->{'resource'}; $r->print('<h1>'.$resource->compTitle.'</h1>'); $r->print('<h3>'.$resource->src.'</h3>'); - $r->print('<h4>'.&Apache::lonstatistics::section_and_enrollment_description().'</h4>'); + $r->print('<p>'.&Apache::lonstatistics::section_and_enrollment_description().'</p>'); if ($env{'form.show_prob'} eq 'true') { - $r->print(&Apache::lonstathelpers::render_resource($resource)); + $r->print('<hr />' + .&Apache::lonstathelpers::render_resource($resource) + .'<hr />' + ); } $r->rflush(); if (@Students) { @@ -162,7 +158,11 @@ sub BuildProblemAnalysisPage { &numerical_response_analysis($r,$current_problem, $problem_data,\@Students); } else { - $r->print('<h2>Analysis of '.$current_problem->{'resptype'}.' is not supported</h2>'); + $r->print('<div class="LC_warning">' + .&mt('Analysis of [_1] is not supported.' + ,$current_problem->{'resptype'}) + .'</div>' + ); } } } @@ -179,6 +179,28 @@ sub BuildProblemAnalysisPage { } } +sub analyzable_types { + return '(option|radiobutton|numerical)'; +} + +sub get_current_problem { + my ($problem_types) = @_; + my $current_problem = &Apache::lonstathelpers::get_target_from_id + ($env{'form.problemchoice'}); + my ($navmap,$prev,$curr,$next) = + &Apache::lonstathelpers::get_prev_curr_next($current_problem, + $problem_types, + 'response'); + if (exists($env{'form.PrevProblemAnalysis'}) && ($prev ne '')) { + $current_problem = $prev; + } elsif (exists($env{'form.NextProblemAnalysis'}) && ($next ne '')) { + $current_problem = $next; + } else { + $current_problem = $curr; + } + return ($navmap,$current_problem); +} + ######################################################### ######################################################### ## @@ -214,9 +236,10 @@ sub numerical_response_analysis { } # if (ref($response_data) ne 'ARRAY') { - $r->print('<h2>'. - &mt('There is no submission data for this resource'). - '</h2>'); + $r->print('<div class="LC_warning">' + .&mt('There is no submission data for this resource.') + .'</div>' + ); return; } my $analysis_html = '<table>'; @@ -233,7 +256,7 @@ sub numerical_response_analysis { $stats_message = '[_1] submissions, [_2] correct, [_3] incorrect'; $post_message = ''; - $no_data_message = 'No data exists for attempt [_1]'; + $no_data_message = 'No data exists for attempt [_1].'; } else { my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$plot_num); @@ -281,9 +304,9 @@ sub numerical_response_analysis { $restriction_function); if ($stats->{'submission_count'} == 0) { $analysis_html.= - '<tr><td colspan="2"><font size="+1"><b>'. + '<tr><td colspan="2"><div class="LC_warning">'. &mt($no_data_message,$plot_num,@extra_data). - '</b></font></td></tr>'; + '</div></td></tr>'; } else { $analysis_html.= '<tr><td colspan="2" align="center"><font size="+1"><b>'. @@ -385,10 +408,13 @@ sub numerical_plot_percent { if ($max <$_) { $max = $_; last; } } # - my $title = &mt('Percent Difference'); + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Percent Difference', + 'xlabel' => 'Percent Difference from Correct', + 'ylabel' => 'Percent of Answers'); my @labels = (1..scalar(@bins)-1); my $graph = &Apache::loncommon::DrawBarGraph - ($title,'Percent Difference from Correct','Percent of Answers', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # @@ -458,10 +484,13 @@ sub numerical_plot_differences { if ($max <$_) { $max = $_; last; } } # - my $title = &mt('Difference between submission and correct'); + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Difference between submission and correct', + 'xlabel' => 'Difference from Correct', + 'ylabel' => 'Percent of Answers'); my @labels = (1..scalar(@bins)-1); my $graph = &Apache::loncommon::DrawBarGraph - ($title,'Difference from Correct','Percent of Answers', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # @@ -615,10 +644,7 @@ sub numerical_determine_answers { my ($r,$resource,$partid,$respid,$students)=@_; my $c = $r->connection(); # - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Student Answer Compilation Status', - 'Student Answer Compilation Progress', scalar(@$students), - 'inline',undef,'Statistics','stats_status'); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students)); # # Read in the cache (if it exists) before we start timing things. &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); @@ -652,7 +678,7 @@ sub numerical_determine_answers { } $answers{$correct->{$sname.':'.$sdom}{'answer'}}++; &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - &mt('last student')); + 'last student'); } &Apache::lonstathelpers::write_analysis_cache(); &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); @@ -830,9 +856,9 @@ sub radio_response_analysis { } # if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) { - $analysis_html = '<h2>'. - &mt('There is no submission data for this resource'). - '</h2>'; + $analysis_html = '<div class="LC_warning">' + .&mt('There is no submission data for this resource.') + .'</div>'; $r->print($analysis_html); return; } @@ -846,8 +872,8 @@ sub radio_response_analysis { $no_data_text,@extra_data); if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; - $correct_foil_title = 'Attempt '.$plot_num; - $incorrect_foil_title = 'Attempt '.$plot_num; + $correct_foil_title = &mt('Attempt [_1]',$plot_num); + $incorrect_foil_title = &mt('Attempt [_1]',$plot_num); $pre_graph_text = 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect'; $post_graph_text = ''; @@ -863,7 +889,9 @@ sub radio_response_analysis { &get_time_from_row($response_data->[-1]), $plot_num); $pre_graph_text = - 'Data from [_6] to [_7]<br /> [_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; + 'Data from [_6] to [_7]' + .'<br />' + .'[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); # @@ -903,8 +931,9 @@ sub radio_response_analysis { # Concept Plot my $concept_plot = ''; if (scalar(@$concepts) > 1) { + my $title = &mt('Correct Concepts'); $concept_plot = &RR_concept_plot($concepts,$foil_choice_data, - 'Correct Concepts'); + $title); } # % Choosing plot my $choice_plot = &RR_create_percent_selected_plot @@ -951,11 +980,13 @@ sub radio_response_analysis { } } elsif ($no_data_text ne '') { $analysis_html.='<tr><td colspan="4" align="center">'. + '<div class="LC_warning">'. &mt($no_data_text, $plot_num,$foil_choice_data->{'_count'}, $correct, $foil_choice_data->{'_count'}-$correct, - @extra_data); + @extra_data). + '</div>'; if (defined($post_graph_text)) { $analysis_html.='<br />'.$post_graph_text; } @@ -1017,10 +1048,11 @@ sub RR_concept_plot { for (my $i=0;$i<=$#correct;$i++) { $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); } - my $xlabel = 'concept'; + my $xlabel = &mt('concept'); + my $ylabel = &mt('Percent Choosing'); my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, - 'Percent Choosing', + $ylabel, 100, ['#33ff00','#ff3300'], undef, @@ -1086,10 +1118,11 @@ sub RR_create_percent_selected_plot { @labels = (1 .. scalar(@correct)); } # - my $xlabel = 'foil chosen'; + my $xlabel = &mt('foil chosen'); + my $ylabel = &mt('Percent Choosing'); my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, - 'Percent Choosing', + $ylabel, 100, ['#33ff00','#ff3300'], \@labels, @@ -1150,8 +1183,10 @@ sub RR_create_stacked_selection_plot { push(@empty_row,0); } # + my $xlabel = &mt('Correct Foil'); + my $ylabel = &mt('foils chosen Incorrectly'); my $graph = &Apache::loncommon::DrawBarGraph - ($title,'Correct Foil','foils chosen Incorrectly', + ($title,$xlabel,$ylabel, 100,$plotcolors,\@labels,\@empty_row,@dataset); return ($graph,\%count_per_foil); } @@ -1217,9 +1252,10 @@ sub OptionResponseAnalysis { $resource->symb,$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { - $r->print('<h2>'. - &mt('There is no student data for this problem.'). - '</h2>'); + $r->print('<div class="LC_warning">' + .&mt('There is no student data for this problem.') + .'</div>' + ); } else { $r->rflush(); if ($env{'form.AnalyzeOver'} eq 'tries') { @@ -1234,10 +1270,10 @@ sub OptionResponseAnalysis { $r->print($analysis_html); $r->rflush(); } else { - $r->print('<h2>'. - &mt('The analysis you have selected is '. - 'not supported at this time'). - '</h2>'); + $r->print('<div class="LC_warning"' + .&mt('The analysis you have selected is not supported at this time.') + .'</div>' + ); } } } @@ -1314,12 +1350,18 @@ sub OR_tries_analysis { if (! defined($response_data{'_total'}->[$try]) || $response_data{'_total'}->[$try] == 0) { if ($try > 1) { - $analysis_html.= '<tr><td align="center" colspan="4"><b>'. - &mt('None of the selected students attempted the problem more than [_1] times.',$try-1). - '</b></td></tr>'; + $analysis_html.= '<tr><td colspan="4">' + .'<div class="LC_info">' + .&mt('None of the selected students attempted the problem more than [quant,_1,time].' + ,$try-1) + .'</div>' + .'</td></tr>'; } else { - $analysis_html.= '<tr><td colspan="4" align="center"><b>'. - &mt('None of the selected students have attempted the problem').'</b></td></tr>'; + $analysis_html.= '<tr><td colspan="4">' + .'<div class="LC_info">' + .&mt('None of the selected students have attempted the problem.') + .'</div>' + .'</td></tr>'; } last; } @@ -1340,8 +1382,12 @@ sub OR_tries_analysis { } } # + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Concepts', + 'xlabel' => 'Concept Number', + 'ylabel' => 'Percent Correct'); $concept_graph = &Apache::loncommon::DrawBarGraph - ('Correct Concepts','Concept Number','Percent Correct', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1}); } # @@ -1379,8 +1425,12 @@ sub OR_tries_analysis { push(@Labels,''); } # + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Statements', + 'xlabel' => 'Statement', + 'ylabel' => '% Answered Correct'); my $correct_graph = &Apache::loncommon::DrawBarGraph - ('Correct Statements','Statement','% Answered Correct', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, 100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1}); # @@ -1391,8 +1441,12 @@ sub OR_tries_analysis { } my $count = $response_data{'_total'}->[$try] - $response_data{'_correct'}->[$try]; + %lt = &Apache::lonlocal::texthash( + 'title' => 'Incorrect Statements', + 'xlabel' => 'Statement', + 'ylabel' => '% Chosen Incorrectly'); my $incorrect_graph = &Apache::loncommon::DrawBarGraph - ('Incorrect Statements','Statement','% Chosen Incorrectly', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, 100,$plotcolors,\@Labels,@Datasets,{xskip=>1}); $analysis_html.= '<tr><td colspan="4" align="center">'. @@ -1454,10 +1508,11 @@ sub OR_time_analysis { if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } # if ($num_concepts < 2) { - $table = '<h3>'. - &mt('Not enough data for concept analysis. '. - 'Performing Foil Analysis'). - '</h3>'.$table; + $table = '<p class="LC_info">'. + &mt('Not enough data for concept analysis.'. + ' Performing Foil Analysis instead.'). + '</p>'. + $table; } # my $num_plots = $env{'form.NumPlots'}; @@ -1514,7 +1569,7 @@ sub OR_time_analysis { $correct |= 0; ## $table .= '<tr><td colspan="4" align="center"><font size="+1">'. - &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', + &mt('[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect', $data_count,$student_count,$correct,$data_count-$correct). '</font></td></tr>'.$/; my $concept_correct_plot = ''; @@ -1536,7 +1591,7 @@ sub OR_time_analysis { $table .= '<tr><td colspan="4" align="center">'. &mt('Start time: [_1]',$startdateform).'<br />'. &mt('End time: [_1]',$enddateform).'</td></tr>'.$/; - $table.= '<tr><td colspan="4"> </td></tr>'.$/; + $table.= '<tr><td colspan="4"> </td></tr>'.$/; } $table .= '</table>'; # @@ -1547,7 +1602,11 @@ sub OR_Foil_Time_Analysis { my ($processed_time_data,$correct,$data_count,$student_count, $ORdata,$Foils,$Concepts) = @_; if ($data_count <= 0) { - return ('<h2>'.&mt('There is no data to plot').'</h2>',''); + return ('<div class="LC_warning">' + .&mt('There is no data to plot.') + .'</div>' + ,'' + ); } my $analysis_html; my @plotdata; @@ -1582,9 +1641,13 @@ sub OR_Foil_Time_Analysis { } # # Create the plot - my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements', - 'Statement Number', - 'Percent Correct', + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Statements', + 'xlabel' => 'Statement Number', + 'ylabel' => 'Percent Correct'); + my $correct_plot = &Apache::loncommon::DrawBarGraph($lt{'title'}, + $lt{'xlabel'}, + $lt{'ylabel'}, 100, $plotcolors, undef, @@ -1593,10 +1656,14 @@ sub OR_Foil_Time_Analysis { for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) { $plotdata[0]->[$j]=0; } + %lt = &Apache::lonlocal::texthash( + 'title' => 'Incorrect Statements', + 'xlabel' => 'Statement Number', + 'ylabel' => 'Incorrect Option Choice'); my $incorrect_plot = - &Apache::loncommon::DrawBarGraph('Incorrect Statements', - 'Statement Number', - 'Incorrect Option Choice', + &Apache::loncommon::DrawBarGraph($lt{'title'}, + $lt{'xlabel'}, + $lt{'ylabel'}, 100, $plotcolors, undef, @@ -1625,9 +1692,13 @@ sub OR_Concept_Time_Analysis { } # # Create the plot - return &Apache::loncommon::DrawBarGraph('Correct Concepts', - 'Concept Number', - 'Percent Correct', + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Concepts', + 'xlabel' => 'Concept Number', + 'ylabel' => 'Percent Correct'); + return &Apache::loncommon::DrawBarGraph($lt{'title'}, + $lt{'xlabel'}, + $lt{'ylabel'}, 100, $plotcolors, undef, @@ -1723,23 +1794,23 @@ sub build_foil_index { } # # Build up the table of row labels. - my $table = '<table border="1" >'."\n"; + my $table = &Apache::loncommon::start_data_table(); if (@Concepts > 1) { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Concept Number').'</th>'. '<th>'.&mt('Concept').'</th>'. '<th>'.&mt('Foil Number').'</th>'. '<th>'.&mt('Foil Name').'</th>'. '<th>'.&mt('Foil Text').'</th>'. '<th>'.&mt('Correct Value').'</th>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_header_row(); } else { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Foil Number').'</th>'. '<th>'.&mt('Foil Name').'</th>'. '<th>'.&mt('Foil Text').'</th>'. '<th>'.&mt('Correct Value').'</th>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_header_row(); } my $conceptindex = 1; my $foilindex = 1; @@ -1747,39 +1818,39 @@ sub build_foil_index { my @FoilsInConcept = @{$concept->{'foils'}}; my $firstfoil = shift(@FoilsInConcept); if (@Concepts > 1) { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td>'.$conceptindex.'</td>'. '<td>'.&HTML::Entities::encode($concept->{'name'},'<>&"').'</td>'. '<td>'.$foilindex++.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td>'.$foilindex++.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } foreach my $foilid (@FoilsInConcept) { if (@Concepts > 1) { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td></td>'. '<td></td>'. '<td>'.$foilindex.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td>'.$foilindex.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } } continue { $foilindex++; @@ -1787,7 +1858,7 @@ sub build_foil_index { } continue { $conceptindex++; } - $table .= "</table>\n"; + $table .= &Apache::loncommon::end_data_table(); # # Build option index with color stuff return ($table,\@Foils,\@Concepts); @@ -1849,17 +1920,18 @@ sub CreateInterface { ## ## Build the menu my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis'); - $Str .= '<table cellspacing="5">'."\n"; - $Str .= '<tr>'; - $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>'; - $Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>'; - $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>'; - $Str .= '<td align="center"> </td>'; - $Str .= '</tr>'."\n"; + $Str .= '<p>'; + $Str .= &Apache::loncommon::start_data_table(); + $Str .= &Apache::loncommon::start_data_table_header_row(); + $Str .= '<th>'.&mt('Sections').'</th>'; + $Str .= '<th>'.&mt('Groups').'</th>'; + $Str .= '<th>'.&mt('Access Status').'</th>'; + $Str .= '<th>'.&mt('Options').'</th>'; + $Str .= &Apache::loncommon::end_data_table_header_row(); ## ## - $Str .= '<tr><td align="center">'."\n"; + $Str .= &Apache::loncommon::start_data_table_row(); + $Str .= '<td align="center">'."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= '</td>'; # @@ -1873,35 +1945,35 @@ sub CreateInterface { # ## ## - $Str .= '<td>'; + $Str .= '<td valign="top">'; ## my $showprob_checkbox = - '<input type="checkbox" name="show_prob" value="true" '; + '<input type="checkbox" name="show_prob" value="true"'; if ($env{'form.show_prob'} eq 'true') { - $showprob_checkbox .= 'checked '; + $showprob_checkbox .= ' checked="checked"'; } $showprob_checkbox.= ' />'; - $Str.= '<nobr><label>'. - &mt('Show problem [_1]',$showprob_checkbox). - '</label></nobr><br />'; + $Str.= '<span class="LC_nobreak"><label>'. + $showprob_checkbox.' '.&mt('Show problem'). + '</label></span><br />'; ## - my $analyze_selector = '<select name="AnalyzeOver" >'; - $analyze_selector .= '<option value="tries" '; + my $analyze_selector = '<select name="AnalyzeOver">'; + $analyze_selector .= '<option value="tries"'; if (! exists($env{'form.AnalyzeOver'}) || $env{'form.AnalyzeOver'} eq 'tries'){ # Default to tries - $analyze_selector .= ' selected '; + $analyze_selector .= ' selected="selected"'; } $analyze_selector .= '>'.&mt('Tries').'</option>'; - $analyze_selector .= '<option value="time" '; - $analyze_selector .= ' selected ' if ($env{'form.AnalyzeOver'} eq 'time'); + $analyze_selector .= '<option value="time"'; + $analyze_selector .= ' selected="selected"' if ($env{'form.AnalyzeOver'} eq 'time'); $analyze_selector .= '>'.&mt('Time').'</option>'; $analyze_selector .= '</select>'; - $Str .= '<nobr><label>'. + $Str .= '<span class="LC_nobreak"><label>'. &mt('Analyze Over [_1] [_2]', $analyze_selector, &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')). - '</label></nobr><br />'.$/; + '</label></span><br />'.$/; ## my $numplots_selector = '<select name="NumPlots">'; if (! exists($env{'form.NumPlots'}) @@ -1911,23 +1983,24 @@ sub CreateInterface { } foreach my $i (1,2,3,4,5,6,7,8,10,15,20) { $numplots_selector .= '<option value="'.$i.'" '; - if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; } + if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected="selected" '; } $numplots_selector .= '>'.$i.'</option>'; } - $numplots_selector .= '</select></nobr><br />'; - $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector). - '</label></nobr>'; + $numplots_selector .= '</select>'; + $Str .= '<span class="LC_nobreak"><label>'.&mt('Number of Plots [_1]',$numplots_selector). + '</label></span><br />'; ## - $Str .= '<nobr><label>'.&mt('Status: [_1]', - '<input type="text" '. - 'name="stats_status" size="60" value="" />' - ). - '</label></nobr>'; $Str .= '</td>'; ## ## - $Str .= '</tr>'."\n"; - $Str .= '</table>'."\n"; + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); + $Str .= '<p class="LC_nobreak"><label>' + .&mt('Status: [_1]', + '<input type="text" name="stats_status"' + .' size="60" value="" readonly="readonly" />') + .'</label></p>'; + $Str .= '</p>'; return $Str; }