--- loncom/homework/structuretags.pm	2003/08/13 17:54:12	1.203
+++ loncom/homework/structuretags.pm	2004/08/10 18:25:53	1.263
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.203 2003/08/13 17:54:12 sakharuk Exp $
+# $Id: structuretags.pm,v 1.263 2004/08/10 18:25:53 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,9 +25,7 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/19 Guy
-# 6/26/2001 fixed extra web display at end of <web></web> tags
-# 8/17,8/18,8/20 Gerd Kortemeyer
+###
 
 
 package Apache::structuretags; 
@@ -36,10 +34,11 @@ use strict;
 use Apache::lonnet;
 use Apache::File();
 use Apache::lonmenu;
+use Apache::lonlocal;
+use Apache::lonxml;
 
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
-'simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }
 
 sub start_web {
@@ -72,7 +71,7 @@ sub end_tex {
 sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my %found;
-    foreach my $taginside ($tagstack) {
+    foreach my $taginside (@$tagstack) {
 	foreach my $taglookedfor ('html','body','form') {
 	    if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
 	}
@@ -83,7 +82,9 @@ sub page_start {
     if (!defined($found{'html'})) {
 	$result=&Apache::londefdef::start_html($target,$token,$tagstack,
 					       $parstack,$parser,$safeeval);
-	$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target);
+	$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target).
+	    &Apache::lonhtmlcommon::htmlareaheaders().
+	    &Apache::lonhtmlcommon::spellheader();
     }
     my $body_tag_start;
     if (!defined($found{'body'})) {
@@ -114,10 +115,11 @@ sub page_start {
 		&Apache::lonxml::whichuser();
 	    if ($symb eq '' && !$publicuser) {
 		my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
-		$help="Browsing resource, all submissions are temporary.<br />";
+		$help=&mt("Browsing resource, all submissions are temporary.")."<br />";
 		$body_tag_start.=$help;
 	    }
 	}
+	$body_tag_start.=&Apache::lonxml::message_location();
     }
     my $form_tag_start;
     if (!defined($found{'form'})) {
@@ -130,11 +132,18 @@ sub page_start {
 #use Time::HiRes();
 sub get_resource_name {
     my ($parstack,$safeeval)=@_;
+    if (defined($Apache::lonhomework::name)) {
+	return $Apache::lonhomework::name;
+    }
     my $name=&Apache::lonnet::gettitle();
     if ($name eq '') {
 	$name=&Apache::lonnet::EXT('resource.title');
 	if ($name eq 'con_lost') { $name = ''; }
     }
+    if ($name!~/\S+/) {
+	$name=$ENV{'request.uri'};
+	$name=~s-.*/([^/]+)$-$1-;
+    }
     $Apache::lonhomework::name=$name;
     return $name;
 }
@@ -143,17 +152,18 @@ sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
+    if ($ENV{'request.state'} eq "construct" || $symb eq '' ||
+          $Apache::lonhomework::history{'resource.CODE'}) {
 	$rndseed=$ENV{'form.rndseed'};
 	if (!$rndseed) {
 	    $rndseed=$Apache::lonhomework::history{'rndseed'};
 	    if (!$rndseed) {
 		$rndseed=time;
-		$ENV{'form.rndseed'}=$rndseed;
 	    }
+	    $ENV{'form.rndseed'}=$rndseed;
 	}
-	if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
-	    $ENV{'form.newrandomization'} eq 'New Randomization') {
+	if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
 	    $ENV{'form.rndseed'}=$rndseed;
@@ -163,51 +173,103 @@ sub setup_rndseed {
 	if (defined($rndseed) && $rndseed ne int($rndseed)) {
 	   $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
         }
-	&Apache::lonxml::debug("Setting rndseed to $rndseed");
-	&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+        if ($Apache::lonhomework::history{'resource.CODE'}) {
+	   $rndseed=&Apache::lonnet::rndseed();
+	}
+	if ($safeeval) {
+	    &Apache::lonxml::debug("Setting rndseed to $rndseed");
+	    &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+	}
     }
     return $rndseed;
 }
 
 sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="Discard Edits and View" />
-       <input type="submit" name="problemmode" value="EditXML" />
-       <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes and Edit" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
-      ';
+       <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
+       <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+       <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
+       <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
+       <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
+       &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')
+       .'</td></tr></table>'.
+       '<table border="0"><tr><td bgcolor="#DDDDDD">';
 }
 
 sub problem_edit_footer {
-    return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
-    <input type="submit" name="submit" value="Submit Changes and View" />';
+    return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
+    <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
+    &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+    "\n</form>\n</body>\n</html>";
+}
+
+sub option {
+    my ($value,$name) = @_;
+    my $result ="<option value='".$value."' ";
+    if ($ENV{'form.'.$name} eq $value) {
+	$result.=" selected='on' ";
+    }
+    $result.='>';
+    return $result;
 }
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="View" />
-             <input type="submit" name="problemmode" value="Edit" />
-             <input type="submit" name="problemmode" value="EditXML" />
-             <input type="submit" name="newrandomization" value="New Randomization" />
-             <input type="submit" name="resetdata" value="Reset Submissions" />
-             <nobr><input type="submit" name="changerandseed" value="Change Random Seed To:" />
+    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
+             <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+             <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+             <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
+             <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+             <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
               <input type="text" name="rndseed" width="10" value="'.
 	       $rndseed.'"
            onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
-             <hr />';
+    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
+	'<hr />';
+    $result.="
+<nobr>
+Problem Status:
+<select name='problemstate'>
+  <option name=''></option>
+  ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
+  ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
+  ".&option('CANNOT_ANSWER_tries'  ,'problemstate').&mt("Open with full tries")."</option>
+  ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
+  ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
+</select>
+</nobr>
+<nobr>
+Problem Type:
+<select name='problemtype'>
+  <option name=''></option>
+  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework problem")."</option>
+  ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+</select>
+</nobr>
+<nobr>
+Feedback Mode:
+<select name='problemstatus'>
+  <option value=''></option>
+  ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>
+</select>
+</nobr>
+<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
+<hr />";
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
-    $result.= '<input type="submit" name="problemmode" value="Calculate answers" /> for
+    $result.= '<input type="submit" name="problemmode" value='.
+	&mt('"Calculate answers').'" /> for
              <input type="text" name="numtoanalyze" value="'.
-		 $numtoanalyze.'" size="5" /> versions of this problem.'.
-		     &Apache::loncommon::help_open_topic("Analyze_Problem",
+	     $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
+	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
 						     '',undef,undef,300).
-		     '<hr />';
+						     '<hr />';
     return $result;
 }
 
@@ -253,35 +315,52 @@ sub finalize_storage {
 }
 
 sub checkout_msg {
+    my %lt=&Apache::lonlocal::texthash( 
+		'resource'=>'The resource needs to be checked out',
+		'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
+                'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
+                'checkout'=>'Check out Exam for Viewing',
+		'checkout?'=>'Check out Exam?');
     return (<<ENDCHECKOUT);
-<h2>The resource needs to be checked out</h2>
-As a resource gets checked out, a unique timestamped ID is given to it, and a
-permanent record is left in the system.<p />
-<font color=red>
-Checking out resources is subject to course policies, and may exclude future
-credit even if done erroneously.<p />
+<h2>$lt{'resource'}</h2>
+    <p>$lt{'id_expln'}</p>
+<font color="red">
+<p>$lt{'warning'}</p>
 </font>
 <form name="checkout" method="POST" action="$ENV{'request.uri'}">
 <input type="hidden" name="doescheckout" value="yes" />
-<input type="button" name="checkoutbutton" value="Check out Exam for Viewing" onClick="javascript:if (confirm('Check out Exam?')) { document.checkout.submit(); }" />
+<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
 ENDCHECKOUT
 }
 
-sub start_problem {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+sub firstaccess_msg {
+    my ($time,$symb)=@_;
+    my ($map)=&Apache::lonnet::decode_symb($symb);
+    my $foldertitle=&Apache::lonnet::gettitle($map);
+    &Apache::lonxml::debug("map is $map title is $foldertitle");
+    return (<<ENDCHECKOUT);
+<h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
+<form name="markaccess" method="POST" action="$ENV{'request.uri'}">
+<input type="hidden" name="markaccess" value="yes" />
+<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
+</form>
+ENDCHECKOUT
+}
 
-    if ( $Apache::inputtags::part ne '' ||
-	 $Apache::lonhomework::parsing_a_problem) {
-	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
-	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
-	return '';
-    }
+sub init_problem_globals {
+    my ($type)=@_;
+    #initialize globals
+    if ($type eq 'problem') {
+	$Apache::inputtags::part='0';
+	@Apache::inputtags::partlist=('0');
 
-    $Apache::lonhomework::parsing_a_problem=1;
-#initialize globals
-    $Apache::inputtags::part='0';
-    @Apache::inputtags::partlist=('0');
+	$Apache::lonhomework::problemstatus=&get_problem_status('0')
+    } else {
+	$Apache::inputtags::part='';
+	@Apache::inputtags::partlist=();
+	$Apache::lonhomework::problemstatus='';	
+    }
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
@@ -291,20 +370,70 @@ sub start_problem {
     @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
-    $Apache::lonhomework::problemstatus=
-	&Apache::lonnet::EXT('resource.0.problemstatus');
+    undef($Apache::lonhomework::name);
+
+}
+
+sub reset_problem_globals {
+    my ($type)=@_;
+    undef(%Apache::lonhomework::history);
+    undef(%Apache::lonhomework::results);
+    undef($Apache::inputtags::part);
+#don't undef this, lonhomework.pm takes care of this, we use this to 
+#detect if we try to do 2 problems in one file
+#   undef($Apache::lonhomework::parsing_a_problem);
+    undef($Apache::lonhomework::name);
+}
+
+sub set_problem_state {
+    my ($part)=@_;
+    if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+	$Apache::lonhomework::history{"resource.$part.solved"}=
+	    'correct_by_student';
+    }
+}
+
+sub get_problem_status {
+    my ($part)=@_;
+    my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+    &Apache::lonxml::debug("problem status for $part is $problem_status");
+    &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+    if ($ENV{'request.state'} eq 'construct' &&
+	defined($ENV{'form.problemstatus'})) {
+	$problem_status=$ENV{'form.problemstatus'};
+    }
+    return $problem_status;
+}
+
+sub start_problem {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+
+    if ( $Apache::inputtags::part ne '' ||
+	 $Apache::lonhomework::parsing_a_problem) {
+	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
+	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+	return '';
+    }
+
+    $Apache::lonhomework::parsing_a_problem=1;
+    &init_problem_globals('problem');
 
     if (defined($ENV{'scantron.maxquest'})) {
 	$Apache::lonhomework::scantronmode=1;
     }
 
+    &initialize_storage();
     if ($target ne 'analyze') {
-	&initialize_storage();
 	if ($target eq 'web') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
 	}
+       	if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
-	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+	if (($ENV{'request.state'} eq 'construct') &&
+	    defined($ENV{'form.problemtype'})) {
+	    $Apache::lonhomework::type=$ENV{'form.problemtype'};
+	}
+	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
 	my $uri=$ENV{'request.uri'};
@@ -318,7 +447,8 @@ sub start_problem {
     }
 
     #added vars to the scripting enviroment
-    my $expression='$external::part='.$Apache::inputtags::part.';';
+    my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+    $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
     &Apache::run::run($expression,$safeeval);
     my $status;
     my $accessmsg;
@@ -342,7 +472,9 @@ sub start_problem {
 	    }
 	    $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
 	}
-
+	if ($ENV{'form.markaccess'}) {
+	    &Apache::lonnet::set_first_access('map');
+	}
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
 	my ($symb)=&Apache::lonxml::whichuser();
@@ -350,7 +482,7 @@ sub start_problem {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
 		    '<input type="submit" name="resetdata"
-                             value="New Problem Variation" />'.
+                             value="'.&mt('New Problem Variation').'" />'.
 		    '<input type="hidden" name="username"
                              value="'.$ENV{'form.username'}.'" /> <br />';
 	}
@@ -362,72 +494,64 @@ sub start_problem {
 	&Apache::lonxml::debug("Got $status");
 	if (( $status eq 'CLOSED' ) ||
 	    ( $status eq 'UNCHECKEDOUT') ||
+	    ( $status eq 'NOT_YET_VIEWED') ||
 	    ( $status eq 'BANNED') ||
-	    ( $status eq 'UNAVAILABLE')) {
+	    ( $status eq 'UNAVAILABLE') ||
+	    ( $status eq 'INVALID_ACCESS')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>';
 		my $msg=$body_tag_start;
 		if ($status eq 'UNAVAILABLE') {
-		    $result.='<h1>Unable to determine if this resource is open due to network problems. Please try again later.</h1>';
-		} else {
-		    $result.='<h1>Not open to be viewed</h1>';
+		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		} elsif ($status ne 'NOT_YET_VIEWED') {
+		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
-		if ($status eq 'CLOSED') {
+		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
 		} elsif ($status eq 'UNCHECKEDOUT') {
 		    $msg.=&checkout_msg;
+		} elsif ($status eq 'NOT_YET_VIEWED') {
+		    $msg.=&firstaccess_msg($accessmsg,$symb);
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
 		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
-		    $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
+		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
 		} else {
-		    $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+		    $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
 		}
 	    }
 	} elsif ($target eq 'web') {
 	    my $name= &get_resource_name($parstack,$safeeval);
-	    if ($status eq 'CAN_ANSWER') {
-		# create a page header and exit
-		$result.="$head_tag_start<title>$name</title></head>
+	    $result.="$head_tag_start<title>$name</title></head>
               $body_tag_start \n $form_tag_start".	
-		  '<input type="hidden" name="submitted" value="yes" />';
-		if ($ENV{'request.state'} eq "construct") {
-		    $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
-		}
-		# if we are viewing someone else preserve that info
-		if (defined $ENV{'form.grade_symb'}) {
-		    foreach my $field ('symb','courseid','domain','username') {
-			$result .= '<input type="hidden" name="grade_'.$field.
-			    '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
-		    }
+	      '<input type="hidden" name="submitted" value="yes" />';
+	    # create a page header and exit
+	    if ($ENV{'request.state'} eq "construct") {
+		$result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+	    }
+	    # if we are viewing someone else preserve that info
+	    if (defined $ENV{'form.grade_symb'}) {
+		foreach my $field ('symb','courseid','domain','username') {
+		    $result .= '<input type="hidden" name="grade_'.$field.
+			'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
 		}
-	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
-		     || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
-		$result.=$head_tag_start.
-		    "<title>$name</title></head>\n$body_tag_start\n";
 	    }
 	} elsif ($target eq 'tex') {
 	    my $startminipage = '';
 	    if (not $ENV{'form.problem_split'}=~/yes/) {
 		$startminipage = '\begin{minipage}{\textwidth}';
 	    }
-	    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
-	    if ($name eq '') {
-		$name=&Apache::lonnet::EXT('resource.title');
-		if ($name eq 'con_lost') { $name = ''; }
-	    }
-	    $Apache::lonhomework::name=$name;
 	    my $id = $Apache::inputtags::part;
 	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-	    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');
-	    my @allkeys = split /,/,$allkeys;
+	    my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+	    my @packages = split /,/,$packages;
 	    my $allow_print_points = 0;
-	    foreach my $partial_key (@allkeys) {
-		if ($partial_key=~m/weight/) {
-		    $allow_print_points++;
+	    foreach my $partial_key (@packages) {
+		if ($partial_key=~m/^part_0$/) {
+		    $allow_print_points=1;
 		}
 	    }
 	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
@@ -442,20 +566,15 @@ sub start_problem {
 	    my @due_file_content = <$temp_file>;
 	    my $due_file_content = $due_file_content[$#due_file_content];
 	    chomp $due_file_content;
-	    my $name_of_resourse= &get_resource_name($parstack,$safeeval);
-	    if (not $name_of_resourse=~/\S+/) {
-		$name_of_resourse=$ENV{'request.uri'};
-		$name_of_resourse=~/\/([^\/]+)$/;
-		$name_of_resourse=$1;
-	    }
+	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
 	    if ($due_file_content ne $duedate) {
 		$temp_file = Apache::File->new('>'.$filename);
 		print $temp_file "$duedate\n";
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
 		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;	
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
 		    } else {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm \noindent'.$startminipage;
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
 			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		    }
 		} else {
@@ -463,7 +582,7 @@ sub start_problem {
 		}
 	    } else {
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm\noindent'.$startminipage;	
+		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
 		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} else {
 		    $result .= '\vskip 1mm \\\\\\\\';
@@ -473,6 +592,8 @@ sub start_problem {
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
 	    &problem_edit_header();
+	$Apache::lonxml::warnings_error_header=
+	    &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
 	my $temp=&Apache::edit::insertlist($target,$token);
 	$result.=$temp;
     } elsif ($target eq 'modified') {
@@ -491,13 +612,17 @@ sub end_problem {
     my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
-	if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
-	     $status eq 'CAN_ANSWER' ) {
+	if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
 	    # if part is zero, no <part>s existed, so we need to the grading
-	    &Apache::inputtags::grade;
+	    if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
+		&Apache::inputtags::grade;
+	    } else {
+		# move any submission data to .hidden
+		&Apache::inputtags::hidealldata($Apache::inputtags::part);
+	    }
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
 		  $Apache::inputtags::part eq '0' &&
-		  $status ne 'UNCHECKEDOUT') {
+		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
 	    # if part is zero, no <part>s existed, so we need show the current
 	    # grading status
 	    my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
@@ -507,17 +632,11 @@ sub end_problem {
 	    (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
-	    if ($status eq 'CAN_ANSWER') {
-		if ($target ne 'tex' &&
-		    $ENV{'form.answer_output_mode'} ne 'tex') {
-		    $result.="</form></body>\n";
-		}
-	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
-		     $status eq 'UNCHECKEDOUT' ) {
-		if ($target ne 'tex' &&
-		    $ENV{'form.answer_output_mode'} ne 'tex') {
-		    $result.="</body>\n";
-		}
+	    if ($target ne 'tex' &&
+		$ENV{'form.answer_output_mode'} ne 'tex') {
+		$result.="</form>";
+		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
+		$result.="</body>\n";
 	    }
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
@@ -526,11 +645,16 @@ sub end_problem {
 		if (not $ENV{'form.problem_split'}=~/yes/) {
 		    $endminipage = '\end{minipage}';
 		}
-		$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
-		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= $endminipage.'\end{document} ';
+                if ($ENV{'form.print_discussions'} eq 'yes') {
+		    $result.=&Apache::lonxml::xmlend($target,$parser);
+		    $result=~s/<\/html>//;
 		} else {
-		    $result .= '';
+		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+			$result .= $endminipage.'\end{document} ';
+		    } else {
+			$result .= '';
+		    }
 		}
 	    }
 	}
@@ -548,6 +672,8 @@ sub end_problem {
 	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
+	$result.=&Apache::response::meta_part_order();
+	$result.=&Apache::response::meta_response_order();
     } elsif ($target eq 'edit') {
 	&Apache::lonxml::debug("in end_problem with $target, edit");
 	$result = &problem_edit_footer();
@@ -556,10 +682,8 @@ sub end_problem {
     if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
 	&Apache::inputtags::check_for_duplicate_ids();
     }
-    undef(%Apache::lonhomework::history);
-    undef(%Apache::lonhomework::results);
-    undef($Apache::inputtags::part);
-    undef($Apache::lonhomework::parsing_a_problem);
+
+    &reset_problem_globals('problem');
 
     return $result;
 }
@@ -568,7 +692,10 @@ sub end_problem {
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
-
+    if ($$tagstack[0] eq 'library') {
+	&init_problem_globals('library');
+	$Apache::lonhomework::type='problem';
+    }
     if ($target eq 'edit') {
 	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
@@ -602,6 +729,7 @@ sub end_library {
 	     $ENV{'request.state'} eq "construct") {
 	$result.='</form></body>'.&Apache::lonxml::xmlend();
     }
+    if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;
 }
 
@@ -703,9 +831,9 @@ sub start_languageblock {
 	$result='';
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
-	$result .=&Apache::edit::text_arg('Include Language:','include',
+	$result .=&Apache::edit::text_arg(&mt('Include Language:'),'include',
 					  $token,40);
-	$result .=&Apache::edit::text_arg('Exclude Language:','exclude',
+	$result .=&Apache::edit::text_arg(&mt('Exclude Language:'),'exclude',
 					  $token,40);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -778,7 +906,7 @@ sub start_while {
 	}
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
-	$result .=&Apache::edit::text_arg('Test Condition:','condition',
+	$result .=&Apache::edit::text_arg(&mt('Test Condition:'),'condition',
 					  $token,40);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -810,7 +938,7 @@ sub end_while {
 	    $return = &Apache::run::run($code,$safeeval);
 	}
 	if ($error) {
-	    &Apache::lonxml::error('<pre>Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running &lt;while$gt; on line '.$line.'</pre>');
+	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while$gt; on line').' '.$line.'</pre>');
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -882,12 +1010,13 @@ sub shuffle {
     my $a=shift;
     my $i;
     if (defined(@$a)) {
-	&Apache::response::setrandomnumber();
+	&Apache::response::pushrandomnumber();
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
 	    @$a[$i,$j] = @$a[$j,$i];
 	}
+	&Apache::response::poprandomnumber();
     }
 }
 
@@ -911,12 +1040,19 @@ sub start_part {
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::lonhomework::problemstatus=
-	&Apache::lonnet::EXT("resource.$id.problemstatus");
+    $Apache::lonhomework::problemstatus=&get_problem_status($id);
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+    my $newtype=&Apache::lonnet::EXT("resource.$id.type");
+    if ($newtype) { $Apache::lonhomework::type=$newtype; }
+
+    my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+    $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
+    &Apache::run::run($expression,$safeeval);
 
     if ($target eq 'meta') {
-	return &Apache::response::mandatory_part_meta;
+	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+	return &Apache::response::mandatory_part_meta.
+	       &Apache::response::meta_parameter_write('display','string',$display,'Part Description');
     } elsif ($target eq 'web' || $target eq 'grade' ||
 	     $target eq 'answer' || $target eq 'tex') {
 	if ($hidden) {
@@ -927,15 +1063,23 @@ sub start_part {
 	    my $expression='$external::datestatus="'.$status.'";';
 	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
 	    &Apache::run::run($expression,$safeeval);
-	    if ( $status eq 'CLOSED' ) {
+	    if ($ENV{'request.state'} eq 'construct') {
+		&set_problem_state($Apache::inputtags::part); 
+	    }
+	    if (( $status eq 'CLOSED' ) ||
+		( $status eq 'UNCHECKEDOUT') ||
+		( $status eq 'NOT_YET_VIEWED') ||
+		( $status eq 'BANNED') ||
+		( $status eq 'UNAVAILABLE') ||
+		( $status eq 'INVALID_ACCESS')) {
 		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
 		if ( $target eq "web" ) {
-		    $result="<br />Part is not open to be viewed. It $accessmsg<br />";
+		    $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
 		} elsif ( $target eq 'tex' ) {
 		    if (not $ENV{'form.problem_split'}=~/yes/) {
-			$result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
+			$result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";
 		    } else {
-			$result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+			$result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
 		    }
 		}
 	    } else {
@@ -944,7 +1088,17 @@ sub start_part {
 			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-		    if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+		    my @allkeys = split /,/,$allkeys;
+		    my $allow_print_points = 0;
+		    foreach my $partial_key (@allkeys) {
+			if ($partial_key=~m/^part_(.*)$/) {
+			    if ($1 ne '0') {$allow_print_points=1;}
+			}
+		    }
+		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		} elsif ($target eq 'web') {
+		    $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';
 		}
 	    }
 	}
@@ -952,11 +1106,15 @@ sub start_part {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Part ID:','id',$token).
 	    &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
+	    '&nbsp;&nbsp;'.
+&Apache::edit::text_arg('Displayed Part Description:','display',$token).
 		&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'id');
+						     $safeeval,'id','display');
 	if ($constructtag) {
+	    #limiting ids to only letters numbers, and space
+	    $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
 	    $result = &Apache::edit::rebuild_tag($token);
 	    $result.=&Apache::edit::handle_insert();
 	}
@@ -972,12 +1130,20 @@ sub end_part {
     my $result='';
     if ( $target eq 'meta' ) {
 	$result='';
-    } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {
-	$result=&Apache::inputtags::grade;
+    } elsif ($target eq 'grade') {
+	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
+	    !$hidden) {
+	    $result=&Apache::inputtags::grade;
+	} else {
+	    # move any submission data to .hidden
+	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
+	}
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);
-	if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
+	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
+	    $gradestatus='';
+	}
 	$result=$gradestatus;
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
@@ -990,9 +1156,10 @@ sub end_part {
 sub start_preduedate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
+	&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
 	if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
-	    $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' &&
-	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+	    $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
+	    &Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));
 	    &Apache::lonxml::get_all_text("/preduedate",$parser);
 	}
     }
@@ -1005,12 +1172,12 @@ sub end_preduedate {
 
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
+    if ($target eq 'web' || $target eq 'grade') {
 	if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser);
 	}
     } elsif ($target eq 'tex') {
-	return '\vskip 0 mm \noindent';
+	&Apache::lonxml::get_all_text("/postanswerdate",$parser);
     }
     return '';
 }
@@ -1025,7 +1192,8 @@ sub start_notsolved {
 	$target eq 'tex') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	&Apache::lonxml::debug("not solved has :$gradestatus:");
-	if ($gradestatus =~ /^correct/) {
+	if ($gradestatus =~ /^correct/ &&
+	    &Apache::response::show_answer()) {
 	    &Apache::lonxml::debug("skipping");
 	    &Apache::lonxml::get_all_text("/notsolved",$parser);
 	}
@@ -1042,7 +1210,8 @@ sub start_solved {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
-	if ($gradestatus !~ /^correct/) {
+	if ($gradestatus !~ /^correct/ ||
+	    !&Apache::response::show_answer()) {
 	    &Apache::lonxml::get_all_text("/solved",$parser);
 	}
     }
@@ -1053,6 +1222,48 @@ sub end_solved {
     return '';
 }
 
+sub start_problemtype {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
+	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
+	if (!defined($mode)) { $mode='show'; }
+	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
+	my $found=0;
+	foreach my $type (split(',',$for)) {
+	    if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
+	}
+	if ($mode eq 'show' && !$found) {
+	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+	}
+	if ($mode eq 'hide' && $found) {
+	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+	}
+    } elsif ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::select_arg('Mode:','mode',
+					   [['show','Show'],
+					    ['hide','Hide']]
+					   ,$token);
+	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
+					     [ ['exam','Exam/Quiz Problem'],
+					       ['survey','Survey'],
+					       ['problem','Homework Problem'] ]
+					     ,$token);
+	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'mode','for');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_problemtype {
+    return '';
+}
+
 sub start_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');
@@ -1067,8 +1278,8 @@ sub end_startouttext {
 
     if ($target eq 'edit') {
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser);
-	$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
-<td>Delete:".
+	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
+<td>".&mt('Delete:').
                  &Apache::edit::deletelist($target,$token)
 		 ."</td>
 <td>".
@@ -1076,11 +1287,10 @@ sub end_startouttext {
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"
 		 . &Apache::loncommon::helpLatexCheatsheet () .
-		 &Apache::edit::editfield($token->[1],$text,"",80,4);
+		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }
     if ($target eq 'modified') {
-	$text=&Apache::lonxml::get_all_text("endouttext",$parser);
-	$result='<startouttext />'.&Apache::edit::modifiedfield();
+	$result='<startouttext />'.&Apache::edit::modifiedfield("endouttext",$parser);
     }
     if ($target eq 'tex') {
 	$result .= '\noindent ';
@@ -1124,10 +1334,10 @@ sub start_simpleeditbutton {
     my $result='';
     if (($target eq 'web') &&
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-        my $url=$ENV{'REQUEST_URI'};
+        my $url=$ENV{'request.noversionuri'};
         $url=~s/\?.*$//;
 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                '<a href="'.$url.'/smpedit">Simple Problem Editor</a> - Note: it can take up to 10 minutes for changes to take effect for all users.'.
+                '<a href="'.$url.'/smpedit">'.&mt('Simple Problem Editor').'</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><br />';
     }
     return $result;
