--- loncom/interface/lonhtmlcommon.pm 2003/09/03 01:53:46 1.29 +++ loncom/interface/lonhtmlcommon.pm 2004/01/02 16:34:03 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.29 2003/09/03 01:53:46 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.39 2004/01/02 16:34:03 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; @@ -90,8 +91,9 @@ sub textbox { ############################################## ############################################## sub checkbox { - my ($name) = @_; - my $Str = ''; + my ($name,$value) = @_; + my $Str = ''; return $Str; } @@ -140,14 +142,21 @@ The method used to restrict user input w ############################################## ############################################## sub date_setter { - my ($formname,$dname,$currentvalue,$special) = @_; + my ($formname,$dname,$currentvalue,$special,$includeempty) = @_; if (! defined($currentvalue) || $currentvalue eq 'now') { - $currentvalue = time; + unless ($includeempty) { + $currentvalue = time; + } else { + $currentvalue = 0; + } } # other potentially useful values: wkday,yrday,is_daylight_savings - my ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = - localtime($currentvalue); - $year += 1900; + my ($sec,$min,$hour,$mday,$month,$year)=('','','','','',''); + if ($currentvalue) { + ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = + localtime($currentvalue); + $year += 1900; + } my $result = "\n\n"; $result .= < @@ -199,10 +208,11 @@ ENDJS July August September October November December/; # Pad @Months with a bogus value to make indexing easier unshift(@Months,'If you can read this an error occurred'); + if ($includeempty) { $result.=""; } for(my $m = 1;$m <=$#Months;$m++) { $result .= " '."\n"; + &mt('Currently Enrolled').''."\n"; $Str .= ''."\n"; + &mt('Previously Enrolled').''."\n"; $Str .= ''."\n"; + &mt('Any Enrollment Status').''."\n"; $Str .= ''."\n"; } @@ -744,7 +760,8 @@ sub Create_PrgWin { "". "

$heading

". "
". - '
'. + ''. "\');". "popwin.document.close();". ""); @@ -779,16 +796,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) { @@ -799,9 +816,9 @@ 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'})); @@ -815,7 +832,7 @@ sub Increment_PrgWin { } $r->print(''); + ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.''); $$prog_state{'laststart'}=&Time::HiRes::time(); $r->rflush(); } @@ -828,6 +845,27 @@ sub Close_PrgWin { $r->rflush(); } + +# ------------------------------------------------------- Puts directory header + +sub crumbs { + my ($uri,$target,$prefix)=@_; + my $output='
'.$prefix.'/'; + if ($ENV{'user.adv'}) { + my $path=$prefix; + foreach (split('/',$uri)) { + unless ($_) { next; } + $path.='/'.$_; + $output.=''.$_.'/'; + } + } else { + $output.=$uri; + } + unless ($uri=~/\/$/) { $output=~s/\/$//; } + return $output.'
'; +} + + 1; __END__