--- loncom/interface/lonhtmlcommon.pm 2004/04/19 16:43:03 1.66 +++ loncom/interface/lonhtmlcommon.pm 2004/05/06 17:54:11 1.69 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.66 2004/04/19 16:43:03 matthew Exp $ +# $Id: lonhtmlcommon.pm,v 1.69 2004/05/06 17:54:11 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -163,9 +163,15 @@ sub textbox { ############################################## ############################################## sub checkbox { - my ($name,$value) = @_; - my $Str = ''; + my ($name,$checked,$value) = @_; + my $Str = '\n"; + # Month my @Months = qw/January February March April May June July August September October November December/; # Pad @Months with a bogus value to make indexing easier @@ -316,39 +327,47 @@ ENDJS $result .= "> ".&mt($Months[$m])." \n"; } $result .= " \n"; + # Day $result .= " \n"; + # Year $result .= " \n"; $result .= "  "; - $result .= " \n"; - $result .= " m\n"; - $result .= " s\n"; + if (! $no_hh_mm_ss) { + # Hours + $result .= " \n"; + $result .= " m\n"; + $result .= " s\n"; + } $result .= "". &mt('Select Date')."\n\n"; return $result; @@ -393,6 +412,8 @@ sub get_date_from_form { $sec = $tmpsec; } if (!defined($tmpsec) || $tmpsec eq '') { $sec = 0; } + } else { + $sec = 0; } if (defined($ENV{'form.'.$dname.'_minute'})) { my $tmpmin = $ENV{'form.'.$dname.'_minute'}; @@ -400,12 +421,16 @@ sub get_date_from_form { $min = $tmpmin; } if (!defined($tmpmin) || $tmpmin eq '') { $min = 0; } + } else { + $min = 0; } if (defined($ENV{'form.'.$dname.'_hour'})) { my $tmphour = $ENV{'form.'.$dname.'_hour'}; if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) { $hour = $tmphour; } + } else { + $hour = 0; } if (defined($ENV{'form.'.$dname.'_day'})) { my $tmpday = $ENV{'form.'.$dname.'_day'}; @@ -955,9 +980,10 @@ returns: nothing if ($menulink && exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') { my $cid = $ENV{'request.course.id'}; unshift(@Crumbs,{ - href=>'/adm/menu', - title=>'Go to main menu', - text=>$ENV{'course.'.$cid.'.description'}, + href =>'/adm/menu', + title =>'Go to main menu', + target =>'_top', + text =>$ENV{'course.'.$cid.'.description'}, }); } my $links .= @@ -965,8 +991,13 @@ returns: nothing map { $faq = $_->{'faq'} if (exists($_->{'faq'})); $bug = $_->{'bug'} if (exists($_->{'bug'})); - ''. - &mt($_->{'text'}).'' + my $result = '{'target'}) && $_->{'target'} ne '') { + $result .= 'target="'.$_->{'target'}.'" '; + } + $result .='title="'.&mt($_->{'title'}).'">'. + &mt($_->{'text'}).''; + $result; } @Crumbs ); $links .= '->' if ($links ne '');