loncom/interface/lonmenu.pm - diff

Return to lonmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmenu.pm between versions 1.472 and 1.491

version 1.472, 2017/05/08 14:20:20	version 1.491, 2018/05/08 20:30:12
Line 99 It gets filled in the BEGIN block of thi	Line 99 It gets filled in the BEGIN block of thi

=over	=over

=item prep_menuitems(\@menuitem)	=item prep_menuitems(\@menuitem,$ltitarget)

This routine wraps a menuitem in proper HTML. It is used by primary_menu() and	This routine wraps a menuitem in proper HTML. It is used by primary_menu() and
secondary_menu().	secondary_menu().
Line 210 use Apache::lonenc();	Line 210 use Apache::lonenc();
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonmsg();	use Apache::lonmsg();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
	use LONCAPA::ltiutils;
use HTML::Entities();	use HTML::Entities();
use Apache::lonwishlist();	use Apache::lonwishlist();

use vars qw(@desklines %category_names %category_members %category_positions	use vars qw(@desklines %category_names %category_members %category_positions
$readdesk @primary_menu %primary_submenu @secondary_menu);	$readdesk @primary_menu %primary_submenu @secondary_menu %secondary_submenu);

my @inlineremote;	my @inlineremote;

sub prep_menuitem {	sub prep_menuitem {
my ($menuitem) = @_;	my ($menuitem,$ltitarget) = @_;
return '' unless(ref($menuitem) eq 'ARRAY');	return '' unless(ref($menuitem) eq 'ARRAY');
my $link;	my $link;
if ($$menuitem[1]) { # graphical Link	if ($$menuitem[1]) { # graphical Link
Line 229 sub prep_menuitem {	Line 230 sub prep_menuitem {
} else { # textual Link	} else { # textual Link
$link = &mt($$menuitem[3]);	$link = &mt($$menuitem[3]);
}	}
	my $target = ' target="_top"';
	if ($ltitarget eq 'iframe') {
	$target ='';
	}
return '<li><a'	return '<li><a'
# highlighting for new messages	# highlighting for new messages
. ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '')	. ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '')
. qq\| href="$$menuitem[0]" target="_top">$link</a></li>\|;	. qq\| href="$$menuitem[0]"$target>$link</a></li>\|;
}	}

