--- loncom/homework/lonsimpleproblemedit.pm	2003/11/08 02:56:09	1.9
+++ loncom/homework/lonsimpleproblemedit.pm	2005/03/17 13:56:32	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Problem Parameter Setting "Editor"
 #
-# $Id: lonsimpleproblemedit.pm,v 1.9 2003/11/08 02:56:09 www Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.14 2005/03/17 13:56:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Apache::Constants qw(:common :http);
 use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::lonnavmaps;
 
 my %qparms;
 my $prefix;
@@ -50,23 +51,13 @@ 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);
-    undef($Apache::lonhomework::parsing_a_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 {
@@ -75,7 +66,7 @@ sub questiontext {
     return (<<ENDQUESTION);
 <table bgcolor="#dddd22" cellspacing="4" cellpadding="2">
 <tr><td><b>$qt</b><br />
-<textarea name="questiontext" cols="80" rows="8">$text</textarea>
+<textarea style="width:100%" name="questiontext" cols="80" rows="8">$text</textarea>
 </td></tr>
 </table>
 <br />
@@ -88,7 +79,7 @@ sub hint {
     return (<<ENDHINT);
 <table bgcolor="#accacc" cellspacing="4" cellpadding="2">
 <tr><td><b>$ht</b><br />
-<textarea name="hinttext" cols="80" rows="4">$text</textarea>
+<textarea style="width:100%" name="hinttext" cols="80" rows="4">$text</textarea>
 </td></tr>
 </table>
 <br />
@@ -128,15 +119,27 @@ sub foil {
     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{'position'}: $selectposition</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>
+<textarea style="width:100%" name="text$number" cols="80" rows="4">$text</textarea>
 </td></tr>
 </table>
 <br />
 ENDFOIL
 }
 
+sub get_parent_uri {
+    my ($cur_symb)=@_;
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $it = $navmap->getIterator(undef, undef, undef, 1);
+    while ( my $res=$it->next()) {
+	if (ref($res) &&  $res->symb() eq  $cur_symb) { last; }
+    }
+    my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack());
+    if (defined($anchor)) { $anchor='#'.$anchor; }
+    return $src.'?symb='.&Apache::lonnet::escape($symb).$anchor;
+}
+
 sub handler {
     my $r = shift;
 
@@ -156,7 +159,7 @@ sub handler {
 # ----------------------------------------------------- Figure out where we are
     my $uri=$r->uri;
     $uri=~s/\/smpedit$//;
-    my $symb=&Apache::lonnet::symbread($uri);
+    my $symb=&Apache::lonnet::symbread();
 
 # ------------------------------------------------ Prefix for everything stored
     $prefix=$ENV{'request.course.id'}.'.'.$symb.'.0.';
@@ -207,8 +210,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="'.&get_parent_uri($symb).'">'.&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        
@@ -223,7 +229,7 @@ ENDDOCUMENT
         $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());
@@ -295,7 +301,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.'));
     }