--- loncom/interface/lonhelper.pm 2015/08/28 22:44:59 1.197
+++ loncom/interface/lonhelper.pm 2016/03/05 21:49:44 1.198
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.197 2015/08/28 22:44:59 raeburn Exp $
+# $Id: lonhelper.pm,v 1.198 2016/03/05 21:49:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3826,38 +3826,54 @@ sub render {
if ($vars->{GRANULARITY} eq 'whole_course') {
$resourceString .= '
'.&mt('for [_1]all resources in the course[_2]','','').'';
if ($vars->{TARGETS} eq 'course') {
- $level = 14; # general course, see lonparmset.pm perldoc
+ $level = 18; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {
- $level = 9;
+ $level = 12;
} elsif ($vars->{TARGETS} eq 'group') {
- $level = 6;
+ $level = 8;
} else {
- $level = 3;
+ $level = 4;
}
$affectedResourceId = "0.0";
$symb = 'a';
$paramlevel = 'general';
- } elsif ($vars->{GRANULARITY} eq 'map') {
+ } elsif (($vars->{GRANULARITY} eq 'map') || ($vars->{GRANULARITY} eq 'maprecurse')) {
my $navmap = Apache::lonnavmaps::navmap->new();
if (defined($navmap)) {
my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
my $title = $res->compTitle();
$symb = $res->symb();
- $resourceString .= ''.&mt('for the map named [_1]',"$title").'';
+ if ($vars->{GRANULARITY} eq 'map') {
+ $resourceString .= ''.&mt('for the map named [_1]',"$title").'';
+ } else {
+ $resourceString .= ''.&mt('for the map named [_1] (applies recursively to sub-folders)',"$title").'';
+ }
} else {
$resourceString .= ''.&mt('for the map ID [_1] (name unavailable)',''.$vars->{RESOURCE_ID}.'').'';
&Apache::lonnet::logthis('Retrieval of map title failed in lonhelper.pm - could not create navmap object for course.');
}
- if ($vars->{TARGETS} eq 'course') {
- $level = 13; # general course, see lonparmset.pm perldoc
- } elsif ($vars->{TARGETS} eq 'section') {
- $level = 8;
- } elsif ($vars->{TARGETS} eq 'group') {
- $level = 5;
- } else {
- $level = 2;
- }
+ if ($vars->{GRANULARITY} eq 'maprecurse') {
+ if ($vars->{TARGETS} eq 'course') {
+ $level = 17; # general course, see lonparmset.pm perldoc
+ } elsif ($vars->{TARGETS} eq 'section') {
+ $level = 11;
+ } elsif ($vars->{TARGETS} eq 'group') {
+ $level = 7;
+ } else {
+ $level = 3;
+ }
+ } else {
+ if ($vars->{TARGETS} eq 'course') {
+ $level = 16; # general course, see lonparmset.pm perldoc
+ } elsif ($vars->{TARGETS} eq 'section') {
+ $level = 10;
+ } elsif ($vars->{TARGETS} eq 'group') {
+ $level = 6;
+ } else {
+ $level = 2;
+ }
+ }
$affectedResourceId = $vars->{RESOURCE_ID};
$paramlevel = 'map';
} else {
@@ -3874,11 +3890,11 @@ sub render {
&Apache::lonnet::logthis('Retrieval of resource title failed in lonhelper.pm - could not create navmap object for course.');
}
if ($vars->{TARGETS} eq 'course') {
- $level = 10; # general course, see lonparmset.pm perldoc
+ $level = 13; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {
- $level = 7;
+ $level = 9;
} elsif ($vars->{TARGETS} eq 'group') {
- $level = 4;
+ $level = 5;
} else {
$level = 1;
}
@@ -3894,7 +3910,7 @@ sub render {
if ($vars->{GRANULARITY} eq 'resource') {
$result .= "&\"") . "' />\n";
- } elsif ($vars->{GRANULARITY} eq 'map') {
+ } elsif (($vars->{GRANULARITY} eq 'map') || ($vars->{GRANULARITY} eq 'maprecurse')) {
$result .= "\n";
}