# primary_menu() evaluates @primary_menu and returns a two item array,	# primary_menu() evaluates @primary_menu and returns a two item array,
Line 242 sub prep_menuitem {	Line 247 sub prep_menuitem {
# @primary_menu is filled within the BEGIN block of this module with	# @primary_menu is filled within the BEGIN block of this module with
# entries from mydesk.tab	# entries from mydesk.tab
sub primary_menu {	sub primary_menu {
my ($crstype) = @_;	my ($crstype,$ltimenu) = @_;
my (%menu);	my (%menu,%ltiexc);
# each element of @primary contains following array:	# each element of @primary contains following array:
# (link url, icon path, alt text, link text, condition, position)	# (link url, icon path, alt text, link text, condition, position)
my $public;	my $public;
Line 260 sub primary_menu {	Line 265 sub primary_menu {
my %roles_in_env;	my %roles_in_env;
$rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);	$rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);
}	}
	my ($lti,$ltitarget);
	if ($env{'request.lti.login'}) {
	$lti = 1;
	$ltitarget = $env{'request.lti.target'};
	if (ref($ltimenu) eq 'HASH') {
	foreach my $item ('fullname','logout') {
	unless ($ltimenu->{$item}) {
	$ltiexc{$item} = 1;
	}
	}
	}
	}
foreach my $menuitem (@primary_menu) {	foreach my $menuitem (@primary_menu) {
# evaluate conditions	# evaluate conditions
next if ref($menuitem) ne 'ARRAY'; #	next if ref($menuitem) ne 'ARRAY'; #
Line 274 sub primary_menu {	Line 291 sub primary_menu {
&& !$public; # only visible to public	&& !$public; # only visible to public
# users	# users
next if $$menuitem[4] eq 'roles' ##show links depending on	next if $$menuitem[4] eq 'roles' ##show links depending on
&& &Apache::loncommon::show_course(); ##term 'Courses' or	&& (&Apache::loncommon::show_course() ##term 'Courses' or
next if $$menuitem[4] eq 'courses' ##'Roles' wanted	\|\| $env{'request.lti.login'}); ##'Roles' wanted
&& !&Apache::loncommon::show_course(); ##	next if $$menuitem[4] eq 'courses' ##and not LTI access
	&& (!&Apache::loncommon::show_course()
	\|\| !$env{'request.lti.login'});
	next if $$menuitem[4] eq 'notlti'
	&& $lti;
	next if $$menuitem[4] eq 'ltiexc'
	&& exists($ltiexc{lc($menuitem->[3])});
my $title = $menuitem->[3];	my $title = $menuitem->[3];
if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {	if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
if ($menuitem->[4] eq 'courses') {	if ($menuitem->[4] eq 'courses') {
Line 293 sub primary_menu {	Line 316 sub primary_menu {
my ($link,$target);	my ($link,$target);
if ($menuitem->[0] ne '') {	if ($menuitem->[0] ne '') {
$link = $menuitem->[0];	$link = $menuitem->[0];
$target = '_top';	unless ($ltitarget eq 'iframe') {
	$target = '_top';
	}
} else {	} else {
$link = '#';	$link = '#';
}	}
Line 309 sub primary_menu {	Line 334 sub primary_menu {
push(@primsub,$item);	push(@primsub,$item);
}	}
if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {	if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});	unless ($ltiexc{'fullname'}) {
	$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
	}
} else {	} else {
$title = &mt($title);	$title = &mt($title);
}	}
Line 328 sub primary_menu {	Line 355 sub primary_menu {
'helpdeskmail',	'helpdeskmail',
$defdom,$origmail);	$defdom,$origmail);
if ($to ne '') {	if ($to ne '') {
$menu{$position} .= &prep_menuitem($menuitem);	$menu{$position} .= &prep_menuitem($menuitem,$ltitarget);
}	}
} else {	} else {
$menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';	$menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
}	}
} else {	} else {
$menu{$position} .= prep_menuitem($menuitem);	$menu{$position} .= prep_menuitem($menuitem,$ltitarget);
}	}
}	}
my @output = ('','');	my @output = ('','');
Line 373 sub getauthor{	Line 400 sub getauthor{
}	}

sub secondary_menu {	sub secondary_menu {
my ($httphost) = @_;	my ($httphost,$ltiscope,$ltimenu,$noprimary) = @_;
my $menu;	my $menu;

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
Line 394 sub secondary_menu {	Line 421 sub secondary_menu {
my $canmodpara = &Apache::lonnet::allowed('opa', $crs_sec);	my $canmodpara = &Apache::lonnet::allowed('opa', $crs_sec);
my $canvgr = &Apache::lonnet::allowed('vgr', $crs_sec);	my $canvgr = &Apache::lonnet::allowed('vgr', $crs_sec);
my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);	my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);
	my $canplc = &Apache::lonnet::allowed('plc', $crs_sec);
my $author = &getauthor();	my $author = &getauthor();

my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools);	my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,$lti,$ltimapres,%ltiexc);
$grouptools = 0;	$grouptools = 0;
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if ($canedit \|\| $canvieweditor) {	unless ($canedit \|\| $canvieweditor) {
$showsyllabus = 1;
$showfeeds = 1;
} else {
unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {	unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) \|\|	if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) \|\|
($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) \|\|	($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) \|\|
Line 434 sub secondary_menu {	Line 459 sub secondary_menu {
}	}
}	}
}	}
	if ($env{'request.lti.login'}) {
	$lti = 1;
	if (ref($ltimenu) eq 'HASH') {
	foreach my $item ('fullname','coursetitle','role','logout','grades') {
	unless ($ltimenu->{$item}) {
	$ltiexc{$item} = 1;
	}
	}
	}
	if (($ltiscope eq 'map') \|\| ($ltiscope eq 'resource')) {
	$ltimapres = 1;
	}
	}
}	}

my ($canmodifycoauthor);	my ($canmodifycoauthor);
Line 444 sub secondary_menu {	Line 482 sub secondary_menu {
$canmodifycoauthor = 1;	$canmodifycoauthor = 1;
}	}
}	}
my ($roleswitcher_js,$roleswitcher_form);
	my ($roleswitcher_js,$roleswitcher_form,$ltitarget);
	if ($env{'request.lti.login'}) {
	$ltitarget = $env{'request.lti.target'};
	}

