--- loncom/interface/lonhtmlcommon.pm 2016/10/31 19:49:00 1.376
+++ loncom/interface/lonhtmlcommon.pm 2017/01/28 02:31:51 1.379
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.376 2016/10/31 19:49:00 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.379 2017/01/28 02:31:51 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -407,7 +407,7 @@ sub textbox {
##############################################
##############################################
sub checkbox {
- my ($name,$checked,$value) = @_;
+ my ($name,$checked,$value,$special) = @_;
my $Str = '';
return $Str;
}
@@ -1198,7 +1198,7 @@ sub Close_PrgWin {
sub crumbs {
my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_;
# You cannot crumbnify uploaded or adm resources
- if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Group Content)'); }
+ if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Community Content)'); }
if ($target) {
$target = ' target="'.
&Apache::loncommon::escape_single($target).'"';
@@ -1218,6 +1218,12 @@ sub crumbs {
} else {
$path.='/';
}
+ if ($path eq '/res/') {
+ unless (&Apache::lonnet::allowed('bre',$path)) {
+ $output.="$dir/";
+ next;
+ }
+ }
my $href_path = &HTML::Entities::encode($path,'<>&"');
&Apache::loncommon::inhibit_menu_check(\$href_path);
if ($form) {
@@ -1886,11 +1892,6 @@ returns: nothing
#
# The first one should be the course or a menu link
if (!defined($menulink)) { $menulink=1; }
- if ((($crstype eq 'Placement') || (($env{'request.course.id'}) &&
- ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement'))) &&
- (!$env{'request.role.adv'})) {
- undef($menulink);
- }
if ($menulink) {
my $description = 'Menu';
my $no_mt_descr = 0;