--- loncom/interface/lonhtmlcommon.pm 2004/07/03 18:49:42 1.79 +++ loncom/interface/lonhtmlcommon.pm 2004/10/12 22:55:21 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.79 2004/07/03 18:49:42 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.92 2004/10/12 22:55:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -117,6 +117,12 @@ sub store_recent { time.'&'.&Apache::lonnet::escape($value) }); } +sub remove_recent { + my ($area,$names)=@_; + my $file=&recent_filename($area); + return &Apache::lonnet::del($file,$names); +} + sub select_recent { my ($area,$fieldname,$event)=@_; my %recent=&Apache::lonnet::dump(&recent_filename($area)); @@ -519,6 +525,27 @@ sub javascript_nothing { return $nothing; } +############################################## +############################################## +sub javascript_docopen { + # safari does not understand document.open() and loads "text/html" + my $nothing = "''"; + my $user_browser; + my $user_os; + $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'})); + $user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'})); + if (! defined($user_browser) || ! defined($user_os)) { + (undef,$user_browser,undef,undef,undef,$user_os) = + &Apache::loncommon::decode_user_agent(); + } + if ($user_browser eq 'safari' && $user_os =~ 'mac') { + $nothing = "document.clear()"; + } else { + $nothing = "document.open('text/html','replace')"; + } + return $nothing; +} + ############################################## ############################################## @@ -772,20 +799,24 @@ sub Increment_PrgWin { $$prog_state{'done'} * ($$prog_state{'max'}-$$prog_state{'done'}); $time_est = int($time_est); - if (int ($time_est/60) > 0) { - my $min = int($time_est/60); - my $sec = $time_est % 60; - $time_est = $min.' '.&mt('minutes'); - if ($min < 10) { - if ($sec > 1) { - $time_est.= ', '.$sec.' '.&mt('seconds'); - } elsif ($sec > 0) { - $time_est.= ', '.$sec.' '.&mt('second'); - } - } - } else { - $time_est .= ' '.&mt('seconds'); + # + my $min = int($time_est/60); + my $sec = $time_est % 60; + # + my $str; + if ($min == 0 && $sec > 1) { + $str = '[_2] seconds'; + } elsif ($min == 1 && $sec > 1) { + $str = '1 minute [_2] seconds'; + } elsif ($min == 1 && $sec < 2) { + $str = '1 minute'; + } elsif ($min < 10 && $sec > 1) { + $str = '[_1] minutes, [_2] seconds'; + } elsif ($min >= 10 || $sec < 2) { + $str = '[_1] minutes'; } + $time_est = &mt($str,$min,$sec); + # my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'}; if ($lasttime > 9) { $lasttime = int($lasttime); @@ -867,6 +898,35 @@ sub crumbs { return $output.''.($noformat?'':'
'); } +# --------------------- A function that generates a window for the spellchecker + +sub spellheader { + my $nothing = &javascript_nothing(); + return (< +// + +ENDCHECK +} + +# ---------------------------------- Generate link to spell checker for a field + +sub spelllink { + my ($form,$field)=@_; + my $linktext=&mt('Check Spelling'); + return (<$linktext +ENDLINK +} + # ------------------------------------------------- Output headers for HTMLArea sub htmlareaheaders { @@ -895,14 +955,14 @@ sub htmlareaaddbuttons { config.registerButton('ed_math','LaTeX Inline', '/htmlarea/images/ed_math.gif',false, function(editor,id) { - editor.surroundHTML('\$','\$'); + editor.surroundHTML(' \$','\$ '); } ); config.registerButton('ed_math_eqn','LaTeX Equation', '/htmlarea/images/ed_math_eqn.gif',false, function(editor,id) { editor.surroundHTML( - '
\\\\[','\\\\]
'); + ' \\n
\\\\[','\\\\]
\\n '); } ); config.toolbar.push(['ed_math','ed_math_eqn']); @@ -1003,8 +1063,8 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($color,$component,$component_help,$function,$domain,$menulink) = - @_; + my ($color,$component,$component_help,$function,$domain,$menulink, + $helplink) = @_; if (! defined($color)) { if (! defined($function)) { $function = &Apache::loncommon::get_users_function(); @@ -1055,7 +1115,7 @@ returns: nothing } @Crumbs ); $links .= '->' if ($links ne ''); - $links .= ''.$last->{'text'}.''; + $links .= ''.&mt($last->{'text'}).''; # my $icons = ''; $faq = $last->{'faq'} if (exists($last->{'faq'})); @@ -1066,7 +1126,9 @@ returns: nothing # if ($bug ne '') { # $icons .= &Apache::loncommon::help_open_bug($bug); # } - $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug); + if ($helplink ne 'nohelp') { + $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug); + } if ($icons ne '') { $Str .= $icons.' '; } @@ -1075,12 +1137,7 @@ returns: nothing # if (defined($component)) { $Str .= ''. - ''.&mt($component).''; - if (defined($component_help)) { - $Str .= - &Apache::loncommon::help_open_topic($component_help); - } - $Str.= ''; + ''.&mt($component).''; } $Str .= ''."\n"; #