--- loncom/homework/structuretags.pm	2020/01/15 13:57:36	1.512.2.23.2.1
+++ loncom/homework/structuretags.pm	2015/09/14 13:45:19	1.539
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.23.2.1 2020/01/15 13:57:36 raeburn Exp $
+# $Id: structuretags.pm,v 1.539 2015/09/14 13:45:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,7 +270,7 @@ sub homework_js {
         $jstimeout = 1000 * $timeout;
     }
     return &Apache::loncommon::resize_textarea_js().
-           &Apache::loncommon::colorfuleditor_js().
+                &Apache::loncommon::colorfuleditor_js().
            &setmode_javascript().
 	<<"JS";
 <script type="text/javascript">
@@ -317,7 +317,7 @@ var keypresshandled = 0;
 var postsubmit = '$postsubmit';
 
 \$(document).ready(function(){
-  if (postsubmit != 'off') {
+  if (postsubmit != 'off') {    
     \$(document).keypress(function(event){
         var keycode = (event.keyCode ? event.keyCode : event.which);
         if ((keycode == '13') && (keypresshandled == 0)) {
@@ -342,12 +342,12 @@ var postsubmit = '$postsubmit';
                 submithandled = 1;
                 \$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
                                            "color": "black","padding": "2px"}) ;
-                if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
                     if (buttonId != "all_submit") {
                         \$( ".LC_status_"+buttonId ).hide();
-                    }
-                    if (( "#"+buttonId+"_pressed" ).length) {
-                        \$( "#"+buttonId+"_pressed" ).val( "1" );
+                        if (( "#"+buttonId+"_pressed" ).length) {
+                            \$( "#"+buttonId+"_pressed" ).val( "1" );
+                        }
                     }
                 } else {
                     \$( ".LC_status_"+buttonId ).hide();
@@ -360,9 +360,11 @@ var postsubmit = '$postsubmit';
                 if (timeout > 0) {
                     setTimeout(function(){
                                        \$( "#msg_"+buttonId ).css({"display": "none"});
-                                       if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
-                                           if (( "#"+buttonId+"_pressed" ).length) {
-                                               \$( "#"+buttonId+"_pressed" ).val( "" );
+                                       if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                                           if (buttonId != "all_submit") {
+                                               if (( "#"+buttonId+"_pressed" ).length) {
+                                                   \$( "#"+buttonId+"_pressed" ).val( "" );
+                                               }
                                            }
                                        }
                                        \$( ".LC_hwk_submit" ).prop( "disabled", false);
@@ -388,10 +390,8 @@ 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>
@@ -417,13 +417,9 @@ sub page_start {
     $extra_head .= &homework_js().
                    &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
-        my %textarea_args;
-        if (($env{'request.state'} ne 'construct') ||
-            ($env{'environment.nocodemirror'})) {
-            %textarea_args = (
+        my %textarea_args = (
                                 dragmath => 'math',
                               );
-        }
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
@@ -494,9 +490,9 @@ sub page_start {
             }
         }
         if ($needs_upload) {
-            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js().
-                           '<script type="text/javascript" '.
-                           'src="/res/adm/includes/file_upload.js"></script>';
+            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js()
+                            .'<script type="text/javascript" 
+                                src="/res/adm/includes/file_upload.js"></script>';
         }
     }
 
@@ -643,43 +639,17 @@ sub get_resource_name {
 sub setup_rndseed {
     my ($safeeval,$target,$probpartlist)=@_;
     my ($symb)=&Apache::lonnet::whichuser();
-    my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);
+    my ($questiontype,$set_safespace,$rndseed);
     if ($target eq 'analyze') {
         $questiontype = $env{'form.grade_questiontype'};
     }
     unless (defined($questiontype)) {
         $questiontype = $Apache::lonhomework::type;
     }
-    if ($Apache::lonhomework::type eq 'randomizetry') {
-        my $partfortries = $Apache::inputtags::part;
-#
-# Where question type is "randomizetry" for a problem containing
-# a single part (and unless type is explicitly set to not be
-# "randomizetry" for that part), the number of tries used to
-# determine randomization will be for that part, and randomization
-# from calls to &random() in a perl script block before the part tag,
-# will change based on the number of tries, and value of the
-# "randomizeontries" parameter in effect for the single part.
-#
-        if (ref($probpartlist) eq 'ARRAY') {
-            if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $partfortries)) {
-                if (&Apache::lonnet::EXT('resource.'.$probpartlist->[0].'.type') eq 'randomizetry') {
-                    $partfortries = $probpartlist->[0];
-                } else {
-                    $partfortries = '';
-                }
-            }
-        }
-        if ($partfortries ne '') {
-            $numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"};
-            $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
-        }
-    }
-    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'))) {
+    if ($env{'request.state'} eq "construct" 
+	|| $symb eq '' 
+	|| $Apache::lonhomework::type eq 'practice'
+	|| $Apache::lonhomework::history{'resource.CODE'}) {
 	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						['rndseed']);
 	$rndseed=$env{'form.rndseed'};
@@ -688,19 +658,13 @@ sub setup_rndseed {
 	    if (!$rndseed) {
 		$rndseed=time;
 	    }
-            unless ($env{'form.code_for_randomlist'}) {
-                $env{'form.rndseed'}=$rndseed;
-            }
+	    $env{'form.rndseed'}=$rndseed;
 	}
-        if ((($env{'request.state'} eq "construct") || ($symb eq '')) &&
+        if (($env{'request.state'} eq "construct") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
-            if ($numtries) {
-                if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
-                    my $inc = int($numtries/$reqtries);
-                    $rndseed += $inc;
-                } else {
-                    $rndseed += $numtries;
-                }
+            my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+            if ($tries) {
+                $rndseed += $tries;
             }
             $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }
@@ -722,11 +686,7 @@ sub setup_rndseed {
 	       $rndseed=join(':',&Apache::lonnet::digest($rndseed));
             }
         }
-        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'}) {
+        if ($Apache::lonhomework::history{'resource.CODE'}) {
 	   $rndseed=&Apache::lonnet::rndseed();
 	}
         $set_safespace = 1;
@@ -738,7 +698,13 @@ sub setup_rndseed {
         }
         unless (($target eq 'analyze') && (defined($rndseed))) {
             $rndseed=&Apache::lonnet::rndseed();
-            my $curr_try = $numtries;
+            my $partfortries = $Apache::inputtags::part;
+            if (ref($probpartlist) eq 'ARRAY') {
+                if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) {
+                    $partfortries = $probpartlist->[0];
+                }
+            }
+            my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"};
             if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                 $curr_try ++;
             }
@@ -746,6 +712,7 @@ sub setup_rndseed {
                 $rndseed = $1;
             }
             if ($curr_try) {
+                my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
                     my $inc = int(($curr_try-1)/$reqtries);
                     $rndseed += $inc;
@@ -803,9 +770,7 @@ 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);
-       if ($env{'environment.nocodemirror'}) {
-           $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
-       }
+       $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);
@@ -821,9 +786,9 @@ sub problem_edit_header {
         <div class="LC_edit_problem_header">
         <div class="LC_edit_problem_header_title">
         '.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
-         </div><div class="LC_edit_actionbar" id="actionbar">'.
-         '<input type="hidden" name="problemmode" value="saveedit" />'.
-         &problem_edit_buttons();
+        </div><div class="LC_edit_actionbar" id="actionbar">'.
+        '<input type="hidden" name="problemmode" value="saveedit" />'.
+        &problem_edit_buttons();
 
     $return .= '</div></div>' . &Apache::lonxml::message_location();
     $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
@@ -851,7 +816,6 @@ sub problem_edit_header {
     return $return;
 }
 
-
 sub problem_edit_footer {
     my $resource = $env{'request.ambiguous'};
     return '</td></tr></table><br />
@@ -927,7 +891,7 @@ sub problem_web_to_edit_header {
 ".&mt("Problem Type:")."
 <select name='problemtype'>
   <option value=''></option>
-  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('exam'   ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
   ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
   ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
@@ -1047,7 +1011,7 @@ sub initialize_storage {
 	}
 	%Apache::lonhomework::history=
 	    &Apache::lonnet::tmprestore($namespace,'',$domain,$name);
-	my ($temp)=keys(%Apache::lonhomework::history);
+	my ($temp)=keys(%Apache::lonhomework::history) ;
 	&Apache::lonxml::debug("Return message of $temp");
     } else {
 	%Apache::lonhomework::history=
@@ -1070,13 +1034,13 @@ sub initialize_storage {
         &check_correctness_changes() is called in two circumstances
         in which the results hash is to be stored permanently, for
         grading triggered by a student's submission, where feedback on
-        correctness is to be provided to the student.
+        correctness is to be provided to the student. 
 
         1. Immediately prior to storing the results hash
 
-        To handle the case where a student's submission (and award) were
+        To handle the case where a student's submission (and award) were 
         stored after history was retrieved in &initialize_storage(), e.g.,
-        if a student submitted answers in quick succession (e.g., from
+        if a student submitted answers in quick succession (e.g., from 
         multiple tabs).  &Apache::inputtags::hidealldata() is called for
         any parts with out-of-order storage (i.e., correct then incorrect,
         where awarded >= 1 when correct).
@@ -1086,14 +1050,14 @@ sub initialize_storage {
         To handle the case where lond on the student's homeserver returns
         delay:N -- where N is the number of transactions between the last
         retrieved in &initialize_storage() and the last stored immediately
-        before permanent storage of the current transaction via
-        lond::store_handler().  &Apache::grades::makehidden() is called
+        before permanent storage of the current transaction via 
+        lond::store_handler().  &Apache::grades::makehidden() is called  
         for any parts with out-of-order storage (i.e., correct then incorrect,
         where awarded >= 1 when correct).
 
 	Will call &store_aggregates() to increment totals for attempts, 
-	students, and corrects, if running user has student role.
-	
+        students, and corrects, if running user has student role.
+
 =cut
 
 
@@ -1214,13 +1178,13 @@ sub finalize_storage {
 =item check_correctness_changes()
 
         For all parts for which current results contain a solved status
-        of "incorrect_attempted", check if there was a transaction in which
-        solved was set to "correct_by_student" in the time since the last
-        transaction (retrieved when &initialize_storage() was called i.e.,
+        of "incorrect_attempted", check if there was a transaction in which  
+        solved was set to "correct_by_student" in the time since the last 
+        transaction (retrieved when &initialize_storage() was called i.e., 
         when &start_problem() was called), unless:
         (a) questiontype parameter is set to survey or anonymous survey (+/- credit)
         (b) problemstatus is set to no or no_feedback_ever
-        If such a transaction exists, and did not occur after "reset status"
+        If such a transaction exists, and did not occur after "reset status" 
         by a user with grading privileges, then the current transaction is an
         example of an out-of-order transaction (i.e., incorrect occurring after
         correct).  Accordingly, the current transaction should be hidden.
@@ -1314,8 +1278,8 @@ sub store_aggregates {
             } else {
                 $anoncounter{$symb."\0".$part} = 1;
             }
-            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
-            if ($needsrelease) {   
+            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.':'};
+            if ($needsrelease) {
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                 if ($curr_required eq '') {
                     &Apache::lonnet::update_released_required($needsrelease);
@@ -1348,8 +1312,8 @@ sub checkout_msg {
 		'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?');
+                'checkout'=>'Check out Bubblesheet Exam for Viewing',
+		'checkout?'=>'Check out Bubblesheet Exam?');
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
@@ -1432,7 +1396,6 @@ sub init_problem_globals {
     @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
-    $Apache::lonhomework::randomizetrypart=0;
     undef($Apache::lonhomework::name);
     undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);
@@ -1456,7 +1419,6 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);
-    undef($Apache::inputtags::randomizetrypart);
     undef($Apache::lonhomework::ignore_response_errors);
     undef(@Apache::functionplotresponse::callscripts);
     &Apache::lonhomework::reset_show_problem_status();
@@ -1550,17 +1512,14 @@ sub start_problem {
     my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);
+    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
-            my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);
-            unless (($is_set eq 'ok') || ($is_set eq 'already_set')) {
-                $firstaccres = $is_set;
-            }
+            my ($timelimit) = split(/_/,$interval[0]);
+            &Apache::lonnet::set_first_access($interval[1],$timelimit);
         }
 
         ($status,$accessmsg,$slot_name,$slot) =
@@ -1575,13 +1534,11 @@ sub start_problem {
 			$name);
     } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
         my ($symb)= &Apache::lonnet::whichuser();
-        if ($symb ne '') {
-            my $navmap = Apache::lonnavmaps::navmap->new();
-            if (ref($navmap)) {
-                my $res = $navmap->getBySymb($symb);
-                if (ref($res)) {
-                    $probpartlist = $res->parts();
-                }
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        if (ref($navmap)) {
+            my $res = $navmap->getBySymb($symb);
+            if (ref($res)) {
+                $probpartlist = $res->parts();
             }
         }
     }
@@ -1592,14 +1549,7 @@ sub start_problem {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
 
-        my ($symb) = &Apache::lonnet::whichuser();
 	#handle rand seed in construction space
-        if (($env{'request.state'} eq 'construct') || ($symb eq '')) {
-            my $partorder=&Apache::lonnet::metadata($env{'request.uri'},'partorder');
-            if ($partorder ne '') {
-                @{$probpartlist} = split(/,/,$partorder);
-            }
-        }
 	my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
         if (($target eq 'grade') && &Apache::response::submitted()) {
             if ($Apache::lonhomework::type eq 'randomizetry') {
@@ -1614,15 +1564,12 @@ sub start_problem {
                 }
             }
         }
+	my ($symb)=&Apache::lonnet::whichuser();
 
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
-            my $rndseedval = $rndseed;
-            if (($symb eq '') && ($Apache::lonhomework::type eq 'randomizetry')) {
-                $rndseedval = $env{'form.rndseed'};
-            }
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
-		$rndseedval.'" />'.
+		$rndseed.'" />'.
 		    '<input type="submit" name="resetdata"
                              value="'.&mt('New Problem Variation').'" />';
 	    if (exists($env{'form.username'})) {
@@ -1644,19 +1591,12 @@ sub start_problem {
                 $form_tag_start.=&practice_problem_header();
             }
 	    $form_tag_start.='<hr />';
-        }
-        if (($env{'request.state'} ne "construct") &&
-            ($Apache::lonhomework::type eq 'randomizetry') &&
-            ($status eq 'CAN_ANSWER')) {
-            my @parts;
-            if (ref($probpartlist) eq 'ARRAY') {
-                @parts = @{$probpartlist};
-            }
-            unless (@parts) {
-                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
-                my $problemstatus = &get_problem_status($Apache::inputtags::part);
-                $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries,$symb);
-            }
+        } elsif (($env{'request.state'} ne "construct") &&
+                 ($Apache::lonhomework::type eq 'randomizetry') &&
+                 ($status eq 'CAN_ANSWER')) {
+            my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+            my $problemstatus = &get_problem_status($Apache::inputtags::part);
+            $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries);
         }
 
 	my $expression='$external::datestatus="'.$status.'";';
@@ -1693,10 +1633,6 @@ sub start_problem {
 		} elsif ($status eq 'UNCHECKEDOUT') {
 		    $msg.=&checkout_msg();
 		} elsif ($status eq 'NOT_YET_VIEWED') {
-                    if ($firstaccres) {
-                        $msg .= '<p class="LC_error">'.
-                                &mt('A problem occurred when trying to start the timer.').'</p>';
-                    }
 		    $msg.=&firstaccess_msg($accessmsg,$symb);
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
 		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
@@ -1772,10 +1708,6 @@ sub start_problem {
                     $result.= '<input type="submit" name="resetdata" '.
                               'value="'.&mt('New Problem Variation').'" />'.
                               &practice_problem_header().'<hr />';
-                } elsif ($Apache::lonhomework::type eq 'randomizetry') {
-                    my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
-                    my $problemstatus = &get_problem_status($Apache::inputtags::part);
-                    $result.=&randomizetry_problem_header($problemstatus,$reqtries);
                 }
 	    }
 	    # if we are viewing someone else preserve that info
@@ -1977,24 +1909,7 @@ sub end_problem {
 	    }
 	}
         if ($target eq 'web') {
-            $result.=&Apache::functionplotresponse::init_script();
-            if ($Apache::lonhomework::default_type eq 'randomizetry') {
-                my ($symb) = &Apache::lonnet::whichuser();
-                if ((($env{'request.state'} eq 'construct') || ($symb eq '')) &&
-                    ($status eq 'CAN_ANSWER')) {
-                    unless (@Apache::inputtags::partlist > 1) {
-                        $result.= <<"ENDJS";
-<script type="text/javascript">
-// <![CDATA[
-    \$(document).ready(function() {
-         \$('#LC_randomizetry_header').css('display','block');
-    });
-// ]]>
-</script>
-ENDJS
-                    }
-                }
-            }
+           $result.=&Apache::functionplotresponse::init_script();
         }
 	if ($target eq 'grade') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -2088,8 +2003,6 @@ sub end_library {
 	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
 	     && $env{'request.state'} eq "construct") {
 	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
-    } elsif ($target eq 'meta') {
-        $result.=&Apache::response::meta_response_order();
     }
     if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
 	&reset_problem_globals('library');
@@ -2572,12 +2485,7 @@ sub start_randomlist {
 	}
 	if (@randomlist) {
 	    my @idx_arr = (0 .. $#randomlist);
-            if ($env{'form.code_for_randomlist'}) {
-                &Apache::structuretags::shuffle(\@idx_arr,$target);
-                undef($env{'form.code_for_randomlist'});
-            } else {
-                &Apache::structuretags::shuffle(\@idx_arr);
-            }
+	    &Apache::structuretags::shuffle(\@idx_arr);
 	    my $bodytext = '';
 	    my $show=$#randomlist;
 	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
@@ -2616,10 +2524,10 @@ sub start_randomlist {
 }
 
 sub shuffle {
-    my ($a,$target) = @_;
+    my $a=shift;
     my $i;
     if (ref($a) eq 'ARRAY' && @$a) {
-	&Apache::response::pushrandomnumber(undef,$target);
+	&Apache::response::pushrandomnumber();
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
@@ -2793,14 +2701,20 @@ sub start_part {
 		} elsif ($target eq 'web') {
                     if ($status eq 'CAN_ANSWER') {
                         my $problemstatus = &get_problem_status($Apache::inputtags::part); 
+                        my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
+                        my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
                         my $num = scalar(@Apache::inputtags::partlist)-1;
-                        if ((($Apache::lonhomework::default_type eq 'randomizetry') ||
-                             ($Apache::lonhomework::randomizetrypart)) &&
-                            ($Apache::lonhomework::type ne 'randomizetry')) {
-                            $result .= &randomizetry_part_header($problemstatus,'none',$num);
-                        } elsif ($Apache::lonhomework::type eq 'randomizetry') {
-                            $Apache::lonhomework::randomizetrypart = 1;
-                            my $reqtries = &Apache::lonnet::EXT("resource.$id.randomizeontries");
+                        if ($probrandomize eq 'randomizetry') {
+                            if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") ne 'randomizetry') {
+                                $result .= &randomizetry_part_header($problemstatus,'none',$num);
+                            } else {
+                                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                                if ($probrandtries ne $reqtries) {
+                                    $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
+                                }
+                            }
+                        } elsif (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") eq 'randomizetry') {
+                            my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
                             $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
                         }
                     }
@@ -2971,7 +2885,7 @@ sub start_problemtype {
 					    ['hide','Hide']]
 					   ,$token);
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
-					     [ ['exam','Exam/Quiz Problem'],
+					     [ ['exam','Bubblesheet Exam/Quiz Problem'],
 					       ['survey','Survey'],
                                                ['surveycred','Survey (with credit)'],
                                                ['anonsurvey','Anonymous Survey'],
@@ -3019,13 +2933,9 @@ sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</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><span id="math_'.$areaid.'">'
+		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+		 .'</span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'
@@ -3120,7 +3030,7 @@ sub practice_problem_header {
 }
 
 sub randomizetry_problem_header {
-    my ($problemstatus,$reqtries,$symb) = @_;
+    my ($problemstatus,$reqtries) = @_;
     my ($header,$text);
     if ($reqtries > 1) {
         $header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
@@ -3140,13 +3050,8 @@ sub randomizetry_problem_header {
             $text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
         }
     }
-    if (($env{'request.state'} eq "construct") || ($symb eq '')) {
-        return '<div class="LC_info" id="LC_randomizetry_header" style="display:none">'.
-               '<h3>'.$header.'</h3><span class="LC_info">'.$text.'</span><hr /></div>';
-    } else {
-        return '<h3 class="LC_info">'.$header.'</h3>'.
-               '<span class="LC_info">'.$text.'</span><hr />';
-    }
+    return '<span class="LC_info"><h3>'.$header.'</h3></span>'.
+           '<span class="LC_info">'.$text.'</span><hr />';
 }
 
 sub randomizetry_part_header {
@@ -3154,7 +3059,7 @@ sub randomizetry_part_header {
     my ($header,$text);
     if ($reqtries eq 'none') {
         $header = &mt('No Question Variation');
-        $text = &mt('For this question there will be no new variation after a try.');
+        $text = &mt('For this question there will no new variation after a try.');
     } elsif ($reqtries > 1) {
         $header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);
         if (($problemstatus eq 'no') ||