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.2.1 and 1.35

version 1.22.4.9.2.1, 2020/05/25 16:12:12	version 1.35, 2017/11/16 13:41:56
Line 54 sub real_handler {	Line 54 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 111 ENDCLOSE	Line 111 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 {
	&Apache::loncommon::content_type($r,'text/html');
	$r->header_out(Location => $furl);
	return REDIRECT;
	}
	}

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

Line 228 ENDCLOSE	Line 242 ENDCLOSE
."</span>");	."</span>");
}	}
} else {	} else {
my $link = '/adm/navmaps?jumpToFirstHomework';	my $link = 'navmaps?jumpToFirstHomework';
if ($env{'form.register'}) {	if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};	$link .= '&register='.$env{'form.register'};
}	}
Line 251 ENDCLOSE	Line 265 ENDCLOSE
$filterFunc = sub { my $res = shift;	$filterFunc = sub { my $res = shift;
return $res->completable() \|\| $res->is_map();	return $res->completable() \|\| $res->is_map();
};	};
my $link = '/adm/navmaps?sort='.$env{'form.sort'};	my $link = 'navmaps?sort='.$env{'form.sort'};
if ($env{'form.register'}) {	if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};	$link .= '&register='.$env{'form.register'};
}	}
Line 263 ENDCLOSE	Line 277 ENDCLOSE
$env{'form.condition'} = 1;	$env{'form.condition'} = 1;
$resource_no_folder_link = 1;	$resource_no_folder_link = 1;
} else {	} else {
my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1';	my $link = 'navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1';
if ($env{'form.register'}) {	if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};	$link .= '&register='.$env{'form.register'};
}	}
Line 368 sub startContentScreen {	Line 382 sub startContentScreen {
$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.2.1
changed lines
	Added in v.1.35