--- loncom/interface/lonhtmlcommon.pm 2009/11/18 11:18:23 1.244
+++ loncom/interface/lonhtmlcommon.pm 2009/11/23 14:04:37 1.248
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.244 2009/11/18 11:18:23 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.248 2009/11/23 14:04:37 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,6 +62,16 @@ use Apache::lonlocal;
use Apache::lonnet;
use LONCAPA;
+
+sub coursepreflink {
+ my ($text,$category)=@_;
+ if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+ return ''.$text.'';
+ } else {
+ return '';
+ }
+}
+
##############################################
##############################################
@@ -111,7 +121,7 @@ sub dragmath_button {
}
my $buttontext=&mt('Edit Math');
return <$help_text
+ $help_text
ENDDRAGMATH
}
@@ -1473,6 +1483,10 @@ returns: nothing
push @{$tools{$category}}, $html;
}
+ sub clear_breadcrumb_tools {
+ undef(%tools);
+ }
+
sub add_tools {
my ($links) = @_;
return unless defined %tools;
@@ -1867,22 +1881,21 @@ sub course_custom_roles {
# topic_bar
#
-# Generates a div containing an (optional) numbered (static) image followed by a
+# Generates a div containing an (optional) number with a white background followed by a
# title with a background color defined in the corresponding CSS: LC_topic_bar
# Inputs:
-# 1. number to display (corresponding static image should exist).
-# img tag will be included if arg is an integer in the range 1 to 9.
+# 1. number to display.
+# If input for number is empty only the title will be displayed.
# 2. title text to display.
# Outputs - a scalar containing html mark-up for the div.
sub topic_bar {
- my ($imgnum,$title) = @_;
- my $imgtag;
- if ($imgnum =~ /^[1-9]$/) {
- $imgtag = ' ';
+ my ($num,$title) = @_;
+ my $number = '';
+ if ($num ne '') {
+ $number = ''.$num.'';
}
- return '
'.$imgtag.$title.'
';
+ return '
'.$number.$title.'
';
}
##############################################
@@ -2401,8 +2414,7 @@ Returns: HTML code with function list en
##############################################
sub end_funclist {
- my($r)=@_;
- return "\n\n";
+ return "\n";
}
1;