foreach my $menuitem (@secondary_menu) {	foreach my $menuitem (@secondary_menu) {
# evaluate conditions	# evaluate conditions
Line 456 sub secondary_menu {	Line 498 sub secondary_menu {
next if $$menuitem[4] =~ /^crsedit/	next if $$menuitem[4] =~ /^crsedit/
&& (!$canedit && !$canvieweditor);	&& (!$canedit && !$canvieweditor);
next if $$menuitem[4] eq 'nvgr'	next if $$menuitem[4] eq 'nvgr'
&& $canvgr;	&& ($canvgr \|\| $ltiexc{'grades'});
next if $$menuitem[4] eq 'vgr'	next if $$menuitem[4] eq 'vgr'
&& !$canvgr;	&& !$canvgr;
next if $$menuitem[4] eq 'viewusers'	next if $$menuitem[4] eq 'viewusers'
Line 471 sub secondary_menu {	Line 513 sub secondary_menu {
&& !$canviewwnew;	&& !$canviewwnew;
next if $$menuitem[4] eq 'params'	next if $$menuitem[4] eq 'params'
&& (!$canmodpara && !$canviewpara);	&& (!$canmodpara && !$canviewpara);
next if $$menuitem[4] =~ /showgroups$/	next if $$menuitem[4] eq 'showgroups'
&& !$canviewgrps	&& ($canviewgrps \|\| !$grouptools);
&& !$grouptools;
next if $$menuitem[4] eq 'showsyllabus'	next if $$menuitem[4] eq 'showsyllabus'
&& !$showsyllabus;	&& !$showsyllabus;
next if $$menuitem[4] eq 'showfeeds'	next if $$menuitem[4] eq 'showfeeds'
&& !$showfeeds;	&& !$showfeeds;
	next if $$menuitem[4] eq 'plc'
	&& !$canplc;
next if $$menuitem[4] eq 'author'	next if $$menuitem[4] eq 'author'
&& !$author;	&& !$author;
next if $$menuitem[4] eq 'cca'	next if $$menuitem[4] eq 'cca'
&& !$canmodifycoauthor;	&& !$canmodifycoauthor;
	next if $$menuitem[4] eq 'notltimapres'
	&& $ltimapres;
	next if $$menuitem[4] eq 'notlti'
	&& $lti;
	next if $$menuitem[4] eq 'lti'
	&& (!$lti \|\| !$noprimary);
	next if $$menuitem[3] eq 'Logout'
	&& $ltiexc{'logout'};

if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {	my $title = $menuitem->[3];
	if (defined($secondary_submenu{$title})) {
	my ($link,$target);
	if ($menuitem->[0] ne '') {
	$link = $menuitem->[0];
	unless ($ltitarget eq 'iframe') {
	$target = '_top';
	}
	} else {
	$link = '#';
	}
	my @scndsub;
	if (ref($secondary_submenu{$title}) eq 'ARRAY') {
	foreach my $item (@{$secondary_submenu{$title}}) {
	if (ref($item) eq 'ARRAY') {
	next if ($item->[2] eq 'vgr' && !$canvgr);
	next if ($item->[2] eq 'opa' && !$canmodpara);
	next if ($item->[2] eq 'vpa' && !$canviewpara);
	next if ($item->[2] eq 'viewusers' && !($canmodifyuser \|\| $canviewusers));
	next if ($item->[2] eq 'mgr' && !$canmgr);
	next if ($item->[2] eq 'vcg' && !$canviewgrps);
	next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor);
	next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara);
	next if ($item->[2] eq 'author' && !$author);
	next if ($item->[2] eq 'cca' && !$canmodifycoauthor);
	next if ($item->[2] eq 'lti' && !$lti);
	if ($item->[2] =~ /^lti(portfolio\|wishlist\|blog)$/) {
	my $tool = $1;
	next if !$lti;
	next if (!&Apache::lonnet::usertools_access('','',$tool,
	undef,'tools'));
	}
	push(@scndsub,$item);
	}
	}
	if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
	unless ($ltiexc{'fullname'}) {
	$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
	}
	}
	if (@scndsub > 0) {
	$menu .= &create_submenu($link,$target,$title,\@scndsub,1);
	} elsif ($link ne '#') {
	$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
	}
	}
	} elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
# special treatment for role selector	# special treatment for role selector
($roleswitcher_js,$roleswitcher_form,my $switcher) =	($roleswitcher_js,$roleswitcher_form,my $switcher) =
&roles_selector(	&roles_selector(
$env{'course.' . $env{'request.course.id'} . '.domain'},	$env{'course.' . $env{'request.course.id'} . '.domain'},
$env{'course.' . $env{'request.course.id'} . '.num'},	$env{'course.' . $env{'request.course.id'} . '.num'},
$httphost	$httphost,$ltitarget
);	);
$menu .= $switcher;	$menu .= $switcher;
	} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
	next if ($crstype eq 'Placement');
	$menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
} else {	} else {
if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {	if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
my $url = $$menuitem[0];	my $url = $$menuitem[0];
Line 513 sub secondary_menu {	Line 613 sub secondary_menu {
}	}
}	}
}	}
	$$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"');
}	}
$menu .= &prep_menuitem(\@$menuitem);	$menu .= &prep_menuitem(\@$menuitem,$ltitarget);
}	}
}	}
if ($menu =~ /\[url\].*\[symb\]/) {	if ($menu =~ /\[url\].*\[symb\]/) {
Line 531 sub secondary_menu {	Line 632 sub secondary_menu {
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{};	($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{};
$escurl = &escape($escurl);	$escurl = &escape($escurl);
}	}
$menu =~ s/\[url\]/$escurl/g;	$menu =~ s/\[url\]/$escurl/g;
$menu =~ s/\[symb\]/$escsymb/g;	$menu =~ s/\[symb\]/$escsymb/g;
}	}
$menu =~ s/\[uname\]/$$author{user}/g;	$menu =~ s/\[uname\]/$$author{user}/g;
$menu =~ s/\[udom\]/$$author{dom}/g;	$menu =~ s/\[udom\]/$$author{dom}/g;
if ($showsyllabus \|\| $showfeeds) {	$menu =~ s/\[javascript\]/javascript:/g;
	if ($env{'request.course.id'}) {
$menu =~ s/\[cnum\]/$cnum/g;	$menu =~ s/\[cnum\]/$cnum/g;
$menu =~ s/\[cdom\]/$cdom/g;	$menu =~ s/\[cdom\]/$cdom/g;
}	}
Line 620 sub build_submenu {	Line 722 sub build_submenu {
next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));	next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
$href =~ s/\[domain\]/$env{'user.domain'}/g;	$href =~ s/\[domain\]/$env{'user.domain'}/g;
$href =~ s/\[user\]/$env{'user.name'}/g;	$href =~ s/\[user\]/$env{'user.name'}/g;
	} elsif (($href =~ m{^/adm/preferences\?}) && ($href =~ /\[returnurl\]/)) {
	my $returnurl = $ENV{'REQUEST_URI'};
	if ($ENV{'REQUEST_URI'} =~ m{/adm/preferences\?action=(?:changedomcoord\|authorsettings)\&returnurl=([^\&]+)$}) {
	$returnurl = $1;
	}
	if (($returnurl =~ m{^/adm/createuser($\|\?action=)}) \|\|
	($returnurl =~ m{^/priv/$match_domain/$match_username}) \|\|
	($returnurl =~ m{^/res(/?$\|/$match_domain/$match_username)})) {
	$returnurl =~ s{\?.*$}{};
	$returnurl = '&returnurl='.&HTML::Entities::encode($returnurl,'"<>&\'');
	} else {
	undef($returnurl);
	}
	$href =~ s/\[returnurl\]/$returnurl/;
}	}
unless (($href eq '') \|\| ($href =~ /^\#/)) {	unless (($href eq '') \|\| ($href =~ /^\#/)) {
$target = ' target="_top"';	if ($target eq '_top') {
	$target = ' target="_top"';
	}
}	}

