--- loncom/interface/lonhtmlcommon.pm 2004/06/05 14:46:12 1.75
+++ 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.75 2004/06/05 14:46:12 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,13 +864,14 @@ sub crumbs {
$output.=$uri;
}
unless ($uri=~/\/$/) { $output=~s/\/$//; }
- return $output.'
';
+ return $output.''.($noformat?'':'
');
}
# ------------------------------------------------- Output headers for HTMLArea
sub htmlareaheaders {
if (&htmlareablocked()) { return ''; }
+ unless (&htmlareabrowser()) { return ''; }
my $lang='en';
if (&mt('htmlarea_lang') ne 'htmlarea_lang') {
$lang=&mt('htmlarea_lang');
@@ -886,6 +889,7 @@ ENDHEADERS
sub htmlareaaddbuttons {
if (&htmlareablocked()) { return ''; }
+ unless (&htmlareabrowser()) { return ''; }
return (<
- $addbuttons
- HTMLArea.replaceAll(config);
-
-ENDSCRIPT
+# ----------------------------------------------------------------- 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 only some fields
sub htmlareaselectactive {
my @fields=@_;
- if (&htmlareablocked()) { return ''; }
+ unless (&htmlareabrowser()) { return ''; }
+ if (&htmlareablocked()) { return '
'.&enablelink(@fields); }
my $output='";
+ $output.="\nwindow.status='Activated Editfields';\n
".
+ &disablelink(@fields);
return $output;
}
# --------------------------------------------------------------------- Blocked
sub htmlareablocked {
- unless (&htmlareabrowser()) { return 1; }
+ unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
return 0;
}
@@ -1048,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.' ';
}