--- loncom/interface/lonhtmlcommon.pm 2004/03/03 22:55:35 1.59
+++ loncom/interface/lonhtmlcommon.pm 2004/04/07 22:33:00 1.63
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.59 2004/03/03 22:55:35 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.63 2004/04/07 22:33:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -814,8 +814,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)) {
@@ -838,9 +841,12 @@ sub crumbs {
# ------------------------------------------------- Output headers for HTMLArea
sub htmlareaheaders {
- unless (&htmlareabrowser()) { return ''; }
+ unless (&htmlareablocked()) { return ''; }
my $lang='en';
return (<
+ _editor_url="/htmlarea/";
+
@@ -853,7 +859,7 @@ ENDHEADERS
# ---------------------------------------------------------- Script to activate
sub htmlareaactive {
- unless (&htmlareabrowser()) { return ''; }
+ unless (&htmlareablocked()) { return ''; }
return (<
HTMLArea.replaceAll();
@@ -861,6 +867,13 @@ sub htmlareaactive {
ENDSCRIPT
}
+# --------------------------------------------------------------------- Blocked
+
+sub htmlareablocked {
+ unless (&htmlareabrowser()) { return ''; }
+ return 1;
+}
+
# ---------------------------------------- Browser capable of running HTMLArea?
sub htmlareabrowser {
@@ -886,6 +899,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.
@@ -911,7 +927,8 @@ 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();
@@ -928,11 +945,12 @@ returns: nothing
# Make the faq and bug data cascade
my $faq = '';
my $bug = '';
- # The last breadcrumb does not have a link, so handle it seperately.
+ # 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'})) {
+ if (!defined($menulink)) { $menulink=1; }
+ if ($menulink && exists($ENV{'request.course.id'})) {
my $cid = $ENV{'request.course.id'};
unshift(@Crumbs,{
href=>'/adm/menu',