--- loncom/homework/lonsimpleproblemedit.pm	2004/11/30 23:28:57	1.12
+++ loncom/homework/lonsimpleproblemedit.pm	2005/04/07 06:56:22	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Problem Parameter Setting "Editor"
 #
-# $Id: lonsimpleproblemedit.pm,v 1.12 2004/11/30 23:28:57 albertel Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.15 2005/04/07 06:56:22 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;
@@ -55,7 +56,7 @@ 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);
 }
 
@@ -65,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 />
@@ -78,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 />
@@ -120,13 +121,25 @@ sub foil {
 <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>
+<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;
 
@@ -137,7 +150,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
@@ -146,47 +159,47 @@ 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.';
+    $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);
@@ -198,7 +211,7 @@ ENDDOCUMENT
     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.').
+                '<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($symb).