--- loncom/xml/lonxml.pm 2004/06/04 14:03:57 1.321
+++ loncom/xml/lonxml.pm 2004/06/12 01:09:31 1.325
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.321 2004/06/04 14:03:57 www Exp $
+# $Id: lonxml.pm,v 1.325 2004/06/12 01:09:31 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -150,6 +150,7 @@ $Apache::lonxml::warnings_error_header='
sub xmlbegin {
my $output='';
+ @htmlareafields=();
if ($ENV{'browser.mathml'}) {
$output='<?xml version="1.0"?>'
.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
@@ -604,6 +605,7 @@ sub setup_globals {
my ($request,$target)=@_;
$Apache::lonxml::request=$request;
$Apache::lonxml::registered = 0;
+ @Apache::lonxml::htmlareafields=();
$errorcount=0;
$warningcount=0;
$Apache::lonxml::default_homework_loaded=0;
@@ -662,7 +664,9 @@ sub init_safespace {
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
$safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart');
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
-
+ $safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,
+ '&chem_standard_order');
+
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
@@ -736,6 +740,7 @@ sub init_safespace {
$safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed');
$safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
$safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
+ $safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');
#need to inspect this class of ops
# $safeeval->deny(":base_orig");
@@ -1128,15 +1133,17 @@ sub inserteditinfo {
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
# my $editheader='<a href="#editsection">Edit below</a><hr />';
my $xml_help = '';
- my $activate='';
my $initialize='';
if ($filetype eq 'html') {
+ my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
$initialize=&Apache::lonhtmlcommon::htmlareaheaders().(<<FULLPAGE);
<script type="text/javascript">
+$addbuttons
+
HTMLArea.loadPlugin("FullPage");
function initDocument() {
- var editor=new HTMLArea("editor");
+ var editor=new HTMLArea("filecont",config);
editor.registerPlugin(FullPage);
editor.generate();
}
@@ -1144,8 +1151,6 @@ sub inserteditinfo {
FULLPAGE
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i;
$xml_help=&Apache::loncommon::helpLatexCheatsheet();
-#FIXME: need to install FullPage plugin during install
-# $activate=&Apache::lonhtmlcommon::htmlareaactive();
}
my $cleanbut = '';
if ($filetype eq 'html') {
@@ -1174,7 +1179,6 @@ $buttons<br />
<br />
</form>
$titledisplay
-$activate
</body>
ENDFOOTER
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is;