version 1.430, 2008/09/11 14:47:17
|
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(); |
|
|
unless ($env{'environment.wysiwygeditor'} eq 'on') { |
if ($env{'environment.wysiwygeditor'} eq 'on') { |
$extra_head .= &Apache::lonhtmlcommon::dragmath_js(); |
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup"); |
|
} else { |
|
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
} |
} |
|
|
my %body_args; |
my %body_args; |
Line 1285 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 1392 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); |
foreach my $language (split(/\s*\,\s*/,$which)) { |
if ($which=~/\w/) { |
unless ($language=~/\w/) { next; } |
$available_texts{$which} = $result; |
$available_texts{$language} = $result; |
} |
|
my $otherlangs = &Apache::lonxml::get_param('other',$parstack, |
|
$safeeval); |
|
foreach my $language (split(/\s*\,\s*/,$otherlangs)) { |
|
if ($language=~/\w/) { |
|
$available_texts{$language} = $result; |
|
} |
} |
} |
|
|
} |
} |
Line 1890 sub end_startouttext {
|
Line 1906 sub end_startouttext {
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth; |
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) |
|
.'</span></td>'; |
unless ($env{'environment.wysiwygeditor'} eq 'on') { |
unless ($env{'environment.wysiwygeditor'} eq 'on') { |
$result.='<td align="left">' |
$result .= '<td align="left">' |
.&Apache::lonhtmlcommon::dragmath_button($areaid,1) |
.&Apache::lonhtmlcommon::dragmath_button($areaid,1) |
.'</td>' |
.'</td>' |
.'<td>' |
.'<td>' |
.&Apache::edit::insertlist($target,$token) |
.&Apache::edit::insertlist($target,$token) |
.'</td>'; |
.'</td>'; |
} |
} |
$result.='<td align="right" valign="top">' . |
$result.='<td align="right" valign="top">' . |
&Apache::loncommon::helpLatexCheatsheet(). |
&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); |