--- loncom/homework/structuretags.pm	2016/04/04 17:34:01	1.549
+++ loncom/homework/structuretags.pm	2017/07/02 16:50:30	1.555
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.549 2016/04/04 17:34:01 raeburn Exp $
+# $Id: structuretags.pm,v 1.555 2017/07/02 16:50:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,7 @@ use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','print','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
 }
 
 
@@ -192,6 +192,28 @@ sub end_web {
     return '';
 }
 
+sub start_print {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target ne 'edit' && $target ne 'modified') {
+        if ($target ne 'tex') {
+            my $skip = &Apache::lonxml::get_all_text("/print",$parser,$style);
+            &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+        }
+    } elsif ($target eq "edit") {
+        my $bodytext = &Apache::lonxml::get_all_text_unbalanced("/print",$parser);
+        my $result = &Apache::edit::tag_start($target,$token);
+        $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
+        return $result;
+    } elsif ($target eq "modified") {
+        return $token->[4].&Apache::edit::modifiedfield("/print",$parser);
+    }
+    return '';
+}
+
+sub end_print {
+    return '';
+}
+
 sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
@@ -392,8 +414,10 @@ sub setmode_javascript {
 <script type="text/javascript">
 // <![CDATA[
 function setmode(form,probmode) {
+    var initial = form.problemmode.value;
     form.problemmode.value = probmode;
     form.submit();
+    form.problemmode.value = initial;
 }
 // ]]>
 </script>
@@ -419,9 +443,13 @@ sub page_start {
     $extra_head .= &homework_js().
                    &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
-        my %textarea_args = (
+        my %textarea_args;
+        if (($env{'request.state'} ne 'construct') ||
+            ($env{'environment.nocodemirror'})) {
+            %textarea_args = (
                                 dragmath => 'math',
                               );
+        }
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
@@ -650,10 +678,11 @@ sub setup_rndseed {
     unless (defined($questiontype)) {
         $questiontype = $Apache::lonhomework::type;
     }
-    if ($env{'request.state'} eq "construct" 
-	|| $symb eq '' 
-	|| $Apache::lonhomework::type eq 'practice'
-	|| $Apache::lonhomework::history{'resource.CODE'}) {
+    if (($env{'request.state'} eq "construct")
+        || ($symb eq '')
+        || ($Apache::lonhomework::type eq 'practice')
+        || ($Apache::lonhomework::history{'resource.CODE'})
+        || (($env{'form.code_for_randomlist'}) && ($target eq 'analyze'))) {
 	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						['rndseed']);
 	$rndseed=$env{'form.rndseed'};
@@ -662,7 +691,9 @@ sub setup_rndseed {
 	    if (!$rndseed) {
 		$rndseed=time;
 	    }
-	    $env{'form.rndseed'}=$rndseed;
+            unless ($env{'form.code_for_randomlist'}) {
+                $env{'form.rndseed'}=$rndseed;
+            }
 	}
         if (($env{'request.state'} eq "construct") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
@@ -672,7 +703,7 @@ sub setup_rndseed {
             }
             $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }
-	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	if ( ($env{'form.resetdata'} eq 'new_problem_variation'
 	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
@@ -690,7 +721,11 @@ sub setup_rndseed {
 	       $rndseed=join(':',&Apache::lonnet::digest($rndseed));
             }
         }
-        if ($Apache::lonhomework::history{'resource.CODE'}) {
+        if (($env{'form.code_for_randomlist'}) && ($target eq 'analyze')) {
+            $env{'form.CODE'} = $env{'form.code_for_randomlist'};
+            $rndseed=&Apache::lonnet::rndseed();
+            undef($env{'form.CODE'});
+        } elsif ($Apache::lonhomework::history{'resource.CODE'}) {
 	   $rndseed=&Apache::lonnet::rndseed();
 	}
         $set_safespace = 1;
@@ -774,7 +809,9 @@ sub problem_edit_buttons {
    if ($mode eq 'editxml') {
        $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
        $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
-       $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       if ($env{'environment.nocodemirror'}) {
+           $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       }
    } else {
        $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
        $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
@@ -947,7 +984,8 @@ $show_all
      </div>
      <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
      <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
-     <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+     <button type="submit" name="resetdata" accesskey="r" value="reset_submissions">
+     '.&mt('Reset Submissions').'</button>
    </div>
    <hr />
    <div class="LC_edit_problem_header_randomize_row">
@@ -1012,8 +1050,8 @@ sub initialize_storage {
 	|| $Apache::lonhomework::type eq 'practice') {
 	
 	my $namespace = $symb || $env{'request.uri'};
-	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	if ($env{'form.resetdata'} eq 'reset_submissions' ||
+	    ($env{'form.resetdata'} eq 'new_problem_variation'
 	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
@@ -1532,10 +1570,6 @@ sub start_problem {
             my ($timelimit) = split(/_/,$interval[0]);
             &Apache::lonnet::set_first_access($interval[1],$timelimit);
         }
-
-        ($status,$accessmsg,$slot_name,$slot,$ipused) =
-            &Apache::lonhomework::check_slot_access('0','problem');
-        push (@Apache::inputtags::status,$status);
     }
 
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
@@ -1543,7 +1577,8 @@ sub start_problem {
 	($result,$form_tag_start,$probpartlist) =
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
 			$name);
-    } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
+    } elsif ((($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) ||
+             ($target eq 'answer')) {
         my ($symb)= &Apache::lonnet::whichuser();
         my $navmap = Apache::lonnavmaps::navmap->new();
         if (ref($navmap)) {
@@ -1554,6 +1589,15 @@ sub start_problem {
         }
     }
 
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+        $target eq 'tex') {
+
+        my ($symb)= &Apache::lonnet::whichuser();
+        ($status,$accessmsg,$slot_name,$slot,$ipused) =
+            &Apache::lonhomework::check_slot_access('0','problem',$symb,$probpartlist);
+        push (@Apache::inputtags::status,$status);
+    }
+
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
 
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
@@ -1581,8 +1625,8 @@ sub start_problem {
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
-		    '<input type="submit" name="resetdata"
-                             value="'.&mt('New Problem Variation').'" />';
+		    '<button type="submit" name="resetdata"
+                        value="new_problem_variation">'.&mt('New Problem Variation').'</button>';
 	    if (exists($env{'form.username'})) {
 		$form_tag_start.=
 		    '<input type="hidden" name="username"
@@ -1743,9 +1787,9 @@ sub start_problem {
 		    $result.= &problem_web_to_edit_header($env{'form.rndseed'});
                 }
                 if ($Apache::lonhomework::type eq 'practice') {
-                    $result.= '<input type="submit" name="resetdata" '.
-                              'value="'.&mt('New Problem Variation').'" />'.
-                              &practice_problem_header().'<hr />';
+                    $result.= '<button type="submit" name="resetdata" '.
+                        'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                        &practice_problem_header().'<hr />';
                 }
 	    }
 	    # if we are viewing someone else preserve that info
@@ -2056,9 +2100,9 @@ sub start_library {
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
         if ($Apache::lonhomework::type eq 'practice') {
-            $result.= '<input type="submit" name="resetdata" '.
-                      'value="'.&mt('New Problem Variation').'" />'.
-                      &practice_problem_header().'<hr />';
+            $result.= '<button type="submit" name="resetdata" '.
+                'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                &practice_problem_header().'<hr />';
         }
     }
     return $result;
@@ -2555,7 +2599,12 @@ sub start_randomlist {
 	}
 	if (@randomlist) {
 	    my @idx_arr = (0 .. $#randomlist);
-	    &Apache::structuretags::shuffle(\@idx_arr);
+            if ($env{'form.code_for_randomlist'}) {
+                &Apache::structuretags::shuffle(\@idx_arr,$target);
+                undef($env{'form.code_for_randomlist'});
+            } else {
+                &Apache::structuretags::shuffle(\@idx_arr);
+            }
 	    my $bodytext = '';
 	    my $show=$#randomlist;
 	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
@@ -2594,10 +2643,10 @@ sub start_randomlist {
 }
 
 sub shuffle {
-    my $a=shift;
+    my ($a,$target) = @_;
     my $i;
     if (ref($a) eq 'ARRAY' && @$a) {
-	&Apache::response::pushrandomnumber();
+	&Apache::response::pushrandomnumber(undef,$target);
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
@@ -3003,9 +3052,13 @@ sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'
-	         .'<td><span id="math_'.$areaid.'">'
-		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'</span></td>'
+	         .'<td><span id="math_'.$areaid.'">';
+	if ($env{'environment.nocodemirror'}) {
+	    $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
+	} else {
+	    $result.='&nbsp;';
+	}
+	$result.='</span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'