loncom/interface/lonnavdisplay.pm - diff

Return to lonnavdisplay.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.22.4.10.2.4 and 1.22.4.11

version 1.22.4.10.2.4, 2024/08/20 00:05:44	version 1.22.4.11, 2024/07/02 02:17:56
Line 55 sub real_handler {	Line 55 sub real_handler {
}	}

# Check for critical messages and redirect if present.	# Check for critical messages and redirect if present.
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');	my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
if ($redirect) {	if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => $url);	$r->header_out(Location => $url);
Line 77 sub real_handler {	Line 77 sub real_handler {
$r->send_http_header;	$r->send_http_header;
$r->print(&Apache::loncommon::check_release_result(@reinit));	$r->print(&Apache::loncommon::check_release_result(@reinit));
return OK;	return OK;
}	} elsif ($result eq 'update') {
my ($cid,$cnum,$cdom);	my $cid = $env{'request.course.id'};
if ($result) {	my $cnum = $env{'course.'.$cid.'.num'};
$cid = $env{'request.course.id'};	my $cdom = $env{'course.'.$cid.'.domain'};
$cnum = $env{'course.'.$cid.'.num'};
$cdom = $env{'course.'.$cid.'.domain'};
}
if (($result eq 'main') \|\| ($result eq 'both')) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
&startpage($r);	&startpage($r);
Line 114 ENDCLOSE	Line 110 ENDCLOSE
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}
}	}
if (($result eq 'both') \|\| ($result eq 'supp')) {
my $possdel;
if ($result eq 'supp') {
$possdel = 1;
}
my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
unless ($refs_updated) {
&Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
}
}

# Create the nav map	# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 354 sub startContentScreen {	Line 340 sub startContentScreen {

$r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");	$r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>       '.&mt('Main Content').'       </b></a></li>'."\n");	$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>       '.&mt('Main Content').'       </b></a></li>'."\n");
my $supptab;	my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
if ($env{'request.role.adv'}) {	my ($suppcount,$errors);
$supptab = 1;	unless ($allowed) {
} else {
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);	($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
}	}
if ($supptab) {	if ($allowed \|\| $suppcount) {
$r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');	$r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
}	}
$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n");	$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n");

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

Removed from v.1.22.4.10.2.4
changed lines
	Added in v.1.22.4.11