--- loncom/interface/lonhtmlcommon.pm 2003/09/29 13:49:31 1.30 +++ loncom/interface/lonhtmlcommon.pm 2004/01/01 20:13:17 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.30 2003/09/29 13:49:31 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.38 2004/01/01 20:13:17 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -91,8 +91,9 @@ sub textbox { ############################################## ############################################## sub checkbox { - my ($name) = @_; - my $Str = ''; + my ($name,$value) = @_; + my $Str = ''; return $Str; } @@ -288,7 +289,7 @@ sub get_date_from_form { } if (defined($ENV{'form.'.$dname.'_hour'})) { my $tmphour = $ENV{'form.'.$dname.'_hour'}; - if (($tmphour =~ /^\d+$/) && ($tmphour > 0) && ($tmphour < 32)) { + if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) { $hour = $tmphour; } } @@ -311,7 +312,9 @@ sub get_date_from_form { } } if (($year<70) || ($year>137)) { return undef; } - if (eval(&timelocal($sec,$min,$hour,$day,$month,$year))) { + if (defined($sec) && defined($min) && defined($hour) && + defined($day) && defined($month) && defined($year) && + eval(&timelocal($sec,$min,$hour,$day,$month,$year))) { return &timelocal($sec,$min,$hour,$day,$month,$year); } else { return undef; @@ -435,11 +438,11 @@ sub StatusOptions { $Str .= ' size="'.$size.'" '; $Str .= '>'."\n"; $Str .= ''."\n"; + &mt('Currently Enrolled').''."\n"; $Str .= ''."\n"; + &mt('Previously Enrolled').''."\n"; $Str .= ''."\n"; + &mt('Any Enrollment Status').''."\n"; $Str .= ''."\n"; } @@ -748,7 +751,8 @@ sub Create_PrgWin { "". "

$heading

". "
". - '
'. + ''. "\');". "popwin.document.close();". ""); @@ -783,16 +787,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) { @@ -803,9 +807,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'})); @@ -819,7 +823,7 @@ sub Increment_PrgWin { } $r->print(''); + ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.''); $$prog_state{'laststart'}=&Time::HiRes::time(); $r->rflush(); } @@ -832,6 +836,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__