--- loncom/homework/structuretags.pm	2012/04/05 09:49:51	1.503
+++ loncom/homework/structuretags.pm	2013/01/28 18:17:31	1.511
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.503 2012/04/05 09:49:51 foxr Exp $
+# $Id: structuretags.pm,v 1.511 2013/01/28 18:17:31 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -453,7 +453,6 @@ sub page_start {
         }
 	$form_tag_start.='>'."\n";
 
-	my $symb=&Apache::lonnet::symbread();
 	if ($symb =~ /\S/) {
 	    $symb=
 		&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
@@ -711,7 +710,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>
@@ -967,8 +966,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>
@@ -990,19 +989,19 @@ sub firstaccess_msg {
 	my $foldertitle=&Apache::lonnet::gettitle($map);
     
 	&Apache::lonxml::debug("map is $map title is $foldertitle");
-	$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
-                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
-                             ,$foldertitle,$time)."</h2>";
+	$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.',$foldertitle)."</h2>"
+                             .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$foldertitle,$time)."</p>";
     } elsif ($interval[1] eq 'course') {
 	my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
-        $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
-                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
-                             ,$course,$time)."</h2>";
+        $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.',$course)."</h2>"
+                             .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$course,$time)."</p>";
     } else {
 	my $title=&Apache::lonnet::gettitle($symb);
-        $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.'
-                             .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
-                             ,$title,$time)."</h2>";
+        $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.',$title)."</h2>"
+                             .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
+                             ,$title,$time)."</p>";
     }
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     my $buttontext = &mt('Show Resource');
@@ -1160,9 +1159,23 @@ sub start_problem {
     &Apache::run::run($expression,$safeeval);
     my $status;
     my $accessmsg;
+    my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start);
+    my ($result,$form_tag_start,$slot_name,$slot);
+
+    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");
+            &Apache::lonnet::set_first_access($interval[1]);
+        }
+
+        ($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'
 	|| $target eq 'edit') {
 	($result,$form_tag_start) =
@@ -1175,20 +1188,6 @@ sub start_problem {
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
     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");
-	    &Apache::lonnet::set_first_access($interval[1]);
-	}
-	my $resource_due =  &Apache::lonhomework::due_date(0, $env{'request.symb'});
-	my $time_left = $resource_due - time();
-	if ($resource_due && ($time_left > 0) && ($target eq 'web')) {
-	    $result .= &Apache::lonhtmlcommon::set_due_date($resource_due);
-	}
-
-	    
-        ($status,$accessmsg,my $slot_name,my $slot) =
-            &Apache::lonhomework::check_slot_access('0','problem');
-        push (@Apache::inputtags::status,$status);
 
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval,$target);
@@ -1247,14 +1246,14 @@ sub start_problem {
 	    if ( $target eq "web" ) {
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
-		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
                 } elsif ($status eq 'NOT_IN_A_SLOT') {
-                    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+                    $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
                 } elsif (($status eq 'RESERVABLE') || ($status eq 'RESERVABLE_LATER') ||
                          ($status eq 'NOTRESERVABLE')) {
-                    $msg.='<h1>'.&mt('Access requires reservation to work at specific time/place.').'</h1>';
+                    $msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>';
 		} elsif ($status ne 'NOT_YET_VIEWED') {
-		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
+		    $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
                 }
 		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.=&mt('The problem ').$accessmsg;
@@ -1298,13 +1297,35 @@ sub start_problem {
 							'problem');
 	    }
 	} elsif ($target eq 'web') {
-	    if ($status eq 'CAN_ANSWER' 
-		&& $slot_name ne ''
-		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
-		# unproctored slot access, self checkin
-		&Apache::bridgetask::check_in('problem',undef,undef,
-					      $slot_name);
-	    }
+	    if ($status eq 'CAN_ANSWER') {
+                $resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});
+                if ($slot_name ne '') {
+                    my $checked_in =
+                        $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"};
+                    }
+                    if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {
+                        if ($slot->{'starttime'} < time()) {
+                            if (!$resource_due) {
+                                $resource_due = $slot->{'endtime'};
+                            } elsif ($slot->{'endtime'} < $resource_due) {
+                                $resource_due = $slot->{'endtime'};
+                            }
+                        }
+                    }
+                }
+                if ($resource_due) {
+                    my $time_left = $resource_due - time();
+                    if ($resource_due && ($time_left > 0) && ($target eq 'web')) {
+                        $result .= &Apache::lonhtmlcommon::set_due_date($resource_due);
+                    }
+                }
+            }
 	    $result.="\n $form_tag_start \t".	
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # create a page header and exit
@@ -1490,7 +1511,13 @@ sub end_problem {
 		$result.="</form>";
 	    }
 	    if ($target eq 'web') {
-		$result.= &Apache::loncommon::end_page({'discussion' => 1});
+                #
+                # Closing </body></html> not added by end_page().
+                # Added separately at end of this routine, after added
+                # <script></script> so document will be valid xhtml.
+                #
+		$result.= &Apache::loncommon::end_page({'discussion' => 1,
+							'notbody'    => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $env{'form.problem_split'}=~/yes/) {
@@ -1548,6 +1575,11 @@ sub end_problem {
     #
     if ($target eq 'web') {
         $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+        #
+        # Closing tags delayed so any <script></script> tags 
+        # not in head can appear inside body, for valid xhtml.
+        # 
+        $result .= "</body>\n</html>";
     }
     return $result;
 }
@@ -2464,7 +2496,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'],