--- loncom/homework/lonsimpleproblemedit.pm	2005/03/17 13:56:32	1.14
+++ loncom/homework/lonsimpleproblemedit.pm	2006/05/30 12:45:37	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Problem Parameter Setting "Editor"
 #
-# $Id: lonsimpleproblemedit.pm,v 1.14 2005/03/17 13:56:32 albertel Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.18 2006/05/30 12:45:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,9 @@ use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonnavmaps;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 my %qparms;
 my $prefix;
@@ -56,17 +59,20 @@ sub rawrendering {
 	      'simple_edit_button' => 'off',
 	      'devalidatecourseresdata'=>'on');
     return &Apache::loncommon::get_student_view($symb,time,time,
-						$ENV{'request.course.id'},
+						$env{'request.course.id'},
 						'web',\%data);
 }
 
 sub questiontext {
     my $text=$qparms{$prefix.'questiontext'};
     my $qt=&mt('Question Text');
+    my $spell_link=
+	&Apache::lonhtmlcommon::spelllink('simpleedit','questiontext');
     return (<<ENDQUESTION);
 <table bgcolor="#dddd22" cellspacing="4" cellpadding="2">
 <tr><td><b>$qt</b><br />
 <textarea style="width:100%" name="questiontext" cols="80" rows="8">$text</textarea>
+<br />$spell_link
 </td></tr>
 </table>
 <br />
@@ -76,10 +82,13 @@ ENDQUESTION
 sub hint {
     my $text=$qparms{$prefix.'hinttext'};
     my $ht=&mt('Hint Text');
+    my $spell_link=
+	&Apache::lonhtmlcommon::spelllink('simpleedit','hinttext');
     return (<<ENDHINT);
 <table bgcolor="#accacc" cellspacing="4" cellpadding="2">
 <tr><td><b>$ht</b><br />
 <textarea style="width:100%" name="hinttext" cols="80" rows="4">$text</textarea>
+<br />$spell_link
 </td></tr>
 </table>
 <br />
@@ -116,12 +125,15 @@ sub foil {
 				       'pos'   => 'Position',
 				       'text'  => 'Text');
 
+    my $spell_link=
+	&Apache::lonhtmlcommon::spelllink('simpleedit',"text$number");
     return (<<ENDFOIL);
 <table bgcolor="#dd55ff" cellspacing="4" cellpadding="2">
 <tr><td colspan="2"><b>$lt{'foil'}</b></td></tr>
 <tr><td>$lt{'value'}: $selectvalue</td><td>$lt{'pos'}: $selectposition</td></tr>
 <tr><td colspan="2">$lt{'text'}:<br />
 <textarea style="width:100%" name="text$number" cols="80" rows="4">$text</textarea>
+<br />$spell_link
 </td></tr>
 </table>
 <br />
@@ -137,7 +149,7 @@ sub get_parent_uri {
     }
     my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack());
     if (defined($anchor)) { $anchor='#'.$anchor; }
-    return $src.'?symb='.&Apache::lonnet::escape($symb).$anchor;
+    return $src.'?symb='.&escape($symb).$anchor;
 }
 
 sub handler {
@@ -150,7 +162,7 @@ sub handler {
     }
 
 # -------------------------------------------------------------------- Allowed?
-    unless (&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) {
+    unless (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
 	return HTTP_NOT_ACCEPTABLE; 
     }
 # ----------------------------------------------------------------- Send header
@@ -162,52 +174,49 @@ sub handler {
     my $symb=&Apache::lonnet::symbread();
 
 # ------------------------------------------------ Prefix for everything stored
-    $prefix=$ENV{'request.course.id'}.'.'.$symb.'.0.';
+    $prefix=$env{'request.course.id'}.'.'.$symb.'.0.';
 # ---------------------------------------------------------- Anything to store?
 
-    if (($symb) && (defined($ENV{'form.questiontype'}))) {
+    if (($symb) && (defined($env{'form.questiontype'}))) {
         my %storecontent=();
         undef %storecontent;
-        if ($ENV{'form.questiontype'} eq 'option') {
-	    my %curoptions=&evaloptionhash($ENV{'form.options'});
-	    if ($ENV{'form.delopt'}) {
-		delete $curoptions{$ENV{'form.delopt'}};
+        if ($env{'form.questiontype'} eq 'option') {
+	    my %curoptions=&evaloptionhash($env{'form.options'});
+	    if ($env{'form.delopt'}) {
+		delete $curoptions{$env{'form.delopt'}};
 	    }
-	    if ($ENV{'form.newopt'}) {
-		$ENV{'form.newopt'}=~s/\'/\\\'/g;
-                $curoptions{$ENV{'form.newopt'}}=$ENV{'form.newopt'};
+	    if ($env{'form.newopt'}) {
+		$env{'form.newopt'}=~s/\'/\\\'/g;
+                $curoptions{$env{'form.newopt'}}=$env{'form.newopt'};
 	    }
-            $ENV{'form.options'}="('".join("','",keys %curoptions)."')";
+            $env{'form.options'}="('".join("','",keys %curoptions)."')";
 	}
-	$ENV{'form.hiddenparts'}='!'.$ENV{'form.questiontype'};
-        foreach (keys %ENV) {
+	$env{'form.hiddenparts'}='!'.$env{'form.questiontype'};
+        foreach (keys %env) {
 	    if ($_=~/^form\.(\w+)$/) {
                 my $parm=$1;
-		$storecontent{$prefix.$parm}=$ENV{'form.'.$parm};
+		$storecontent{$prefix.$parm}=$env{'form.'.$parm};
                 $storecontent{$prefix.$parm}=~s/^\s+//s;
 		$storecontent{$prefix.$parm}=~s/\s+$//s;
 	    }
 	}
 	my $reply=&Apache::lonnet::cput
 	    ('resourcedata',\%storecontent,
-	     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-	     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	     $env{'course.'.$env{'request.course.id'}.'.domain'},
+	     $env{'course.'.$env{'request.course.id'}.'.num'});
 
     }
 # ------------------------------------------------------------------- Read Data
 
     %qparms=&Apache::lonnet::dump('resourcedata',
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-		     $ENV{'request.course.id'}.'.'.$symb);
+		     $env{'course.'.$env{'request.course.id'}.'.domain'},
+		     $env{'course.'.$env{'request.course.id'}.'.num'},
+		     $env{'request.course.id'}.'.'.$symb);
 
 # ------------------------------------------------------------ Print the screen
-    $r->print(<<ENDDOCUMENT);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-ENDDOCUMENT
-    $r->print(&Apache::loncommon::bodytag('Simple Problem Editor'));
+    my $spell_header=&Apache::lonhtmlcommon::spellheader();
+    $r->print(&Apache::loncommon::start_page('Simple Problem Editor',
+					     $spell_header));
     if ($symb) {
 	$r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
 	$r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
@@ -216,7 +225,7 @@ ENDDOCUMENT
 	$r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.
                   &rawrendering($symb).
                   '</td></tr></table><br />');
-        $r->print('<form method="post">');
+        $r->print('<form name="simpleedit" method="POST">');
 # Question Type        
 	my %questiontypes=('radio'  => 
                                '1 out of N multiple choice (radio button)',
@@ -305,7 +314,7 @@ ENDDOCUMENT
     } else {
 	$r->print(&mt('Could not identify problem.'));
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }