--- loncom/interface/lonhtmlcommon.pm	2003/03/07 19:09:11	1.16
+++ loncom/interface/lonhtmlcommon.pm	2003/03/21 15:59:14	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.16 2003/03/07 19:09:11 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.19 2003/03/21 15:59:14 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -249,6 +249,40 @@ sub get_date_from_form {
 ##############################################
 ##############################################
 
+=pod
+
+=item &javascript_nothing()
+
+Return an appropriate null for the users browser.  This is used
+as the first arguement for window.open calls when you want a blank
+window that you can then write to.
+
+=cut
+
+##############################################
+##############################################
+sub javascript_nothing {
+    # mozilla and other browsers work with "''", but IE on mac does not.
+    my $nothing = "''";
+    my $user_browser;
+    my $user_os;
+    $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
+    $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') {
+        $nothing = "'javascript:void(0);'";
+    }
+    return $nothing;
+}
+
+##############################################
+##############################################
+
+
+
 sub AscendOrderOptions {
     my ($order, $page, $formName)=@_;
 
@@ -690,11 +724,15 @@ sub Increment_PrgWin {
     } else {
 	$time_est .= ' seconds';
     }
-
+    my $lasttime = time-$$prog_state{'laststart'};
+    if ($lasttime == 1) {
+        $lasttime = '('.$lasttime.' second for '.$extraInfo.')';
+    } else {
+        $lasttime = '('.$lasttime.' seconds for '.$extraInfo.')';
+    }
     $r->print('<script>popwin.document.popremain.remaining.value="'.
 	      $$prog_state{'done'}.'/'.$$prog_state{'max'}.
-	      ': '.$time_est.' remaining ('.(time-$$prog_state{'laststart'}).
-	      ' seconds for '.$extraInfo.')";'.'</script>');
+	      ': '.$time_est.' remaining '.$lasttime.'";'.'</script>');
     $$prog_state{'laststart'}=time;
     $r->rflush();
 }