--- loncom/homework/structuretags.pm	2019/08/07 21:44:28	1.512.2.17
+++ loncom/homework/structuretags.pm	2017/02/06 19:54:19	1.554
@@ -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.17 2019/08/07 21:44:28 raeburn Exp $
+# $Id: structuretags.pm,v 1.554 2017/02/06 19:54:19 damieng 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='';
@@ -226,9 +248,11 @@ sub end_tex {
 sub homework_js {
     my ($postsubmit,$timeout);
     if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
-        my $crstype;
-        if (&Apache::loncommon::course_type() eq 'Community') {
+        my $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
             $crstype = 'community';
+        } elsif ($crstype eq 'Placement') {
+            $crstype = 'placement'; 
         } else {
             if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
                 $crstype = 'official';
@@ -270,7 +294,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 +341,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)) {
@@ -496,9 +520,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>';
         }
     }
 
@@ -529,23 +553,25 @@ sub page_start {
     } elsif (!defined($found{'body'}) 
 	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
-        # Breadcrumbs for Authoring Space
-        &Apache::lonhtmlcommon::clear_breadcrumbs();
-        &Apache::lonhtmlcommon::add_breadcrumb({
-            'text'  => 'Authoring Space',
-            'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
-        });
-        # breadcrumbs (and tools) will be created 
-        # in start_page->bodytag->innerregister
+            unless ($env{'form.inhibitmenu'} eq 'yes') {
+                # Breadcrumbs for Authoring Space
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                &Apache::lonhtmlcommon::add_breadcrumb({
+                    'text'  => 'Authoring Space',
+                    'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
+                });
+                # breadcrumbs (and tools) will be created 
+                # in start_page->bodytag->innerregister
 
 # FIXME Where are we?
-#        &Apache::lonhtmlcommon::add_breadcrumb({
-#            'text'  => 'Problem Editing', # 'Problem Testing'
-#            'href'  => '',
-#        });
-        $pageheader =&Apache::loncommon::head_subbox(
-                &Apache::loncommon::CSTR_pageheader());
-	}
+#                &Apache::lonhtmlcommon::add_breadcrumb({
+#                    'text'  => 'Problem Editing', # 'Problem Testing'
+#                    'href'  => '',
+#               });
+                $pageheader = &Apache::loncommon::head_subbox(
+                                 &Apache::loncommon::CSTR_pageheader());
+	    }
+        }
     } elsif (!defined($found{'body'})) {
 	my %add_entries;
 	my $background=&Apache::lonxml::get_param('background',$parstack,
@@ -652,11 +678,10 @@ 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'}) 
-        || (($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'};
@@ -665,9 +690,7 @@ 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") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
@@ -677,7 +700,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);
@@ -695,11 +718,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;
@@ -801,9 +820,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" />
@@ -831,7 +850,6 @@ sub problem_edit_header {
     return $return;
 }
 
-
 sub problem_edit_footer {
     my $resource = $env{'request.ambiguous'};
     return '</td></tr></table><br />
@@ -907,7 +925,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>
@@ -959,7 +977,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">
@@ -992,6 +1011,12 @@ $show_all
                'onclick="javascript:setmode(this.form,'."'edit'".')" />';
     $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
+    if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+        my $uri = $env{'request.uri'};
+        my $daxeurl = '/daxepage'.$uri;
+        $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
+                  'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
+    }
     $result.='
    </div>
    <hr />
@@ -1018,8 +1043,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);
@@ -1027,7 +1052,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=
@@ -1050,13 +1075,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).
@@ -1066,14 +1091,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
 
 
@@ -1194,13 +1219,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.
@@ -1294,8 +1319,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);
@@ -1328,8 +1353,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>
@@ -1526,23 +1551,18 @@ sub start_problem {
     my $status;
     my $accessmsg;
     my $resource_due;
+    my $ipused;
 
     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 $is_set = &Apache::lonnet::set_first_access($interval[1],$interval[0]);
-            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) =
-            &Apache::lonhomework::check_slot_access('0','problem');
-        push (@Apache::inputtags::status,$status);
     }
 
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
@@ -1550,7 +1570,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)) {
@@ -1561,6 +1582,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); }
@@ -1588,8 +1618,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"
@@ -1611,7 +1641,10 @@ sub start_problem {
 	    $form_tag_start.='<hr />';
         } elsif (($env{'request.state'} ne "construct") &&
                  ($Apache::lonhomework::type eq 'randomizetry') &&
-                 ($status eq 'CAN_ANSWER')) {
+                 ($status eq 'CAN_ANSWER') &&
+                 ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') &&
+                 (!$env{'request.role.adv'})) {
+# "New Problem Variation Each Try" header suppressed for Placement Tests, unless course personnel. 
             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);
