--- loncom/homework/structuretags.pm	2012/03/25 14:35:58	1.501
+++ loncom/homework/structuretags.pm	2012/04/11 11:40:00	1.504
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.501 2012/03/25 14:35:58 foxr Exp $
+# $Id: structuretags.pm,v 1.504 2012/04/11 11:40:00 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -990,19 +990,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 omplete 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');
@@ -1181,7 +1181,7 @@ sub start_problem {
 	}
 	my $resource_due =  &Apache::lonhomework::due_date(0, $env{'request.symb'});
 	my $time_left = $resource_due - time();
-	if ($resource_due && ($time_left > 0)) {
+	if ($resource_due && ($time_left > 0) && ($target eq 'web')) {
 	    $result .= &Apache::lonhtmlcommon::set_due_date($resource_due);
 	}
 
@@ -1247,14 +1247,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;
@@ -1541,6 +1541,14 @@ sub end_problem {
 
     &reset_problem_globals('problem');
 
+    #
+    # This shouild be just above the return so that the
+    # time put in the javascript is as late as possible in the
+    # computation:
+    #
+    if ($target eq 'web') {
+        $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+    }
     return $result;
 }