--- loncom/interface/lonhtmlcommon.pm 2004/03/01 16:19:45 1.58 +++ 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.58 2004/03/01 16:19:45 www 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 = ' ENDJS $result .= " \n"; - $result .= " \n"; - $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; @@ -359,18 +411,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'}; @@ -781,8 +841,11 @@ sub r_print { # ------------------------------------------------------- Puts directory header sub crumbs { - my ($uri,$target,$prefix,$form)=@_; - my $output='
'.$prefix.'/'; + my ($uri,$target,$prefix,$form,$size)=@_; + if (! defined($size)) { + $size = '+2'; + } + my $output='
'.$prefix.'/'; if ($ENV{'user.adv'}) { my $path=$prefix.'/'; foreach (split('/',$uri)) { @@ -805,9 +868,12 @@ sub crumbs { # ------------------------------------------------- Output headers for HTMLArea sub htmlareaheaders { - unless (&htmlareabrowser()) { return ''; } + unless (&htmlareablocked()) { return ''; } my $lang='en'; return (< + _editor_url="/htmlarea/"; + @@ -820,7 +886,7 @@ ENDHEADERS # ---------------------------------------------------------- Script to activate sub htmlareaactive { - unless (&htmlareabrowser()) { return ''; } + unless (&htmlareablocked()) { return ''; } return (< HTMLArea.replaceAll(); @@ -828,6 +894,13 @@ sub htmlareaactive { ENDSCRIPT } +# --------------------------------------------------------------------- Blocked + +sub htmlareablocked { + unless (&htmlareabrowser()) { return ''; } + return 1; +} + # ---------------------------------------- Browser capable of running HTMLArea? sub htmlareabrowser { @@ -853,6 +926,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. @@ -878,7 +954,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(); @@ -895,16 +972,18 @@ returns: nothing # Make the faq and bug data cascade my $faq = ''; my $bug = ''; - # The last breadcrumb does not have a link, so handle it seperately. + # The last breadcrumb does not have a link, so handle it separately. 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', - 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 .= @@ -912,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 '');