$menu .= '<li style="margin:0;padding:0;'. $bordertop . $borderbot .'">';	$menu .= '<li style="margin:0;padding:0;'. $bordertop . $borderbot .'">';
Line 635 sub build_submenu {	Line 753 sub build_submenu {
}	}

sub innerregister {	sub innerregister {
my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname) = @_;	my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,$ltiscope,$ltiuri) = @_;
my $const_space = ($env{'request.state'} eq 'construct');	my $const_space = ($env{'request.state'} eq 'construct');
my $is_const_dir = 0;	my $is_const_dir = 0;

Line 645 sub innerregister {	Line 763 sub innerregister {

undef(@inlineremote);	undef(@inlineremote);

my ($mapurl,$resurl,$crstype);	my ($mapurl,$resurl,$crstype,$navmap);

if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
#	#
Line 653 sub innerregister {	Line 771 sub innerregister {
#	#
$crstype = &Apache::loncommon::course_type();	$crstype = &Apache::loncommon::course_type();
if ($env{'request.symb'}) {	if ($env{'request.symb'}) {
($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());	my $ignorenull;
	unless ($env{'request.noversionuri'} eq '/adm/navmaps') {
	$ignorenull = 1;
	}
	my $symb = &Apache::lonnet::symbread('','',$ignorenull);
	($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb($symb);
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};	my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};

my $maptitle = &Apache::lonnet::gettitle($mapurl);	my $maptitle = &Apache::lonnet::gettitle($mapurl);
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());	my $restitle = &Apache::lonnet::gettitle($symb);
my @crumbs;	my (@crumbs,@mapcrumbs);
	if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') &&
	(!(($crstype eq 'Placement') && !$env{'request.role.adv'}))) {
	unless ($ltiscope eq 'resource') {
	if (($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) &&
	!(($ltiscope eq 'map') && (&Apache::lonnet::clutter($resurl) eq $ltiuri))) {
	$navmap = Apache::lonnavmaps::navmap->new();
	if (ref($navmap)) {
	@mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
	}
	}
	}
	}
unless (($forcereg) &&	unless (($forcereg) &&
($env{'request.noversionuri'} eq '/adm/navmaps') &&	($env{'request.noversionuri'} eq '/adm/navmaps') &&
($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) \|\|	($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) \|\|
(($crstype eq 'Placement') && (!$env{'request.role.adv'}))) {	(($crstype eq 'Placement') && (!$env{'request.role.adv'})) \|\|
	($ltiscope eq 'map') \|\| ($ltiscope eq 'resource')) {
@crumbs = ({text => $crstype.' Contents',	@crumbs = ({text => $crstype.' Contents',
href => "Javascript:gopost('/adm/navmaps','')"});	href => "Javascript:gopost('/adm/navmaps','')"});
}	}
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {	if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
push(@crumbs, {text => '...',	if (@mapcrumbs) {
no_mt => 1});	push(@crumbs,@mapcrumbs);
	} elsif (!(($crstype eq 'Placement') && (!$env{'request.role.adv'})) &&
	($ltiscope ne 'map') && ($ltiscope ne 'resource')) {
	push(@crumbs, {text => '...',
	no_mt => 1});
	}
}	}

unless (($crstype eq 'Placement') \|\| (!$env{'request.role.adv'})) {	unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) \|\| (@mapcrumbs) \|\|
push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle	(!$maptitle) \|\| ($maptitle eq 'default.sequence') \|\|
&& $maptitle ne 'default.sequence'	($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) \|\|
&& $maptitle ne $coursetitle);	($ltiscope eq 'resource')) {
	push @crumbs, {text => $maptitle, no_mt => 1,
	href => &Apache::lonnet::clutter($mapurl).'?navmap=1'};
	}
	if ($restitle && !@mapcrumbs) {
	push(@crumbs,{text => $restitle, no_mt => 1});
}	}

