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.9 and 1.40

version 1.22.4.9, 2019/02/03 22:19:06	version 1.40, 2022/10/19 00:03:10
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);	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');
$r->header_out(Location => $url);	$r->header_out(Location => $url);
Line 65 sub real_handler {	Line 66 sub real_handler {
# ------------------------------------------------------------ Get query string	# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
'showOnlyHomework',	'showOnlyHomework',
'postsymb','register']);	'postsymb']);
# Check if course needs to be re-initialized	# Check if course needs to be re-initialized
my $loncaparev = $r->dir_config('lonVersion');	my $loncaparev = $r->dir_config('lonVersion');
my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);	my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
Line 77 sub real_handler {	Line 78 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);
my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.	my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
'<br />'.	'<br />'.
&mt('Your course session is being updated because of recent changes by course personnel.').	&mt('Your course session is being updated because of recent changes by course personnel.').
' '.&mt('Please be patient.').'<br /></div>'.	' '.&mt('Please be patient').'.<br /></div>'.
'<div style="padding:0;clear:both;margin:0;border:0"></div>';	'<div style="padding:0;clear:both;margin:0;border:0"></div>';
$closure = <<ENDCLOSE;	$closure = <<ENDCLOSE;
<script type="text/javascript">	<script type="text/javascript">
Line 100 ENDCLOSE	Line 105 ENDCLOSE
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
$r->rflush();	$r->rflush();
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);	my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
if ($ferr) {	if ($ferr) {
&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 110 ENDCLOSE	Line 115 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::lonnet::get_supplemental($cnum,$cdom,'',$possdel);
	unless ($refs_updated) {
	&Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
	}
	}

	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 {
	&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 229 ENDCLOSE	Line 272 ENDCLOSE
}	}
} else {	} else {
my $link = '/adm/navmaps?jumpToFirstHomework';	my $link = '/adm/navmaps?jumpToFirstHomework';
if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};
}
unless ($notools) {	unless ($notools) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
'location.href="'.$link.'"',	'location.href="'.$link.'"',
Line 252 ENDCLOSE	Line 292 ENDCLOSE
return $res->completable() \|\| $res->is_map();	return $res->completable() \|\| $res->is_map();
};	};
my $link = '/adm/navmaps?sort='.$env{'form.sort'};	my $link = '/adm/navmaps?sort='.$env{'form.sort'};
if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};
}
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
'location.href="'.$link.'"',	'location.href="'.$link.'"',
'Show everything');	'Show everything');
Line 264 ENDCLOSE	Line 301 ENDCLOSE
$resource_no_folder_link = 1;	$resource_no_folder_link = 1;
} else {	} else {
my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1';	my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1';
if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};
}
unless ($notools) {	unless ($notools) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
'location.href="'.$link.'"',	'location.href="'.$link.'"',
Line 288 ENDCLOSE	Line 322 ENDCLOSE
<option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>	<option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>
<option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>	<option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
</select>	</select>
<input type="hidden" name="register" value="'.$env{'form.register'}.'" />
</span>	</span>
</form>');	</form>');
}	}
Line 331 sub startpage {	Line 364 sub startpage {
# Header	# Header
my $course_type = &Apache::loncommon::course_type();	my $course_type = &Apache::loncommon::course_type();
my $title = $course_type . ' Contents';	my $title = $course_type . ' Contents';
my ($start_page,$args);	my $brcrum = [{href => '/adm/navmaps',
if ($env{'form.register'}) {	text => &mt($course_type . ' Contents'),
$args = {'force_register' => $env{'form.register'}};	no_mt => 1},
$start_page = &Apache::loncommon::start_page($title,undef,$args);	];
} else {	my $args = {'bread_crumbs' => $brcrum};
my $brcrum = [{href => '/adm/navmaps',	my $start_page = &Apache::loncommon::start_page($title,undef,$args);
text => &mt($course_type . ' Contents'),
no_mt => 1},
];
$args = {'bread_crumbs' => $brcrum};
$start_page = &Apache::loncommon::start_page($title,undef,$args);
}
$r->print($start_page.	$r->print($start_page.
'<script type="text/javascript">'."\n".	'<script type="text/javascript">'."\n".
'// <![CDATA['."\n".	'// <![CDATA['."\n".
Line 357 sub startContentScreen {	Line 384 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");
	$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.9
changed lines
	Added in v.1.40