--- loncom/homework/structuretags.pm 2008/07/28 05:26:00 1.425 +++ loncom/homework/structuretags.pm 2008/08/21 20:46:23 1.428 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.425 2008/07/28 05:26:00 raeburn Exp $ +# $Id: structuretags.pm,v 1.428 2008/08/21 20:46:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -416,8 +416,9 @@ sub problem_web_to_edit_header { $show_all @@ -865,8 +866,7 @@ sub start_problem { ''; } if ($Apache::lonhomework::type eq 'practice') { - $form_tag_start.='

'.&mt('Practice Problem').'

'. - ''.&mt('Submissions are not permanently recorded').''; + $form_tag_start.=&practice_problem_header(); } $form_tag_start.='
'; } @@ -940,6 +940,11 @@ sub start_problem { # create a page header and exit if ($env{'request.state'} eq "construct") { $result.= &problem_web_to_edit_header($env{'form.rndseed'}); + if ($Apache::lonhomework::type eq 'practice') { + $result.= ''. + &practice_problem_header().'
'; + } } # if we are viewing someone else preserve that info if (defined $env{'form.grade_symb'}) { @@ -1175,6 +1180,11 @@ sub start_library { $result.=" \n $form_tag_start". ''; $result.=&problem_web_to_edit_header($rndseed); + if ($Apache::lonhomework::type eq 'practice') { + $result.= ''. + &practice_problem_header().'
'; + } } return $result; } @@ -1382,7 +1392,11 @@ sub end_languageblock { my $result = &Apache::lonxml::endredirection(); my $which = &Apache::lonxml::get_param('which',$parstack, $safeeval); - $available_texts{$which} = $result; + foreach my $language (split(/\s*\,\s*/,$which)) { + unless ($language=~/\w/) { next; } + $available_texts{$language} = $result; + } + } return ''; } @@ -1839,7 +1853,8 @@ sub start_problemtype { $result .=&Apache::edit::checked_arg('When used as type(s):','for', [ ['exam','Exam/Quiz Problem'], ['survey','Survey'], - ['problem','Homework Problem'] ] + ['problem','Homework Problem'], + ['practice','Practice Problem'] ] ,$token); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { @@ -1879,10 +1894,7 @@ sub end_startouttext { $result.=&Apache::edit::start_table($token)."".&mt('Text Block')." ".&mt('Delete:'). &Apache::edit::deletelist($target,$token) - ." -". - &Apache::edit::insertlist($target,$token). - ''; + .""; unless ($env{'environment.wysiwygeditor'} eq 'on') { $result.='' .&Apache::lonhtmlcommon::dragmath_button($areaid,1) @@ -1963,5 +1975,11 @@ sub end_simpleeditbutton { return ''; } +sub practice_problem_header { + return '

'.&mt('Practice Problem').'

'. + ''.&mt('Submissions are not permanently recorded'). + ''; +} + 1; __END__