[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm /xml scripttag.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Sat, 26 Feb 2005 06:14:02 -0000
albertel Sat Feb 26 01:14:02 2005 EDT
Modified files:
/loncom/xml scripttag.pm
/loncom/interface lonmenu.pm
Log:
- mathml in CSTR with inline remote, has worked for one resource
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.123 loncom/xml/scripttag.pm:1.124
--- loncom/xml/scripttag.pm:1.123 Wed Feb 23 20:21:50 2005
+++ loncom/xml/scripttag.pm Sat Feb 26 01:14:01 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# <script> definiton
#
-# $Id: scripttag.pm,v 1.123 2005/02/24 01:21:50 albertel Exp $
+# $Id: scripttag.pm,v 1.124 2005/02/26 06:14:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,6 @@
use strict;
use Apache::lonnet;
use Apache::style;
-use AlgParser;
#Globals
# this used to pass around the standard callsub arguments to a tag func
@@ -120,7 +119,7 @@
my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
$result.="<script type=\"text/javascript\">
-// <!--
+// <![CDATA[
function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
my $listing=&Apache::run::dump($target,$safeeval);
$listing=~s/\'/\\\'/g;
@@ -128,7 +127,7 @@
$listing=~s/\r/\\r/g;
$result.=$listing;
$result.= "</pre></body></html>');newWindow.document.close();}
-// -->
+// ]]>
</script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
}
} elsif ($target eq "edit" ) {
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.149 loncom/interface/lonmenu.pm:1.150
--- loncom/interface/lonmenu.pm:1.149 Sun Feb 20 19:32:04 2005
+++ loncom/interface/lonmenu.pm Sat Feb 26 01:14:01 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.149 2005/02/21 00:32:04 www Exp $
+# $Id: lonmenu.pm,v 1.150 2005/02/26 06:14:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -112,9 +112,8 @@
my $utility=&utilityfunctions();
my $output=(<<ENDMAINMENU);
<script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
$utility
--->
</script>
<a href="/adm/menu" target="_top">$lt{'main'}</a>
$reloadlink $navmaps
@@ -188,9 +187,10 @@
my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
return (<<ENDINLINEMENU);
<script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
+// <![CDATA[
$utility
--->
+// ]]>
</script>
<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
<tr>
@@ -309,9 +309,10 @@
}
if ($ENV{'request.state'} eq 'construct') {
$newmail = $titletable;
- }
- if ($noremote) {
- $newmail.='</td></tr></table></font>';
+ } else {
+ if ($noremote) {
+ $newmail.='</td></tr></table></font>';
+ }
}
my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
@@ -503,7 +504,7 @@
$result = (<<ENDREGTHIS);
<script type="text/javascript">
-// <!-- BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
var swmenu=null;
function LONCAPAreg() {
@@ -538,7 +539,7 @@
2000);
}
-// END LON-CAPA Internal -->
+// END LON-CAPA Internal
</script>
ENDREGTHIS
}