--- loncom/interface/lonhtmlcommon.pm	2003/07/11 16:07:20	1.27
+++ loncom/interface/lonhtmlcommon.pm	2003/10/15 18:01:10	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.27 2003/07/11 16:07:20 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.32 2003/10/15 18:01:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,7 @@ html.
 package Apache::lonhtmlcommon;
 
 use Time::Local;
+use Apache::lonlocal;
 use strict;
 
 
@@ -181,6 +182,16 @@ sub date_setter {
             document.$formname.$dname\_day.value = 30;
         }
     }
+
+    function $dname\_opencalendar() {
+       var calwin=window.open(
+"/adm/announcements?pickdate=yes&formname=$formname&element=$dname&month="+
+document.$formname.$dname\_month.value+"&year="+
+document.$formname.$dname\_year.value,
+             "LONCAPAcal",
+              "height=350,width=350,scrollbars=yes,resizable=yes,menubar=no");
+
+    }
 </script>
 ENDJS
     $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.
@@ -192,7 +203,7 @@ ENDJS
     for(my $m = 1;$m <=$#Months;$m++) {
         $result .= "      <option value=\"$m\" ";
         $result .= "selected " if ($m-1 == $month);
-        $result .= "> $Months[$m] </option>\n";
+        $result .= "> ".&mt($Months[$m])." </option>\n";
     }
     $result .= "  </select>\n";
     $result .= "  <input type=\"text\" name=\"$dname\_day\" ".
@@ -207,23 +218,26 @@ ENDJS
         $result .= "      <option value=\"$h\" ";
         $result .= "selected " if ($hour == $h);
         $result .= "> ";
+	my $timest='';
         if ($h == 0) {
-            $result .= "12 am";
+            $timest .= "12 am";
         } elsif($h == 12) {
-            $result .= "12 noon";
+            $timest .= "12 noon";
         } elsif($h < 12) {
-            $result .= "$h am";
+            $timest .= "$h am";
         } else {
-            $result .= $h-12 ." pm";
+            $timest .= $h-12 ." pm";
         }
-        $result .= " </option>\n";
+	$timest=&mt($timest);
+        $result .= $timest." </option>\n";
     } 
     $result .= "  </select>\n";
     $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".$special.' '.
         "value=\"$min\" size=\"3\" /> m\n";
     $result .= "  <input type=\"text\" name=\"$dname\_second\" ".$special.' '.
         "value=\"$sec\" size=\"3\" /> s\n";
-    $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
+    $result .= "<a href=\"javascript:$dname\_opencalendar()\">".
+    &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
     return $result;
 }
 
@@ -734,7 +748,8 @@ sub Create_PrgWin {
 	      "<body bgcolor=\"#88DDFF\">".
               "<h4>$heading</h4>".
               "<form name=popremain>".
-              "<input type=text size=55 name=remaining value=Starting></form>".
+              '<input type="text" size="55" name="remaining" value="'.
+	      &mt('Starting').'"></form>'.
               "</body></html>\');".
     "popwin.document.close();".
     "</script>");
@@ -769,16 +784,16 @@ sub Increment_PrgWin {
     if (int ($time_est/60) > 0) {
 	my $min = int($time_est/60);
 	my $sec = $time_est % 60;
-	$time_est = $min.' minutes';
+	$time_est = $min.' '.&mt('minutes');
         if ($min < 10)  {
             if ($sec > 1) {
-                $time_est.= ', '.$sec.' seconds';
+                $time_est.= ', '.$sec.' '.&mt('seconds');
             } elsif ($sec > 0) {
-                $time_est.= ', '.$sec.' second';
+                $time_est.= ', '.$sec.' '.&mt('second');
             }
         }
     } else {
-	$time_est .= ' seconds';
+	$time_est .= ' '.&mt('seconds');
     }
     my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
     if ($lasttime > 9) {
@@ -789,13 +804,23 @@ sub Increment_PrgWin {
         $lasttime = sprintf("%3.2f",$lasttime);
     }
     if ($lasttime == 1) {
-        $lasttime = '('.$lasttime.' second for '.$extraInfo.')';
+        $lasttime = '('.$lasttime.' '.&mt('second for').' '.$extraInfo.')';
     } else {
-        $lasttime = '('.$lasttime.' seconds for '.$extraInfo.')';
+        $lasttime = '('.$lasttime.' '.&mt('seconds for').' '.$extraInfo.')';
+    }
+    #
+    my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
+    my $user_os      = $ENV{'browser.os'}   if (exists($ENV{'browser.os'}));
+    if (! defined($user_browser) || ! defined($user_os)) {
+        (undef,$user_browser,undef,undef,undef,$user_os) = 
+                           &Apache::loncommon::decode_user_agent();
+    }
+    if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
+        $lasttime = '';
     }
     $r->print('<script>popwin.document.popremain.remaining.value="'.
 	      $$prog_state{'done'}.'/'.$$prog_state{'max'}.
-	      ': '.$time_est.' remaining '.$lasttime.'";'.'</script>');
+	      ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>');
     $$prog_state{'laststart'}=&Time::HiRes::time();
     $r->rflush();
 }
