--- loncom/interface/lonhtmlcommon.pm 2004/02/20 17:03:38 1.55 +++ loncom/interface/lonhtmlcommon.pm 2004/05/10 18:57:43 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.55 2004/02/20 17:03:38 matthew Exp $ +# $Id: lonhtmlcommon.pm,v 1.70 2004/05/10 18:57:43 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'}; @@ -676,7 +736,7 @@ sub Create_PrgWin { } if (!$inputname) { $prog_state{'inputname'}=&get_uniq_name(); - &r_print($r,''); } else { $prog_state{'inputname'}=$inputname; @@ -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. @@ -876,9 +952,10 @@ 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(); @@ -891,32 +968,54 @@ returns: nothing ''. '
'. ''; - # The last breadcrumb does not have a link, so handle it seperately. + # + # Make the faq and bug data cascade + my $faq = ''; + my $bug = ''; + # 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'})) { - my $cid = $ENV{'request.course.id'}; - unshift(@Crumbs,{href=>'/adm/menu', - title=>'Go to main menu', - text=>$ENV{'course.'.$cid.'.description'}, - }); + # + # The first one should be the course or a menu link + if (!defined($menulink)) { $menulink=1; } + if ($menulink) { + my $description = 'Menu'; + if (exists($ENV{'request.course.id'}) && + $ENV{'request.course.id'} ne '') { + $description = + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + } + unshift(@Crumbs,{ + href =>'/adm/menu', + title =>'Go to main menu', + target =>'_top', + text =>$description, + }); } my $links .= join('->', map { - ''. - $_->{'text'}.'' + $faq = $_->{'faq'} if (exists($_->{'faq'})); + $bug = $_->{'bug'} if (exists($_->{'bug'})); + my $result = '{'target'}) && $_->{'target'} ne '') { + $result .= 'target="'.$_->{'target'}.'" '; + } + $result .='title="'.&mt($_->{'title'}).'">'. + &mt($_->{'text'}).''; + $result; } @Crumbs ); $links .= '->' if ($links ne ''); $links .= ''.$last->{'text'}.''; # my $icons = ''; - if (exists($last->{'faq'})) { - $icons .= &Apache::loncommon::help_open_faq($last->{'faq'}); + $faq = $last->{'faq'} if (exists($last->{'faq'})); + $bug = $last->{'bug'} if (exists($last->{'bug'})); + if ($faq ne '') { + $icons .= &Apache::loncommon::help_open_faq($faq); } - if (exists($last->{'bug'})) { - $icons .= &Apache::loncommon::help_open_bug($last->{'bug'}); + if ($bug ne '') { + $icons .= &Apache::loncommon::help_open_bug($bug); } if ($icons ne '') { $Str .= $icons.' '; @@ -926,7 +1025,7 @@ returns: nothing # if (defined($component)) { $Str .= ''. - ''.$component.''; + ''.&mt($component).''; if (defined($component_help)) { $Str .= &Apache::loncommon::help_open_topic($component_help); @@ -950,7 +1049,7 @@ returns: nothing push (@Crumbs,@_); } -} +} # End of scope for @Crumbs ############################################################ ############################################################