--- loncom/interface/lonhtmlcommon.pm	2003/06/18 15:02:20	1.24
+++ loncom/interface/lonhtmlcommon.pm	2003/09/03 01:53:46	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.24 2003/06/18 15:02:20 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.29 2003/09/03 01:53:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,6 +58,45 @@ package Apache::lonhtmlcommon;
 use Time::Local;
 use strict;
 
+
+##############################################
+##############################################
+
+=pod
+
+=item textbox
+
+=cut
+
+##############################################
+##############################################
+sub textbox {
+    my ($name,$value,$size,$special) = @_;
+    $size = 40 if (! defined($size));
+    my $Str = '<input type="text" name="'.$name.'" size="'.$size.'" '.
+        'value="'.$value.'" '.$special.' />';
+    return $Str;
+}
+
+##############################################
+##############################################
+
+=pod
+
+=item checkbox
+
+=cut
+
+##############################################
+##############################################
+sub checkbox {
+    my ($name) = @_;
+    my $Str = '<input type="checkbox" name="'.$name.'" />';
+    return $Str;
+}
+
+
+
 ##############################################
 ##############################################
 
@@ -85,6 +124,11 @@ The current setting for this time parame
 An undefined value is taken to indicate the value is the current time.
 Also, to be explicit, a value of 'now' also indicates the current time.
 
+=item $special
+
+Additional html/javascript to be associated with each element in
+the date_setter.  See lonparmset for example usage.
+
 =back
 
 Bugs
@@ -96,7 +140,7 @@ The method used to restrict user input w
 ##############################################
 ##############################################
 sub date_setter {
-    my ($formname,$dname,$currentvalue) = @_;
+    my ($formname,$dname,$currentvalue,$special) = @_;
     if (! defined($currentvalue) || $currentvalue eq 'now') {
         $currentvalue = time;
     }
@@ -137,9 +181,19 @@ 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 .= "  <select name=\"$dname\_month\" ".
+    $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.
         "onChange=\"javascript:$dname\_checkday()\" >\n";
     my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;
@@ -152,13 +206,13 @@ ENDJS
     }
     $result .= "  </select>\n";
     $result .= "  <input type=\"text\" name=\"$dname\_day\" ".
-            "value=\"$mday\" size=\"3\" ".
+            "value=\"$mday\" size=\"3\" ".$special.' '.
             "onChange=\"javascript:$dname\_checkday()\" />\n";
     $result .= "  <input type=\"year\" name=\"$dname\_year\" ".
-            "value=\"$year\" size=\"5\" ".
+            "value=\"$year\" size=\"5\" ".$special.' '.
             "onChange=\"javascript:$dname\_checkday()\" />\n";
     $result .= "&nbsp;&nbsp;";
-    $result .= "  <select name=\"$dname\_hour\" >\n";
+    $result .= "  <select name=\"$dname\_hour\" ".$special." >\n";
     for (my $h = 0;$h<24;$h++) {
         $result .= "      <option value=\"$h\" ";
         $result .= "selected " if ($hour == $h);
@@ -175,11 +229,11 @@ ENDJS
         $result .= " </option>\n";
     } 
     $result .= "  </select>\n";
-    $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".
+    $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".$special.' '.
         "value=\"$min\" size=\"3\" /> m\n";
-    $result .= "  <input type=\"text\" name=\"$dname\_second\" ".
+    $result .= "  <input type=\"text\" name=\"$dname\_second\" ".$special.' '.
         "value=\"$sec\" size=\"3\" /> s\n";
-    $result .= "<!-- end $dname date setting form -->\n";
+    $result .= "<a href=\"javascript:$dname\_opencalendar()\">Select Date</a></nobr>\n<!-- end $dname date setting form -->\n";
     return $result;
 }
 
@@ -341,6 +395,9 @@ the selection box is set to document.$fo
 
 $size: the size (number of lines) of the selection box.
 
+$onchange: javascript to use when the value is changed.  Enclosed in 
+double quotes, ""s, not single quotes.
+
 Returns: a perl string as described.
 
 =cut
@@ -348,7 +405,7 @@ Returns: a perl string as described.
 ##############################################
 ##############################################
 sub StatusOptions {
-    my ($status, $formName,$size)=@_;
+    my ($status, $formName,$size,$onchange)=@_;
     $size = 1 if (!defined($size));
     if (! defined($status)) {
         $status = 'Active';
@@ -365,9 +422,12 @@ sub StatusOptions {
 
     my $Str = '';
     $Str .= '<select name="Status"';
-    if(defined($formName) && $formName ne '') {
+    if(defined($formName) && $formName ne '' && ! defined($onchange)) {
         $Str .= ' onchange="document.'.$formName.'.submit()"';
     }
+    if (defined($onchange)) {
+        $Str .= ' onchange="'.$onchange.'"';
+    }
     $Str .= ' size="'.$size.'" ';
     $Str .= '>'."\n";
     $Str .= '<option value="Active" '.$OpSel1.'>'.
@@ -684,7 +744,7 @@ 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="Starting"></form>'.
               "</body></html>\');".
     "popwin.document.close();".
     "</script>");
@@ -720,11 +780,13 @@ sub Increment_PrgWin {
 	my $min = int($time_est/60);
 	my $sec = $time_est % 60;
 	$time_est = $min.' minutes';
-	if ($sec > 1) {
-	    $time_est.= ', '.$sec.' seconds';
-	} elsif ($sec > 0) {
-	    $time_est.= ', '.$sec.' second';
-	}
+        if ($min < 10)  {
+            if ($sec > 1) {
+                $time_est.= ', '.$sec.' seconds';
+            } elsif ($sec > 0) {
+                $time_est.= ', '.$sec.' second';
+            }
+        }
     } else {
 	$time_est .= ' seconds';
     }
@@ -741,6 +803,16 @@ sub Increment_PrgWin {
     } else {
         $lasttime = '('.$lasttime.' 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>');