--- loncom/interface/lonhtmlcommon.pm 2004/04/06 15:07:41 1.62 +++ loncom/interface/lonhtmlcommon.pm 2004/04/23 17:49:25 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.62 2004/04/06 15:07:41 matthew Exp $ +# $Id: lonhtmlcommon.pm,v 1.67 2004/04/23 17:49:25 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -219,10 +219,14 @@ The method used to restrict user input w ############################################## ############################################## sub date_setter { - my ($formname,$dname,$currentvalue,$special,$includeempty,$state) = @_; + my ($formname,$dname,$currentvalue,$special,$includeempty,$state, + $no_hh_mm_ss) = @_; if (! defined($state) || $state ne 'disabled') { $state = ''; } + if (! defined($no_hh_mm_ss)) { + $no_hh_mm_ss = 0; + } if (! defined($currentvalue) || $currentvalue eq 'now') { unless ($includeempty) { $currentvalue = time; @@ -231,7 +235,7 @@ sub date_setter { } } # other potentially useful values: wkday,yrday,is_daylight_savings - my ($sec,$min,$hour,$mday,$month,$year)=('','','','','',''); + my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','',''); if ($currentvalue) { ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = localtime($currentvalue); @@ -305,6 +309,7 @@ ENDJS $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; @@ -392,18 +405,26 @@ sub get_date_from_form { if (($tmpsec =~ /^\d+$/) && ($tmpsec >= 0) && ($tmpsec < 60)) { $sec = $tmpsec; } + if (!defined($tmpsec) || $tmpsec eq '') { $sec = 0; } + } else { + $sec = 0; } if (defined($ENV{'form.'.$dname.'_minute'})) { my $tmpmin = $ENV{'form.'.$dname.'_minute'}; if (($tmpmin =~ /^\d+$/) && ($tmpmin >= 0) && ($tmpmin < 60)) { $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'}; @@ -899,6 +920,9 @@ All inputs can be undef without problems Inputs: $color (the background color of the table returned), $component (the large text on the right side of the table), $component_help + $function (role to get colors from) + $domain (domian of role) + $menulink (boolean, controls whether to include a link to /adm/menu) Returns a string containing breadcrumbs for the current page. @@ -924,7 +948,8 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($color,$component,$component_help,$function,$domain) = @_; + my ($color,$component,$component_help,$function,$domain,$menulink) = + @_; if (! defined($color)) { if (! defined($function)) { $function = &Apache::loncommon::get_users_function(); @@ -945,7 +970,8 @@ returns: nothing my $last = pop(@Crumbs); # # The first one should be the course, I guess. - if (exists($ENV{'request.course.id'})) { + if (!defined($menulink)) { $menulink=1; } + if ($menulink && exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') { my $cid = $ENV{'request.course.id'}; unshift(@Crumbs,{ href=>'/adm/menu',