--- loncom/interface/lonnavmaps.pm	2007/10/05 18:48:20	1.402
+++ loncom/interface/lonnavmaps.pm	2007/10/18 21:08:08	1.403
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.402 2007/10/05 18:48:20 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.403 2007/10/18 21:08:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,9 +36,9 @@ use Apache::lonenc();
 use Apache::lonlocal;
 use Apache::lonnet;
 use POSIX qw (floor strftime);
-use Data::Dumper; # for debugging, not always 
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
+use DateTime();
 
 # symbolic constants
 sub SYMB { return 1; }
@@ -305,9 +305,6 @@ sub timeToHumanString {
     } 
     my $now = time();
 
-    my @time = localtime($time);
-    my @now = localtime($now);
-
     # Positive = future
     my $delta = $time - $now;
 
@@ -366,22 +363,25 @@ sub timeToHumanString {
             return "$prefix$hourString$minuteString$tense";
         }
 
+	my $dt = DateTime->from_epoch(epoch => $time)
+	                 ->set_time_zone(&Apache::lonlocal::gettimezone());
+
 	# If there's a caller supplied format, use it.
 
-	if($format ne '') {
-	    my $timeStr = strftime($format, localtime($time));
-	    return $timeStr.&Apache::lonlocal::gettimezone($time);
+	if ($format ne '') {
+	    my $timeStr = $dt->strftime($format);
+	    return $timeStr.' ('.$dt->time_zone_short_name().')';
 	}
 
         # Less than 5 days away, display day of the week and
         # HH:MM
 
         if ( $delta < $day * 5 ) {
-            my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
+            my $timeStr = $dt->strftime("%A, %b %e at %I:%M %P (%Z)");
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return ($inPast ? "last " : "this ") .
-                $timeStr.&Apache::lonlocal::gettimezone($time);
+                $timeStr;
         }
         
 	my $conjunction='on';
@@ -391,19 +391,22 @@ sub timeToHumanString {
 	    $conjunction='by';
 	}
         # Is it this year?
-        if ( $time[5] == $now[5]) {
+	my $dt_now = DateTime->from_epoch(epoch => $now)
+	                     ->set_time_zone(&Apache::lonlocal::gettimezone());
+        if ( $dt->year() == $dt_now->year()) {
             # Return on Month Day, HH:MM meridian
-            my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time));
+            my $timeStr = $dt->strftime("$conjunction %A, %b %e at %I:%M %P (%Z)");
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return $timeStr.&Apache::lonlocal::gettimezone($time);
+            return $timeStr;
         }
 
         # Not this year, so show the year
-        my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time));
+        my $timeStr = 
+	    $dt->strftime("$conjunction %A, %b %e %Y at %I:%M %P (%Z)");
         $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
-        return $timeStr.&Apache::lonlocal::gettimezone($time);
+        return $timeStr;
     }
 }
 
@@ -1045,7 +1048,6 @@ my %statusStrings =
      );
 my @statuses = ($resObj->CORRECT, $resObj->ATTEMPTED, $resObj->INCORRECT, $resObj->OPEN, $resObj->CLOSED, $resObj->ERROR);
 
-use Data::Dumper;
 sub render_parts_summary_status {
     my ($resource, $part, $params) = @_;
     if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
@@ -1289,7 +1291,6 @@ sub render {
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
-        my $date=localtime;
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
 	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {