[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm /xml lonxml.pm

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 26 Feb 2003 17:52:14 -0000


albertel		Wed Feb 26 12:52:14 2003 EDT

  Modified files:              
    /loncom/homework	lonhomework.pm 
    /loncom/xml	lonxml.pm 
  Log:
  - the last of BUG#1146
  
  
  
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.110 loncom/homework/lonhomework.pm:1.111
--- loncom/homework/lonhomework.pm:1.110	Tue Feb 25 18:18:22 2003
+++ loncom/homework/lonhomework.pm	Wed Feb 26 12:52:14 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.110 2003/02/25 23:18:22 albertel Exp $
+# $Id: lonhomework.pm,v 1.111 2003/02/26 17:52:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -429,7 +429,15 @@
     &renderpage($request,$file);
   } else {
     my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
-    my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help');
+    my $xml_help = '<table><tr><td>'.
+	&Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help')
+	    .'</td><td>'.
+	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+					    undef,undef,600)
+	    .'</td><td>'.
+        &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+					    undef,undef,600)
+	    .'</td></tr></table>';
     if ($cols > 80) { $cols = 80; }
     if ($cols < 70) { $cols = 70; }
     if ($rows < 20) { $rows = 20; }
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.239 loncom/xml/lonxml.pm:1.240
--- loncom/xml/lonxml.pm:1.239	Tue Feb 25 16:27:07 2003
+++ loncom/xml/lonxml.pm	Wed Feb 26 12:52:14 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.239 2003/02/25 21:27:07 sakharuk Exp $
+# $Id: lonxml.pm,v 1.240 2003/02/26 17:52:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1100,6 +1100,13 @@
       my ($result,$filecontents)=@_;
       $filecontents = &HTML::Entities::encode($filecontents);
 #      my $editheader='<a href="#editsection">Edit below</a><hr />';
+      my $xml_help = '<table><tr><td>'.
+	  &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+					      undef,undef,600)
+	      .'</td><td>'.
+          &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+					      undef,undef,600)
+	      .'</td></tr></table>';
       my $buttons=(<<BUTTONS);
 <input type="submit" name="attemptclean" 
        value="Save and then attempt to clean HTML" />
@@ -1110,6 +1117,7 @@
 <hr />
 <a name="editsection" />
 <form method="post">
+$xml_help
 <input type="hidden" name="editmode" value="Edit" />
 $buttons<br />
 <textarea cols="80" rows="40" name="filecont">$filecontents</textarea>