[LON-CAPA-cvs] cvs: loncom /homework chemresponse.pm /interface loncommon.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 25 May 2005 21:45:10 -0000
albertel Wed May 25 17:45:10 2005 EDT
Modified files:
/loncom/homework chemresponse.pm
/loncom/interface loncommon.pm
Log:
- converting these to work on safari more betterly
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.52 loncom/homework/chemresponse.pm:1.53
--- loncom/homework/chemresponse.pm:1.52 Wed May 25 10:33:00 2005
+++ loncom/homework/chemresponse.pm Wed May 25 17:45:07 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.52 2005/05/25 14:33:00 www Exp $
+# $Id: chemresponse.pm,v 1.53 2005/05/25 21:45:07 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -121,9 +121,10 @@
CHEMPAGE
$body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
+ my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<<CHEMINPUT;
-<input type="button" value="Draw Molecule" onclick="javascript:editor=window.open('/adm/rat/empty.html','jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
+<input type="button" value="Draw Molecule" onclick="javascript:editor=window.open('$nothing','jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
CHEMINPUT
return $result;
}
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.260 loncom/interface/loncommon.pm:1.261
--- loncom/interface/loncommon.pm:1.260 Fri Apr 22 16:50:07 2005
+++ loncom/interface/loncommon.pm Wed May 25 17:45:07 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.260 2005/04/22 20:50:07 albertel Exp $
+# $Id: loncommon.pm,v 1.261 2005/05/25 21:45:07 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -687,6 +687,7 @@
"<table bgcolor='#773311' cellspacing='1' cellpadding='1' border='0'><tr>".
"<td bgcolor='#886622'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
}
+ my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $html=&Apache::lonxml::xmlbegin();
my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
$template .= <<"ENDTEMPLATE";
@@ -698,7 +699,7 @@
if (target == 'open') {
var newWindow = null;
try {
- newWindow = window.open("/adm/rat/empty.html","helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" )
+ newWindow = window.open("$nothing","helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" )
}
catch(error) {
writeHelp(caller);