--- loncom/interface/lonhtmlcommon.pm 2004/07/19 21:14:15 1.83 +++ loncom/interface/lonhtmlcommon.pm 2005/02/17 08:29:42 1.103 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.83 2004/07/19 21:14:15 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.103 2005/02/17 08:29:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,7 +80,7 @@ sub authorbombs { foreach (keys %bombs) { if ($_=~/^$udom\/$uname\//) { return ''. + '">'. &Apache::loncommon::help_open_topic('About_Bombs'); } } @@ -117,15 +117,22 @@ 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)); my $return="\n\n"; + $result .= ' '; + my $monthselector = qq{\n"; + $monthselector.= ' '; # Day - $result .= " \n"; + my $dayselector = qq{}; # Year - $result .= " \n"; - $result .= "  "; - if (! $no_hh_mm_ss) { - # Hours - $result .= " \n"; - $result .= " m\n"; - $result .= " s\n"; + my $yearselector = qq{}; + # + my $hourselector = qq{\n"; + my $minuteselector = qq{}; + my $secondselector= qq{}; + my $cal_link = qq{}; + # + if ($no_hh_mm_ss) { + $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]', + $monthselector,$dayselector,$yearselector, + $cal_link,''); + } else { + $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]', + $monthselector,$dayselector,$yearselector, + $hourselector,$minuteselector,$secondselector, + $cal_link,''); } - $result .= "". - &mt('Select Date')."\n\n"; + $result .= "\n\n"; return $result; } @@ -519,6 +548,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; +} + ############################################## ############################################## @@ -709,13 +759,14 @@ sub Create_PrgWin { $prog_state{'type'}=$type; if ($type eq 'popup') { $prog_state{'window'}='popwin'; + my $html=&Apache::lonxml::xmlbegin(); #the whole function called through timeout is due to issues #in mozilla Read BUG #2665 if you want to know the whole story &r_print($r,' +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 { @@ -897,14 +984,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']); @@ -918,7 +1005,7 @@ sub disablelink { if (defined($#fields)) { unless ($#fields>=0) { return ''; } } - return ''.&mt('Disable WYSIWYG Editor').''; + return ''.&mt('Disable WYSIWYG Editor').''; } sub enablelink { @@ -926,7 +1013,7 @@ sub enablelink { if (defined($#fields)) { unless ($#fields>=0) { return ''; } } - return ''.&mt('Enable WYSIWYG Editor').''; + return ''.&mt('Enable WYSIWYG Editor').''; } # ----------------------------------------- Script to activate only some fields @@ -1005,8 +1092,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(); @@ -1068,11 +1155,9 @@ returns: nothing # if ($bug ne '') { # $icons .= &Apache::loncommon::help_open_bug($bug); # } - if (defined($component_help)) { - $icons .= - &Apache::loncommon::help_open_topic($component_help); - } - $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.' '; }