@@ -1631,7 +1664,8 @@ sub start_problem {
             ( $status eq 'NOTRESERVABLE') ||
             ( $status eq 'RESERVABLE') ||
             ( $status eq 'RESERVABLE_LATER') ||
-	    ( $status eq 'INVALID_ACCESS')) {
+	    ( $status eq 'INVALID_ACCESS') ||
+            ( $status eq 'NEED_DIFFERENT_IP')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
 	    if ( $target eq "web" ) {
@@ -1651,10 +1685,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");
@@ -1668,7 +1698,14 @@ sub start_problem {
                               &Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
                 } elsif ($status eq 'NOTRESERVABLE') {
                     $msg.=&mt('Not available to make a reservation.');  
-		}
+		} elsif ($status eq 'NEED_DIFFERENT_IP') {
+                    if ($ipused) {
+                        $msg.=&mt('You must use the same computer ([_1]) you used when you first accessed this resource using your time/place-based reservation.',"IP: $ipused");
+                    } else {
+                        $msg.=&mt('Each student must use a different computer to access this resource at this time and/or place.').'<br />'.
+                              &mt('Somebody else has already used this particular computer for that purpose.');
+                    }
+                }
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
 		my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
@@ -1688,8 +1725,11 @@ sub start_problem {
 		$result .= 
 		    &Apache::bridgetask::proctor_validation_screen($slot);
 	    } elsif ($target eq 'grade') {
-		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
-							'problem');
+		my $checkinresult = &Apache::bridgetask::proctor_check_auth($slot_name,$slot,
+							                    'problem');
+                if ($checkinresult = /^error:/) {
+                    $result .= 'error';
+                }
 	    }
 	} elsif ($target eq 'web') {
 	    if ($status eq 'CAN_ANSWER') {
@@ -1699,10 +1739,18 @@ sub start_problem {
                         $Apache::lonhomework::history{'resource.0.checkedin'};
                     if ($checked_in eq '') {
                         # unproctored slot access, self checkin
-                        &Apache::bridgetask::check_in('problem',undef,undef,
-                                                      $slot_name);
-                        $checked_in =
-                            $Apache::lonhomework::results{"resource.0.checkedin"};
+                        my $needsiptied;
+                        if (ref($slot)) {
+                            $needsiptied = $slot->{'iptied'};
+                        }
+                        my $check = &Apache::bridgetask::check_in('problem',undef,undef,
+                                                                  $slot_name,$needsiptied);
+                        if ($check =~ /^error: /) {
+                            &Apache::lonnet::logthis("Error during self-checkin of problem (symb: $env{'request.symb'}) using slot: $slot_name");
+                        } else {
+                            $checked_in =
+                                $Apache::lonhomework::results{"resource.0.checkedin"};
+                        }
                     }
                     if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {
                         if ($slot->{'starttime'} < time()) {
@@ -1725,11 +1773,16 @@ sub start_problem {
 	      '<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 ($env{'form.inhibitmenu'} eq 'yes') {
+                    # error messages can be useful in any case
+                    $result.= &Apache::lonxml::message_location();
+                } else {
+		    $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
@@ -1911,7 +1964,39 @@ sub end_problem {
                 # Added separately at end of this routine, after added
                 # <script></script> so document will be valid xhtml.
                 #
-		$result.= &Apache::loncommon::end_page({'discussion' => 1,
+                my $showdisc = 1;
+                if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+                    (!$env{'request.role.adv'})) { 
+# For Placement Tests footer with "Post Discussion" and "Send Feedback" links is suppressed.
+                    $showdisc = 0;
+                    my ($symb)= &Apache::lonnet::whichuser();
+                    if ($symb) {
+                        my $navmap = Apache::lonnavmaps::navmap->new();
+                        if (ref($navmap)) {
+                            my $hastries = &Apache::lonplacementtest::has_tries($symb,$navmap);  
+# For Placement Tests test status is displayed if this is the last resource in the course
+# and there are no tries left
+                            unless ($hastries) {
+                                if (&Apache::lonplacementtest::is_lastres($symb,$navmap)) {
+                                    my ($score,$incomplete) = 
+                                        &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result .= &Apache::lonplacementtest::showresult(1,1);
+                                    } elsif ($incomplete < 100) { 
+                                        $result.= &Apache::lonplacementtest::showincomplete($incomplete,1);
+                                    }
+                                } else {
+# For Placement Tests score is displayed if test has just been completed
+                                    my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result.= &Apache::lonplacementtest::showresult(1,1);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+		$result.= &Apache::loncommon::end_page({'discussion' => $showdisc,
 							'notbody'    => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
@@ -2008,9 +2093,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;
@@ -2025,8 +2110,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');
@@ -2509,12 +2592,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);
@@ -2553,10 +2631,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;
@@ -2914,7 +2992,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'],