--- loncom/interface/lonhtmlcommon.pm 2004/06/08 01:32:02 1.76 +++ loncom/interface/lonhtmlcommon.pm 2004/07/03 18:49:42 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.76 2004/06/08 01:32:02 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.79 2004/07/03 18:49:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -841,11 +841,13 @@ sub r_print { # ------------------------------------------------------- Puts directory header sub crumbs { - my ($uri,$target,$prefix,$form,$size)=@_; + my ($uri,$target,$prefix,$form,$size,$noformat)=@_; if (! defined($size)) { $size = '+2'; } - my $output='
'.$prefix.'/'; + my $output=''; + unless ($noformat) { $output.='
'; } + $output.=''.$prefix.'/'; if ($ENV{'user.adv'}) { my $path=$prefix.'/'; foreach (split('/',$uri)) { @@ -862,7 +864,7 @@ sub crumbs { $output.=$uri; } unless ($uri=~/\/$/) { $output=~s/\/$//; } - return $output.'
'; + return $output.'
'.($noformat?'':'

'); } # ------------------------------------------------- Output headers for HTMLArea @@ -910,42 +912,34 @@ ENDADDBUTTON # ----------------------------------------------------------------- Preferences sub disablelink { + my @fields=@_; + if (defined($#fields)) { + unless ($#fields>=0) { return ''; } + } return ''.&mt('Disable WYSIWYG Editor').''; } sub enablelink { + my @fields=@_; + if (defined($#fields)) { + unless ($#fields>=0) { return ''; } + } return ''.&mt('Enable WYSIWYG Editor').''; } -# ---------------------------------------------------------- Script to activate - -sub htmlareaactive { - unless (&htmlareabrowser()) { return ''; } - if (&htmlareablocked()) { return '
'.&enablelink(); } - my $addbuttons=&htmlareaaddbuttons(); - my $disable=&disablelink(); - return (< - $addbuttons - HTMLArea.replaceAll(config); -
-$disable -ENDSCRIPT -} - # ----------------------------------------- Script to activate only some fields sub htmlareaselectactive { my @fields=@_; unless (&htmlareabrowser()) { return ''; } - if (&htmlareablocked()) { return '
'.&enablelink(); } + if (&htmlareablocked()) { return '
'.&enablelink(@fields); } my $output='
". - &disablelink(); + &disablelink(@fields); return $output; } @@ -1066,12 +1060,13 @@ returns: nothing my $icons = ''; $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 ($bug ne '') { - $icons .= &Apache::loncommon::help_open_bug($bug); - } +# if ($faq ne '') { +# $icons .= &Apache::loncommon::help_open_faq($faq); +# } +# if ($bug ne '') { +# $icons .= &Apache::loncommon::help_open_bug($bug); +# } + $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug); if ($icons ne '') { $Str .= $icons.' '; }