--- loncom/homework/lonhomework.pm	2006/06/30 05:10:29	1.255
+++ loncom/homework/lonhomework.pm	2006/10/02 20:44:31	1.259
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.255 2006/06/30 05:10:29 albertel Exp $
+# $Id: lonhomework.pm,v 1.259 2006/10/02 20:44:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -480,7 +480,11 @@ sub check_access {
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
 		my $due_date = &due_date($id);
-		$datemsg=&seconds_to_human_length($due_date-time);
+		my $seconds_left = $due_date - time;
+		if ($seconds_left > $interval || $due_date eq '') {
+		    $seconds_left = $interval;
+		}
+		$datemsg=&seconds_to_human_length($seconds_left);
 	    }
 	}
     }
@@ -510,8 +514,9 @@ sub due_date {
     my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
 				       $udom,$uname);
     &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
-    if (defined($interval)) {
+    if ($interval =~ /\d+/) {
 	my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+	&Apache::lonxml::debug("looking for first_access $first_access");
 	if (defined($first_access)) {
 	    $interval = $first_access+$interval;
 	    $date = ($interval < $due_date)? $interval : $due_date;
@@ -964,7 +969,7 @@ sub newproblem {
 	# I don't like hard-coded filenames but for now, this will work.
 	use File::Copy;
 	my $templatefilename =
-	    $request->dir_config('lonIncludes').'/templates/blank.problem';
+	    $request->dir_config('lonIncludes').'/templates/blank.'.$extension;
 	&Apache::lonxml::debug("$templatefilename");
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($templatefilename,$dest);
@@ -981,25 +986,18 @@ sub newproblem {
 	my $instructions;
 	my $start_page = 
 	    &Apache::loncommon::start_page("Create New $extension");
-	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
-	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
-			  'resource' => 'resource',
-			  'requested' => 'The requested file',
-			  'not exist' => 'currently does not exist',
-			  'createnew' => 'To create a new',
-			  'click' => 'click on the',
-			  'Create' => 'Create',
-			  'button' => 'button');
-	$request->print(<<ENDNEWPROBLEM);
+	$request->print("
 $start_page
-<h1>$lt{'create'} $extension $lt{'resource'}</h1>
+<h1>".&mt("Creating a new $extension resource.")."</h1>
 $errormsg
-$lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
+".&mt("The requested file [_1] currently does not exist.",
+      "<tt>$shownurl</tt>")."
 <p>
-<b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>
-</p>
-<p><form action="$url" method="POST">
-ENDNEWPROBLEM
+<b>
+".&mt("To create a new $extension, select a template from the".
+      "pull-down menu below. Then click on the \"Create $extension\" button.")."</b>
+</p><form action=\"$url\" method=\"POST\">");
+
 	if (defined($templatelist)) {
 	    $request->print("<select name=\"template\">$templatelist</select>");
 	}