version 1.423, 2008/06/11 13:52:35
|
version 1.434.2.1, 2008/12/11 04:54:32
|
Line 36 use Apache::File();
|
Line 36 use Apache::File();
|
use Apache::lonmenu; |
use Apache::lonmenu; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonxml; |
use Apache::lonxml; |
|
use Apache::londefdef; |
use Apache::lonenc(); |
use Apache::lonenc(); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use lib '/home/httpd/lib/perl/'; |
use lib '/home/httpd/lib/perl/'; |
Line 74 sub start_tex {
|
Line 75 sub start_tex {
|
if ($target ne 'edit' && $target ne 'modified') { |
if ($target ne 'edit' && $target ne 'modified') { |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
return $bodytext.' '; |
|
|
# If inside a table, occurrences of \\ must be removed; |
|
# else the table blows up. |
|
|
|
if (&Apache::londefdef::is_inside_of($tagstack, "table")) { |
|
$bodytext =~ s/\\\\//g; |
|
} |
|
return $bodytext.'{}'; |
} |
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
my $bodytext = |
my $bodytext = |
Line 148 sub page_start {
|
Line 156 sub page_start {
|
|
|
$extra_head .= &homework_js(); |
$extra_head .= &homework_js(); |
|
|
|
if ($env{'environment.wysiwygeditor'} eq 'on') { |
|
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup"); |
|
} else { |
|
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
|
} |
|
|
my %body_args; |
my %body_args; |
if (defined($found{'html'})) { |
if (defined($found{'html'})) { |
$body_args{'skip_phases'}{'head'}=1; |
$body_args{'skip_phases'}{'head'}=1; |
Line 412 sub problem_web_to_edit_header {
|
Line 426 sub problem_web_to_edit_header {
|
<select name='problemtype'> |
<select name='problemtype'> |
<option value=''></option> |
<option value=''></option> |
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option> |
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option> |
".&option('problem','problemtype').&mt("Homework problem")."</option> |
".&option('problem','problemtype').&mt("Homework Problem")."</option> |
".&option('survey' ,'problemtype').&mt("Survey Question")."</option> |
".&option('survey' ,'problemtype').&mt("Survey Question")."</option> |
|
".&option('practice' ,'problemtype').&mt("Practice Problem")."</option> |
</select> |
</select> |
</span> |
</span> |
$show_all |
$show_all |
Line 861 sub start_problem {
|
Line 876 sub start_problem {
|
'</label>'; |
'</label>'; |
} |
} |
if ($Apache::lonhomework::type eq 'practice') { |
if ($Apache::lonhomework::type eq 'practice') { |
$form_tag_start.='<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'. |
$form_tag_start.=&practice_problem_header(); |
'<span class="LC_info">'.&mt('Submissions are not permanently recorded').'</span>'; |
|
} |
} |
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} |
} |
Line 936 sub start_problem {
|
Line 950 sub start_problem {
|
# create a page header and exit |
# create a page header and exit |
if ($env{'request.state'} eq "construct") { |
if ($env{'request.state'} eq "construct") { |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
|
if ($Apache::lonhomework::type eq 'practice') { |
|
$result.= '<input type="submit" name="resetdata" '. |
|
'value="'.&mt('New Problem Variation').'" />'. |
|
&practice_problem_header().'<hr />'; |
|
} |
} |
} |
# if we are viewing someone else preserve that info |
# if we are viewing someone else preserve that info |
if (defined $env{'form.grade_symb'}) { |
if (defined $env{'form.grade_symb'}) { |
Line 1171 sub start_library {
|
Line 1190 sub start_library {
|
$result.=" \n $form_tag_start". |
$result.=" \n $form_tag_start". |
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
$result.=&problem_web_to_edit_header($rndseed); |
$result.=&problem_web_to_edit_header($rndseed); |
|
if ($Apache::lonhomework::type eq 'practice') { |
|
$result.= '<input type="submit" name="resetdata" '. |
|
'value="'.&mt('New Problem Variation').'" />'. |
|
&practice_problem_header().'<hr />'; |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 1271 sub start_languageblock {
|
Line 1295 sub start_languageblock {
|
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $include = $token->[2]->{'include'}; |
my $include = $token->[2]->{'include'}; |
my $exclude = $token->[2]->{'exclude'}; |
my $exclude = $token->[2]->{'exclude'}; |
my @preferred_languages=&Apache::loncommon::preferred_languages(); |
my @preferred_languages=&Apache::lonlocal::preferred_languages(); |
# This should not even happen, since we should at least have the server language |
# This should not even happen, since we should at least have the server language |
if (!$preferred_languages[0]) { $preferred_languages[0]='en'; } |
if (!$preferred_languages[0]) { $preferred_languages[0]='en'; } |
# Now loop over all languages in order of preference |
# Now loop over all languages in order of preference |
Line 1378 sub end_languageblock {
|
Line 1402 sub end_languageblock {
|
my $result = &Apache::lonxml::endredirection(); |
my $result = &Apache::lonxml::endredirection(); |
my $which = &Apache::lonxml::get_param('which',$parstack, |
my $which = &Apache::lonxml::get_param('which',$parstack, |
$safeeval); |
$safeeval); |
$available_texts{$which} = $result; |
if ($which=~/\w/) { |
|
$available_texts{$which} = $result; |
|
} |
|
my $otherlangs = &Apache::lonxml::get_param('other',$parstack, |
|
$safeeval); |
|
foreach my $language (split(/\s*\,\s*/,$otherlangs)) { |
|
if ($language=~/\w/) { |
|
$available_texts{$language} = $result; |
|
} |
|
} |
|
|
} |
} |
return ''; |
return ''; |
} |
} |
Line 1475 sub end_while {
|
Line 1509 sub end_while {
|
$return = &Apache::run::run($code,$safeeval); |
$return = &Apache::run::run($code,$safeeval); |
} |
} |
if ($error) { |
if ($error) { |
&Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while> on line').' '.$line.'</pre>'); |
&Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running <while> on line').' '.$line.'</pre>'); |
} |
} |
} elsif ($target eq "edit") { |
} elsif ($target eq "edit") { |
$result.= &Apache::edit::tag_end($target,$token,''); |
$result.= &Apache::edit::tag_end($target,$token,''); |
Line 1835 sub start_problemtype {
|
Line 1869 sub start_problemtype {
|
$result .=&Apache::edit::checked_arg('When used as type(s):','for', |
$result .=&Apache::edit::checked_arg('When used as type(s):','for', |
[ ['exam','Exam/Quiz Problem'], |
[ ['exam','Exam/Quiz Problem'], |
['survey','Survey'], |
['survey','Survey'], |
['problem','Homework Problem'] ] |
['problem','Homework Problem'], |
|
['practice','Practice Problem'] ] |
,$token); |
,$token); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
Line 1868 sub end_startouttext {
|
Line 1903 sub end_startouttext {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $text=''; |
my $text=''; |
|
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
|
my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth; |
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
|
<td>".&mt('Delete:'). |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>" |
&Apache::edit::deletelist($target,$token) |
.'<td><span clas="LC_nobreak">'.&mt('Delete?').' ' |
."</td> |
.&Apache::edit::deletelist($target,$token) |
<td>". |
.'</span></td>'; |
&Apache::edit::insertlist($target,$token). |
unless ($env{'environment.wysiwygeditor'} eq 'on') { |
'</td><td align="right" valign="top">' . |
$result .= '<td align="left">' |
&Apache::loncommon::helpLatexCheatsheet(). |
.&Apache::lonhtmlcommon::dragmath_button($areaid,1) |
|
.'</td>' |
|
.'<td>' |
|
.&Apache::edit::insertlist($target,$token) |
|
.'</td>'; |
|
} |
|
$result.='<td align="right" valign="top">' . |
|
&Apache::loncommon::helpLatexCheatsheet(). |
&Apache::edit::end_row(). |
&Apache::edit::end_row(). |
&Apache::edit::start_spanning_row()."\n". |
&Apache::edit::start_spanning_row()."\n". |
&Apache::edit::editfield($token->[1],$text,"",80,8,1); |
&Apache::edit::editfield($token->[1],$text,"",80,8,1); |
Line 1952 sub end_simpleeditbutton {
|
Line 1994 sub end_simpleeditbutton {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub practice_problem_header { |
|
return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'. |
|
'<span class="LC_info">'.&mt('Submissions are not permanently recorded'). |
|
'</span>'; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |