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.369.2.79.2.1 and 1.369.2.79.2.5

version 1.369.2.79.2.1, 2020/01/19 00:54:47	version 1.369.2.79.2.5, 2021/03/07 00:33:00
Line 512 sub secondary_menu {	Line 512 sub secondary_menu {
}	}
}	}
if (@scndsub > 0) {	if (@scndsub > 0) {
$menu .= &create_submenu($link,$target,$title,\@scndsub,1);	$menu .= &create_submenu($link,$target,&mt($title),\@scndsub,1);
} elsif ($link ne '#') {	} elsif ($link ne '#') {
$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';	$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
}	}
Line 1019 if ($env{'browser.mobile'}) {	Line 1019 if ($env{'browser.mobile'}) {
}	}

unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio\|ext\.tool)(\?\|$)/) {	unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio\|ext\.tool)(\?\|$)/) {
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/\|default_\d+\.page$)})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata	s&6&3&catalog.png&$swtext{'catalog'}&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/\|default_\d+\.page$)}) \|\|
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {	($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource	s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
Line 1527 sub prepare_functions {	Line 1528 sub prepare_functions {
# Determine whether or not to display 'Edit' or 'View Source' 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 $blocked = &Apache::loncommon::blocking_status('about',$2,$1);
my $file=&Apache::lonnet::declutter($env{'request.filename'});	my $file=&Apache::lonnet::declutter($env{'request.filename'});
($cfile,$home,$switchserver,$forceedit,$forceview) =	($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,	&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);	&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
if (($cfile) && ($home ne '') && ($home ne 'no_host')) {	if (($cfile) && ($home ne '') && ($home ne 'no_host') && (!$blocked)) {
$editbutton = &get_editbutton($cfile,$home,$switchserver,	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);	$forceedit,$forceview,$forcereg);
}	}
Line 1611 sub prepare_functions {	Line 1613 sub prepare_functions {
if ((($cfile eq '') \|\| (!$editbutton)) &&	if ((($cfile eq '') \|\| (!$editbutton)) &&
($resurl =~ /$LONCAPA::assess_re/)) {	($resurl =~ /$LONCAPA::assess_re/)) {
my $showurl = &Apache::lonnet::clutter($resurl);	my $showurl = &Apache::lonnet::clutter($resurl);
	my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
	? "/$env{'request.course.sec'}"
	: '');
if ((&Apache::lonnet::allowed('cre','/')) &&	if ((&Apache::lonnet::allowed('cre','/')) &&
(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {	(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
} elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {	} elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) {
if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {	if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {
my $auname = $1;	my $auname = $1;
if (($env{'request.course.adhocsrcaccess'} ne '') &&	if (($env{'request.course.adhocsrcaccess'} ne '') &&
(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {	(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&	} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
(&Apache::lonnet::allowed('bre','/'))) {	(&Apache::lonnet::allowed('bre',$crs_sec))) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
}	}
}	}
Line 1641 sub prepare_functions {	Line 1646 sub prepare_functions {
if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {	if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
my ($sdom,$sname) = ($1,$2);	my ($sdom,$sname) = ($1,$2);
unless (&Apache::lonnet::is_course($sdom,$sname)) {	unless (&Apache::lonnet::is_course($sdom,$sname)) {
&switch('','',6,4,'mail-message-new-22x22.png','Message to user',	my $blocked = &Apache::loncommon::blocking_status('about',$sname,$sdom);
'',	unless ($blocked) {
"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",	&switch('','',6,4,'mail-message-new-22x22.png','Message to user',
'Send message to specific user','','',1);	'',
	"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",
	'Send message to specific user','','',1);
	}
}	}
my $hideprivileged = 1;	my $hideprivileged = 1;
if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,	if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,
Line 2216 sub done_button_js {	Line 2224 sub done_button_js {
key => 'Key:',	key => 'Key:',
nokey => 'A proctor key is required',	nokey => 'A proctor key is required',
);	);
	my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}));
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my ($missing,$tried) = (0,0);	my ($missing,$tried) = (0,0);
if (ref($navmap)) {	if (ref($navmap)) {
Line 2278 sub done_button_js {	Line 2287 sub done_button_js {
<form method="post" name="LCdoneButton" action="">	<form method="post" name="LCdoneButton" action="">
<input type="hidden" name="LC_interval_done" value="" />	<input type="hidden" name="LC_interval_done" value="" />
<input type="hidden" name="LC_interval_done_proctorpass" value="" />	<input type="hidden" name="LC_interval_done_proctorpass" value="" />
	<input type="hidden" name="symb" value="$shownsymb" />
<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>	<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
</form>	</form>

Line 2359 END	Line 2369 END

<form method="post" name="LCdoneButton" action="">	<form method="post" name="LCdoneButton" action="">
<input type="hidden" name="LC_interval_done" value="" />	<input type="hidden" name="LC_interval_done" value="" />
	<input type="hidden" name="symb" value="$shownsymb" />
<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>	<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
</form>	</form>

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

Removed from v.1.369.2.79.2.1
changed lines
	Added in v.1.369.2.79.2.5