--- loncom/xml/lonxml.pm 2009/05/28 11:31:03 1.495 +++ loncom/xml/lonxml.pm 2010/02/08 00:35:06 1.505 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.495 2009/05/28 11:31:03 bisitz Exp $ +# $Id: lonxml.pm,v 1.505 2010/02/08 00:35:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,6 +111,7 @@ use Apache::loncacc(); use Apache::lonmaxima(); use Apache::lonr(); use Apache::lonlocal; +use Apache::lonhtmlcommon(); #==================================== Main subroutine: xmlparse @@ -243,7 +244,7 @@ sub tokeninputfield { document.tokeninput.barcode.value=''; } -
+ +onchange="updatetoken()"/>* +onchange="this.value=this.value.toUpperCase()" />
DocID Checkin
@@ -251,7 +252,7 @@ sub tokeninputfield {
Scan in Barcode
or Type in DocID @@ -260,7 +261,7 @@ onChange="updatetoken()"/>
@@ -757,6 +758,8 @@ sub init_safespace { '&maxima_cas_formula_fix'); $safehole->wrap(\&Apache::lonr::r_eval,$safeeval,'&r_eval'); + $safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry'); + $safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray'); $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check'); $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval, '&r_cas_formula_fix'); @@ -1041,7 +1044,7 @@ sub get_id { my ($parstack,$safeeval)=@_; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) { - &error(&mt("ID "[_1]" contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",''.$id.'')); + &error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"'.$id.'"')); } if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } return $id; @@ -1544,20 +1547,30 @@ sub renderingoptions { = &Apache::loncommon::plainlanguagedescription($_); } } - return - ''. - &mt('Language:').' '. - &Apache::loncommon::select_form($env{'form.languages'},'languages', - %langchoices).' - - '. + my $output; + unless ($env{'form.forceedit'}) { + $output .= + ''. + &mt('Language:').' '. + &Apache::loncommon::select_form( + $env{'form.languages'}, + 'languages', + &Apache::lonlocal::texthash(%langchoices)). + ''; + } + $output .= + ' '. &mt('Math Rendering:').' '. - &Apache::loncommon::select_form($env{'form.texengine'},'texengine', - ('' => '', - 'tth' => 'tth (TeX to HTML)', - 'jsMath' => 'jsMath', - 'mimetex' => 'mimetex (Convert to Images)')).' - '; + &Apache::loncommon::select_form( + $env{'form.texengine'}, + 'texengine', + &Apache::lonlocal::texthash + ('' => '', + 'tth' => 'tth (TeX to HTML)', + 'jsMath' => 'jsMath', + 'mimetex' => 'mimetex (Convert to Images)')). + ''; + return $output; } sub inserteditinfo { @@ -1604,7 +1617,7 @@ FULLPAGE } FULLPAGE - if ($filetype eq 'html') { + if ($filetype eq 'html' || $filetype eq 'tex') { $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup'); $dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1); } @@ -1618,6 +1631,7 @@ FULLPAGE } my $titledisplay=&display_title(); + my $wysiwyglink; my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', 'vi' => 'Save and View', 'dv' => 'Discard Edits and View', @@ -1632,6 +1646,13 @@ FULLPAGE if ($htmlerror) { $htmlerror=''.$htmlerror.''; } + if (&Apache::lonhtmlcommon::htmlareabrowser()) { + if (&Apache::lonhtmlcommon::htmlareablocked()) { + $wysiwyglink = &Apache::lonhtmlcommon::enablelink($textarea_id); + } else { + $wysiwyglink = &Apache::lonhtmlcommon::disablelink($textarea_id); + } + } } my $editfooter=(<
+ $wysiwyglink
$titledisplay
@@ -1704,18 +1726,46 @@ sub handler { $request->set_last_modified(&Apache::lonnet::metadata($request->uri, 'lastrevisiondate')); } + # Embedded Flash movies from Camtasia served from https will not display in IE + # if XML config file has expired from cache. + if ($ENV{'SERVER_PORT'} == 443) { + if ($request->uri =~ /\.xml$/) { + my ($httpbrowser,$clientbrowser) = + &Apache::loncommon::decode_user_agent($request); + if ($clientbrowser =~ /^explorer$/i) { + delete $request->headers_out->{'Cache-control'}; + delete $request->headers_out->{'Pragma'}; + my $expiration = time + 60; + my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime($expiration)); + $request->headers_out->set("Expires" => $date); + } + } + } $request->send_http_header; return OK if $request->header_only; my $file=&Apache::lonnet::filelocation("",$request->uri); - my $filetype; - if ($file =~ /\.(sty|css|js|txt)$/) { + my ($filetype,$breadcrumbtext); + if ($file =~ /\.(sty|css|js|txt|tex)$/) { $filetype=$1; } else { $filetype='html'; } + if ($filetype eq 'sty') { + $breadcrumbtext = 'Style File Editor'; + } elsif ($filetype eq 'js') { + $breadcrumbtext = 'Javascript Editor'; + } elsif ($filetype eq 'css') { + $breadcrumbtext = 'CSS Editor'; + } elsif ($filetype eq 'txt') { + $breadcrumbtext = 'Text Editor'; + } elsif ($filetype eq 'tex') { + $breadcrumbtext = 'TeX Editor'; + } else { + $breadcrumbtext = 'HTML Editor'; + } # # Edit action? Save file. @@ -1750,7 +1800,7 @@ ENDNOTFOUND $filecontents=&createnewsty(); } elsif ($filetype eq 'js') { $filecontents=&createnewjs(); - } elsif (($filetype ne 'css') && ($filetype ne 'txt')) { + } elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') { $filecontents=&createnewhtml(); } $env{'form.editmode'}='Edit'; #force edit mode @@ -1774,21 +1824,31 @@ ENDNOTFOUND # up if it did &Apache::structuretags::reset_problem_globals(); &Apache::lonhomework::finished_parsing(); + } elsif ($filetype eq 'tex') { + $result = &Apache::lontexconvert::converted(\$filecontents, + $env{'form.texengine'}); + if ($env{'form.return_only_error_and_warning_counts'}) { + if (&verify_html(''.$result.'')) { + $errorcount++; + } + $result = "$errorcount:$warningcount"; + } } else { $result = $filecontents; } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['rawmode']); if ($env{'form.rawmode'}) { $result = $filecontents; } - if ($filetype ne 'html') { - my $nochgview = 1; + if (($filetype ne 'html') && + (!$env{'form.return_only_error_and_warning_counts'})) { + my $nochgview = 1; my $controls = ''; if ($env{'request.state'} eq 'construct') { $controls = &Apache::loncommon::head_subbox( &Apache::loncommon::CSTR_pageheader() .&Apache::londefdef::edit_controls($nochgview)); } - if ($filetype ne 'sty') { + if ($filetype ne 'sty' && $filetype ne 'tex') { $result =~ s//>/g; $result = ''. @@ -1798,10 +1858,10 @@ ENDNOTFOUND if ($env{'environment.remote'} eq 'off') { my $brcrum; if ($env{'request.state'} eq 'construct') { - $brcrum = [{'href' => '', # FIXME Add link to /priv/[user] + $brcrum = [{'href' => &Apache::loncommon::authorspace(), 'text' => 'Construction Space'}, {'href' => '', - 'text' => 'Editor'}]; + 'text' => $breadcrumbtext}]; } else { $brcrum = ''; # FIXME: Where are we? } @@ -1835,13 +1895,16 @@ ENDNOTFOUND ('add_entries' => {'onresize' => $add_to_onresize, 'onload' => $add_to_onload, }); - - $options{'bread_crumbs'} = [{ - 'href' => '', # FIXME Add link to /priv/[user] - 'text' => 'Construction Space'}, - {'href' => '', - 'text' => 'HTML Editor'}]; - + my $header; + if ($env{'request.state'} eq 'construct') { + $options{'bread_crumbs'} = [{ + 'href' => &Apache::loncommon::authorspace(), + 'text' => 'Construction Space'}, + {'href' => '', + 'text' => $breadcrumbtext}]; + $header = &Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()); + } if ($env{'environment.remote'} ne 'off') { $options{'bgcolor'} = '#FFFFFF'; $options{'only_body'} = 1; @@ -1852,15 +1915,14 @@ ENDNOTFOUND my $start_page = &Apache::loncommon::start_page(undef,$js, \%options); $result = $start_page - .&Apache::loncommon::head_subbox( - &Apache::loncommon::CSTR_pageheader()) + .$header .&Apache::lonxml::message_location() .$edit_info .&Apache::loncommon::end_page(); } } if ($filetype eq 'html') { &writeallows($request->uri); } - + &Apache::lonxml::add_messages(\$result); $request->print($result);