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.2 and 1.22.4.10.2.5

version 1.22.4.10.2.2, 2023/01/20 23:04:26	version 1.22.4.10.2.5, 2025/02/07 20:58:59
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 = $env{'request.course.id'};	my ($cid,$cnum,$cdom);
my $cnum = $env{'course.'.$cid.'.num'};	if ($result) {
my $cdom = $env{'course.'.$cid.'.domain'};	$cid = $env{'request.course.id'};
	$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 110 ENDCLOSE	Line 114 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();

if (!defined($navmap)) {	if (!defined($navmap)) {
if ($result eq 'update') {	if (($result eq 'main') \|\| ($result eq 'both')) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure.&Apache::loncommon::end_page());	$r->print($closure.&Apache::loncommon::end_page());
}	}
Line 125 ENDCLOSE	Line 139 ENDCLOSE
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}

if ($result eq 'update') {	if (($result eq 'main') \|\| ($result eq 'both')) {
$r->rflush();	$r->rflush();
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure);	$r->print($closure);
Line 138 ENDCLOSE	Line 152 ENDCLOSE
}	}

&startContentScreen($r,'navmaps');	&startContentScreen($r,'navmaps');
unless ($result eq 'update') {	unless (($result eq 'main') \|\| ($result eq 'both')) {
$r->rflush();	$r->rflush();
}	}

Line 326 sub startpage {	Line 340 sub startpage {
no_mt => 1},	no_mt => 1},
];	];
my $args = {'bread_crumbs' => $brcrum};	my $args = {'bread_crumbs' => $brcrum};
my $start_page = &Apache::loncommon::start_page($title,undef,$args);	$r->print(&Apache::loncommon::start_page($title,undef,$args).
$r->print($start_page.
'<script type="text/javascript">'."\n".	'<script type="text/javascript">'."\n".
'// <![CDATA['."\n".	'// <![CDATA['."\n".
'window.focus();'."\n".	'window.focus();'."\n".
Line 341 sub startContentScreen {	Line 354 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 $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});	my $supptab;
my ($suppcount,$errors);	if ($env{'request.role.adv'}) {
unless ($allowed) {	$supptab = 1;
	} 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'};
($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);	$supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
}	}
if ($allowed \|\| $suppcount) {	if ($supptab) {
$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.2
changed lines
	Added in v.1.22.4.10.2.5