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.3 and 1.43

version 1.22.4.10.2.3, 2023/01/20 23:15:35	version 1.43, 2024/07/02 02:13:19
Line 39 use Apache::lonnet;	Line 39 use Apache::lonnet;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::londocs();	use Apache::londocs();
use Apache::lonuserstate;	use Apache::lonuserstate;
	use LONCAPA::ltiutils;

sub handler {	sub handler {
my $r = shift;	my $r = shift;
Line 54 sub real_handler {	Line 55 sub real_handler {
return OK;	return OK;
}	}

# 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,'contents');
if ($redirect) {	if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 84 sub real_handler {	Line 85 sub real_handler {
$cnum = $env{'course.'.$cid.'.num'};	$cnum = $env{'course.'.$cid.'.num'};
$cdom = $env{'course.'.$cid.'.domain'};	$cdom = $env{'course.'.$cid.'.domain'};
}	}
if (($result eq 'main') \|\| ($result eq 'both')) {	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 125 ENDCLOSE	Line 126 ENDCLOSE
}	}
}	}

	my $course_type = &Apache::loncommon::course_type();
	if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) {
	my $furl = &Apache::lonpageflip::first_accessible_resource();
	if ($result eq 'update') {
	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
	$r->print($closure.&Apache::loncommon::end_page());
	return OK;
	} else {
	unless ($furl eq '/adm/navmaps') {
	&Apache::loncommon::content_type($r,'text/html');
	$r->header_out(Location => $furl);
	return REDIRECT;
	}
	}
	}

	if ($env{'request.lti.login'}) {
	if ($env{'request.lti.uri'} ne '') {
	my $cid = $env{'request.course.id'};
	my $cnum = $env{'course.'.$cid.'.num'};
	my $cdom = $env{'course.'.$cid.'.domain'};
	my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
	if (($scope eq 'map') \|\| ($scope eq 'resource')) {
	&Apache::loncommon::content_type($r,'text/html');
	$r->header_out(Location => $url);
	return REDIRECT;
	}
	}
	}

# Create the nav map	# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();

Line 151 ENDCLOSE	Line 182 ENDCLOSE
&startpage($r);	&startpage($r);
}	}

&startContentScreen($r,'navmaps');	&startContentScreen($r,'navmaps',$course_type);
unless ($result eq 'update') {	unless ($result eq 'update') {
$r->rflush();	$r->rflush();
}	}
Line 340 sub startpage {	Line 371 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 351 sub startpage {	Line 381 sub startpage {
}	}

sub startContentScreen {	sub startContentScreen {
my ($r,$mode)=@_;	my ($r,$mode,$course_type)=@_;

$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");
Line 366 sub startContentScreen {	Line 396 sub startContentScreen {
if ($supptab) {	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");	unless ($course_type eq 'Placement') {
	$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 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>      '.&mt('Content Index').'      </b></a></li>'."\n");
	}
$r->print("\n".'</ul>'."\n");	$r->print("\n".'</ul>'."\n");
$r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');	$r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
}	}

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

Removed from v.1.22.4.10.2.3
changed lines
	Added in v.1.43