--- loncom/homework/lonsimpleproblemedit.pm	2003/11/04 16:44:50	1.7
+++ loncom/homework/lonsimpleproblemedit.pm	2004/11/30 23:28:57	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Problem Parameter Setting "Editor"
 #
-# $Id: lonsimpleproblemedit.pm,v 1.7 2003/11/04 16:44:50 www Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.12 2004/11/30 23:28:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,29 +50,21 @@ sub evaloptionhash {
 }
 
 sub rawrendering {
-    my ($request,$uri)=@_;
-    my $problem=&Apache::lonnet::getfile
-                            (&Apache::lonnet::filelocation('',$uri));
-    &Apache::lonnet::devalidatecourseresdata(
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
-    $ENV{'user.name'}=time;
-    $ENV{'user.domain'}=time;
-    my $result = &Apache::lonxml::xmlparse($request,'web', $problem);
-    $ENV{'user.name'}=$uname;
-    $ENV{'user.domain'}=$udom;
-    $result=~s/^.*\<body[^\>]*\>//si;
-    $result=~s/\<\/body[^\>]*\>.*$//si;
-    return $result;
+    my ($symb)=@_;
+    my %data=('show_errors'=>'on',
+	      'simple_edit_button' => 'off',
+	      'devalidatecourseresdata'=>'on');
+    return &Apache::loncommon::get_student_view($symb,time,time,
+						$ENV{'request.course.id'},
+						'web',\%data);
 }
 
 sub questiontext {
     my $text=$qparms{$prefix.'questiontext'};
+    my $qt=&mt('Question Text');
     return (<<ENDQUESTION);
 <table bgcolor="#dddd22" cellspacing="4" cellpadding="2">
-<tr><td><b>Question Text</b><br />
+<tr><td><b>$qt</b><br />
 <textarea name="questiontext" cols="80" rows="8">$text</textarea>
 </td></tr>
 </table>
@@ -82,9 +74,10 @@ ENDQUESTION
 
 sub hint {
     my $text=$qparms{$prefix.'hinttext'};
+    my $ht=&mt('Hint Text');
     return (<<ENDHINT);
 <table bgcolor="#accacc" cellspacing="4" cellpadding="2">
-<tr><td><b>Hint Text</b><br />
+<tr><td><b>$ht</b><br />
 <textarea name="hinttext" cols="80" rows="4">$text</textarea>
 </td></tr>
 </table>
@@ -117,11 +110,16 @@ sub foil {
     my $selectposition=&Apache::loncommon::select_form
                                ($position,'position'.$number,%positions);
     my $text=$qparms{$prefix.'text'.$number};
+    my %lt=&Apache::lonlocal::texthash('foil'  => 'Foil',
+				       'value' => 'Value',
+				       'pos'   => 'Position',
+				       'text'  => 'Text');
+
     return (<<ENDFOIL);
 <table bgcolor="#dd55ff" cellspacing="4" cellpadding="2">
-<tr><td colspan="2"><b>Foil</b></td></tr>
-<tr><td>Value: $selectvalue</td><td>Position: $selectposition</td></tr>
-<tr><td colspan="2">Text:<br />
+<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 name="text$number" cols="80" rows="4">$text</textarea>
 </td></tr>
 </table>
@@ -199,8 +197,11 @@ ENDDOCUMENT
     $r->print(&Apache::loncommon::bodytag('Simple Problem Editor'));
     if ($symb) {
 	$r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
+	$r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
+                '<a href="'.$uri.'">'.&mt('Student View').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
+		  &Apache::loncommon::help_open_topic('Caching').'</td></tr></table>');
 	$r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.
-                  &rawrendering($r,$uri).
+                  &rawrendering($symb).
                   '</td></tr></table><br />');
         $r->print('<form method="post">');
 # Question Type        
@@ -212,9 +213,10 @@ ENDDOCUMENT
         $qtype=$qparms{$prefix.'questiontype'};
         unless (defined($qtype)) { $qtype='radio'; }
         unless ($questiontypes{$qtype}) { $qtype='radio'; }
-        $r->print('<b>Question Type: '.&Apache::loncommon::select_form
+        $r->print('<b>'.&mt('Question Type').
+		  ': '.&Apache::loncommon::select_form
 	                               ($qtype,'questiontype',%questiontypes).
-  '</b><br /><input type="submit" value="'.&mt('Store Changes').
+  '</b><br /><input type="submit" value="'.&mt('Save and Edit').
   '" /><p>&nbsp;</p>');
 # Question Text
         $r->print(&questiontext());
@@ -245,7 +247,7 @@ ENDDOCUMENT
 		$r->print(
 		  '<table bgcolor="#ffcc22" cellspacing="4" cellpadding="2">'.
 		  '<tr><td><input type="hidden" name="options" value="'.
-                  $options.'" />Add new option: '.
+                  $options.'" />'.&mt('Add new option').': '.
           '<input type="text" name="newopt" size="15" />'.
           &mt('Delete an option').': '.
           &Apache::loncommon::select_form('','delopt',('' => '',%optionshash)).
@@ -286,7 +288,7 @@ ENDDOCUMENT
 	}
 # Store Button
 	$r->print(
-  '<input type="submit" value="'.&mt('Store Changes').'" /></form>');
+  '<input type="submit" value="'.&mt('Save and Edit').'" /></form>');
     } else {
 	$r->print(&mt('Could not identify problem.'));
     }