push @crumbs, {text => $restitle, no_mt => 1} if $restitle;
my @tools;	my @tools;
if ($env{'request.filename'} =~ /\.page$/) {	if ($env{'request.filename'} =~ /\.page$/) {
my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();	my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
Line 759 sub innerregister {	Line 903 sub innerregister {
$perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});	$perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
$perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});	$perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});
my @privs;	my @privs;
	my $gradable_exttool;
if ($env{'request.symb'} ne '') {	if ($env{'request.symb'} ne '') {
if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {	if ($env{'request.noversionuri'} =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
	if (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i) {
	$gradable_exttool = 1;
	push(@privs,('mgr','vgr'));
	}
	} elsif ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
push(@privs,('mgr','vgr'));	push(@privs,('mgr','vgr'));
}	}
push(@privs,('opa','vpa'));	push(@privs,('opa','vpa'));
Line 775 sub innerregister {	Line 925 sub innerregister {
#	#
# Determine whether or not to show Grades and Submissions buttons	# Determine whether or not to show Grades and Submissions buttons
#	#
if ($env{'request.symb'} ne '' &&	if (($env{'request.symb'} ne '') &&
$env{'request.filename'}=~/$LONCAPA::assess_re/) {	(($env{'request.filename'}=~/$LONCAPA::assess_re/) \|\| ($gradable_exttool))) {
if ($perms{'mgr'}) {	if ($perms{'mgr'}) {
&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',	&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
"gocmd('/adm/grades','gradingmenu')",	"gocmd('/adm/grades','gradingmenu')",
Line 860 ENDMENUITEMS	Line 1010 ENDMENUITEMS
# Should probably be in mydesk.tab	# Should probably be in mydesk.tab
#	#
$menuitems = "c&3&1";	$menuitems = "c&3&1";
if (($crstype ne 'Placement') \|\| ($env{'request.role.adv'})) {	if ($ltiscope eq 'resource') {
	# Suppress display of backward arrow for LTI Provider if scope is resource.
	# Suppress display of forward arrow for LTI Provider if scope is resource.
	} elsif ($ltiscope eq 'map') {
	# Suppress display of backward arrow for LTI Provider if scope is map and this is first resource.
	# Suppress display of forward arrow for LTI Provider if scope is map and this is the last resource.
	my $showforw = 1;
	my $showback = 1;
	my $navmap = Apache::lonnavmaps::navmap->new();
	if (ref($navmap)) {
	my $mapres = $navmap->getResourceByUrl($ltiuri);
	if (ref($mapres)) {
	if ($navmap->isLastResource($mapres,$env{'request.symb'})) {
	$showforw = 0;
	}
	if ($navmap->isFirstResource($mapres,$env{'request.symb'})) {
	$showback = 0;
	}
	}
	}
	if ($showback) {
	$menuitems.="
	s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1";
	}
	if ($showforw) {
	$menuitems.="
	s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
	}
	} elsif (($crstype ne 'Placement') \|\| ($env{'request.role.adv'})) {
$menuitems.="	$menuitems.="
s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1	s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";	s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
Line 918 if ($env{'browser.mobile'}) {	Line 1096 if ($env{'browser.mobile'}) {
$is_mobile = 1;	$is_mobile = 1;
}	}

unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio\|ext\.tool)(\?\|$)/) {	unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio)(\?\|$)/) {
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {	if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/}) && ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata	s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata
ENDREALRES	ENDREALRES
}	}
unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) \|\|	unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) \|\|
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {	($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/}) \|\|
	($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource	s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
ENDREALRES	ENDREALRES
Line 1096 sub prepare_functions {	Line 1275 sub prepare_functions {
}	}

my $editbutton = '';	my $editbutton = '';
	my $viewsrcbutton = '';
#	#
# Determine whether or not to display 'Edit' icon/button	# Determine whether or not to display 'Edit' or 'View Source' icon/button
#	#
if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {	if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
my $file=&Apache::lonnet::declutter($env{'request.filename'});	my $file=&Apache::lonnet::declutter($env{'request.filename'});
Line 1129 sub prepare_functions {	Line 1309 sub prepare_functions {
#	#
if (($perms{'mdc'}) &&	if (($perms{'mdc'}) &&
(($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) \|\|	(($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) \|\|
($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}))) {	($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) \|\|
	(($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) {
if ($resurl =~ m{^/}) {	if ($resurl =~ m{^/}) {
$cfile = $resurl;	$cfile = $resurl;
} else {	} else {
Line 1141 sub prepare_functions {	Line 1322 sub prepare_functions {
} else {	} else {
$forceedit = 1;	$forceedit = 1;
}	}
$editbutton = &get_editbutton($cfile,$home,$switchserver,	if ($cfile =~ m{^/uploaded/$cdom/$cnum/default_\d+\.sequence$}) {
$forceedit,$forceview,$forcereg,	my $text = 'Edit Folder';
$hostname);	&switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
	"gocmd('/adm/coursedocs','direct')",
	'Folder/Page Content');
	$editbutton = 1;
	} else {
	$editbutton = &get_editbutton($cfile,$home,$switchserver,
	$forceedit,$forceview,$forcereg,
	$hostname);
	}
} elsif (($resurl eq '/adm/extresedit') &&	} elsif (($resurl eq '/adm/extresedit') &&
(($env{'form.symb'}) \|\| ($env{'form.folderpath'}))) {	(($env{'form.symb'}) \|\| ($env{'form.folderpath'}))) {
($cfile,$home,$switchserver,$forceedit,$forceview) =	($cfile,$home,$switchserver,$forceedit,$forceview) =
Line 1172 sub prepare_functions {	Line 1361 sub prepare_functions {
$forceedit,$forceview,$forcereg,	$forceedit,$forceview,$forcereg,
$hostname);	$hostname);
}	}
	if ((($cfile eq '') \|\| (!$editbutton)) &&
	($resurl =~ /$LONCAPA::assess_re/)) {
	my $showurl = &Apache::lonnet::clutter($resurl);
	if ((&Apache::lonnet::allowed('cre','/')) &&
	(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {
	$viewsrcbutton = 1;
	} elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {
	if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {
	my $auname = $1;
	if (($env{'request.course.adhocsrcaccess'} ne '') &&
	(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
	$viewsrcbutton = 1;
	} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
	(&Apache::lonnet::allowed('bre','/'))) {
	$viewsrcbutton = 1;
	}
	}
	}
	if ($viewsrcbutton) {
	&switch('','',6,1,'pcstr.png','View Source','resource[_2]','open_source()',
	'View source code');
	}
	}
}	}
}	}
}	}
Line 1249 sub prepare_functions {	Line 1461 sub prepare_functions {
&advtools_crumbs(@inlineremote);	&advtools_crumbs(@inlineremote);
return $editbutton;	return $editbutton;
} elsif ($env{'request.registered'}) {	} elsif ($env{'request.registered'}) {
return $editbutton;	return $editbutton \|\| $viewsrcbutton;
} else {	} else {
if (ref($bread_crumbs) eq 'ARRAY') {	if (ref($bread_crumbs) eq 'ARRAY') {
if (@inlineremote > 0) {	if (@inlineremote > 0) {
Line 1907 sub utilityfunctions {	Line 2119 sub utilityfunctions {

my $countdown = &countdown_toggle_js();	my $countdown = &countdown_toggle_js();

	my $ltitarget;
	if ($env{'request.lti.login'}) {
	$ltitarget = $env{'request.lti.target'};
	}

my $hostvar = '	my $hostvar = '
function setLCHost() {	function setLCHost() {
var lcHostname="";	var lcHostname="";
Line 2003 function golist(url) {	Line 2220 function golist(url) {
currentURL = null;	currentURL = null;
currentSymb= null;	currentSymb= null;
var lcHostname = setLCHost();	var lcHostname = setLCHost();
top.location.href=lcHostname+url;	var ltitarget = '$ltitarget';
	if (ltitarget == 'iframe') {
	document.location.href=lcHostname+url;
	} else {
	top.location.href=lcHostname+url;
	}
}	}
}	}

Line 2056 function open_StoredLinks_Import(rat) {	Line 2278 function open_StoredLinks_Import(rat) {
newWin.focus();	newWin.focus();
}	}

	function open_source() {
	var url = escape(window.location.pathname);
	sourcewin=window.open('/adm/source?inhibitmenu=yes&viewonly=1&filename='+url,'LONsource',
	'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes');
	}

	function open_aboutLC() {
	var isMobile = "$env{'browser.mobile'}";
	var url = '/adm/about.html';
	if (isMobile == 1) {
	openMyModal(url,600,400,'yes');
	} else {
	window.open(url,"aboutLONCAPA","height=400,width=600,scrollbars=1,resizable=1,menubar=0,location=1");
	}
	return;
	}


(function (\$) {	(function (\$) {
\$(document).ready(function () {	\$(document).ready(function () {
\$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));	\$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
Line 2076 ENDUTILITY	Line 2316 ENDUTILITY
}	}

sub serverform {	sub serverform {
	my $target;
	unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
	$target = ' target="_top"';
	}
return(<<ENDSERVERFORM);	return(<<ENDSERVERFORM);
<form name="server" action="/adm/logout" method="post" target="_top">	<form name="server" action="/adm/logout" method="post"$target>
<input type="hidden" name="postdata" value="none" />	<input type="hidden" name="postdata" value="none" />
<input type="hidden" name="command" value="none" />	<input type="hidden" name="command" value="none" />
<input type="hidden" name="url" value="none" />	<input type="hidden" name="url" value="none" />
Line 2087 ENDSERVERFORM	Line 2331 ENDSERVERFORM
}	}

sub constspaceform {	sub constspaceform {
	my ($target,$printtarget);
	unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
	$target = ' target="_top"';
	$printtarget = ' target="_parent"';
	}
return(<<ENDCONSTSPACEFORM);	return(<<ENDCONSTSPACEFORM);
<form name="constspace" action="/adm/logout" method="post" target="_top">	<form name="constspace" action="/adm/logout" method="post"$target>
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
</form>	</form>
<form name="cstrdelete" action="/adm/cfile" method="post" target="_top">	<form name="cstrdelete" action="/adm/cfile" method="post"$target>
<input type="hidden" name="action" value="delete" />	<input type="hidden" name="action" value="delete" />
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
</form>	</form>
<form name="cstrprint" action="/adm/printout" target="_parent" method="post">	<form name="cstrprint" action="/adm/printout" method="post"$printtarget>
<input type="hidden" name="postdata" value="" />	<input type="hidden" name="postdata" value="" />
<input type="hidden" name="curseed" value="" />	<input type="hidden" name="curseed" value="" />
<input type="hidden" name="problemtype" value="" />	<input type="hidden" name="problemtype" value="" />
Line 2115 sub hidden_button_check {	Line 2364 sub hidden_button_check {
}	}

sub roles_selector {	sub roles_selector {
my ($cdom,$cnum,$httphost) = @_;	my ($cdom,$cnum,$httphost,$ltitarget) = @_;
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $now = time;	my $now = time;
my (%courseroles,%seccount,%courseprivs,%roledesc);	my (%courseroles,%seccount,%courseprivs,%roledesc);
Line 2277 sub roles_selector {	Line 2526 sub roles_selector {
}	}
}	}
if (@submenu > 0) {	if (@submenu > 0) {
$switcher = &create_submenu('','',&mt('Switch role'),\@submenu);	$switcher = &create_submenu('','',&mt('Switch role'),\@submenu,'','',$ltitarget);
}	}
}	}
return ($js,$form,$switcher);	return ($js,$form,$switcher);
Line 2615 sub required_privs {	Line 2864 sub required_privs {

sub countdown_timer {	sub countdown_timer {
if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&	if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&
($env{'request.filename'}=~/$LONCAPA::assess_re/)) {	(($env{'request.filename'}=~/$LONCAPA::assess_re/) \|\|
	(($env{'request.symb'} =~ /ext\.tool$/) &&
	(&Apache::lonnet::EXT('resource.0.gradable',$env{'request.symb'}) =~ /^yes$/i)))) {
my ($type,$hastimeleft,$slothastime);	my ($type,$hastimeleft,$slothastime);
my $now = time;	my $now = time;
if ($env{'request.filename'} =~ /\.task$/) {	if ($env{'request.filename'} =~ /\.task$/) {
$type = 'Task';	$type = 'Task';
	} elsif ($env{'request.symb'} =~ /ext\.tool$/) {
	$type = 'tool';
} else {	} else {
$type = 'problem';	$type = 'problem';
}	}
my ($status,$accessmsg,$slot_name,$slot) =	my ($status,$accessmsg,$slot_name,$slot);
&Apache::lonhomework::check_slot_access('0',$type);	if ($type eq 'tool') {
	($status,$accessmsg,$slot_name,$slot) =
	&Apache::lonhomework::check_slot_access('0',$type,$env{'request.symb'},['0']);
	} else {
	($status,$accessmsg,$slot_name,$slot) =
	&Apache::lonhomework::check_slot_access('0',$type);
	}
if ($slot_name ne '') {	if ($slot_name ne '') {
if (ref($slot) eq 'HASH') {	if (ref($slot) eq 'HASH') {
if (($slot->{'starttime'} < $now) &&	if (($slot->{'starttime'} < $now) &&
Line 2726 BEGIN {	Line 2985 BEGIN {
} elsif ($configline=~/^scnd\:/) {	} elsif ($configline=~/^scnd\:/) {
my @entries = (split(/\:/, $configline))[1..5];	my @entries = (split(/\:/, $configline))[1..5];
push(@secondary_menu,\@entries);	push(@secondary_menu,\@entries);
	} elsif ($configline=~/^scndsub\:/) {
	my ($parent,@entries) = (split(/\:/, $configline))[1..4];
	push(@{$secondary_submenu{$parent}},\@entries);
} elsif ($configline) {	} elsif ($configline) {
push(@desklines,$configline);	push(@desklines,$configline);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.472
changed lines
	Added in v.1.491