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.23

version 1.22.4.10.2.3, 2023/01/20 23:15:35	version 1.23, 2013/08/07 00:03:25
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# Navigate Maps Display Handler	# Navigate Maps Handler
#	#
# $Id$	# $Id$
#	#
Line 30	Line 30
package Apache::lonnavdisplay;	package Apache::lonnavdisplay;

use strict;	use strict;
use Apache::Constants qw(:common :http REDIRECT);	use Apache::Constants qw(:common :http);
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonnavmaps();	use Apache::lonnavmaps();
Line 38 use Apache::lonhtmlcommon();	Line 38 use Apache::lonhtmlcommon();
use Apache::lonnet;	use Apache::lonnet;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::londocs();	use Apache::londocs();
use Apache::lonuserstate;	use Time::HiRes qw( gettimeofday tv_interval );

sub handler {	sub handler {
my $r = shift;	my $r = shift;
Line 47 sub handler {	Line 47 sub handler {

sub real_handler {	sub real_handler {
my $r = shift;	my $r = shift;
	#my $t0=[&gettimeofday()];
# Handle header-only request	# Handle header-only request
if ($r->header_only) {	if ($r->header_only) {
&Apache::loncommon::content_type($r,'text/html');	if ($env{'browser.mathml'}) {
	&Apache::loncommon::content_type($r,'text/xml');
	} else {
	&Apache::loncommon::content_type($r,'text/html');
	}
$r->send_http_header;	$r->send_http_header;
return OK;	return OK;
}	}

# Check for critical messages and redirect if present.	# Send header, don't cache this page
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');	if ($env{'browser.mathml'}) {
if ($redirect) {	&Apache::loncommon::content_type($r,'text/xml');
	} else {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => $url);
return REDIRECT;
}	}
	&Apache::loncommon::no_cache($r);

# ------------------------------------------------------------ Get query string	my %toplinkitems=();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
'showOnlyHomework',
'postsymb']);
# Check if course needs to be re-initialized
my $loncaparev = $r->dir_config('lonVersion');
my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
my %prog_state=();
my $closure;

if ($result eq 'switch') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print(&Apache::loncommon::check_release_result(@reinit));
return OK;
}
my ($cid,$cnum,$cdom);
if ($result) {
$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');
$r->send_http_header;
&startpage($r);
my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
'<br />'.
&mt('Your course session is being updated because of recent changes by course personnel.').
' '.&mt('Please be patient').'.<br /></div>'.
'<div style="padding:0;clear:both;margin:0;border:0"></div>';
$closure = <<ENDCLOSE;
<script type="text/javascript">
// <![CDATA[
\$("#LC_update_$cid").hide('slow');
// ]]>
</script>
ENDCLOSE
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
$r->rflush();
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
if ($ferr) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure.&Apache::loncommon::end_page());
my $requrl = $r->uri;
$env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
$env{'user.reinit'} = 1;
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') {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure.&Apache::loncommon::end_page());
}
my $requrl = $r->uri;	my $requrl = $r->uri;
$env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";	$env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
$env{'user.reinit'} = 1;	$env{'user.reinit'} = 1;
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}
	$r->send_http_header;

if ($result eq 'update') {	# ------------------------------------------------------------ Get query string
$r->rflush();	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure);	# ----------------------------------------------------- Force menu registration
$r->rflush();	# Header
	my $course_type = &Apache::loncommon::course_type();
	my $title = $course_type . ' Contents';
	my ($start_page,$args);
	if ($env{'form.register'}) {
	$args = {'force_register' => $env{'form.register'}};
	$start_page = &Apache::loncommon::start_page($title,undef,$args);
} else {	} else {
# Send header, don't cache this page	my $brcrum = [{href => '/adm/navmaps',
&Apache::loncommon::content_type($r,'text/html');	text => &mt($course_type . ' Contents'),
$r->send_http_header;	no_mt => 1},
&startpage($r);	];
	$args = {'bread_crumbs' => $brcrum};
	$start_page = &Apache::loncommon::start_page($title,undef,$args);
}	}
	$r->print($start_page.
	'<script type="text/javascript">window.focus();</script>');
&startContentScreen($r,'navmaps');	&startContentScreen($r,'navmaps');
unless ($result eq 'update') {	$r->rflush();
$r->rflush();
}

# Check that it's defined	# Check that it's defined
if (!($navmap->courseMapDefined())) {	if (!($navmap->courseMapDefined())) {
Line 165 ENDCLOSE	Line 113 ENDCLOSE
return OK;	return OK;
}	}

my %toplinkitems=();
my @resources = $navmap->retrieveResources();	my @resources = $navmap->retrieveResources();
my $sequenceCount = 0;	my $sequenceCount = 0;
my $problemCount = 0;	my $problemCount = 0;
Line 242 ENDCLOSE	Line 189 ENDCLOSE
."</span>");	."</span>");
}	}
} else {	} else {
my $link = '/adm/navmaps?jumpToFirstHomework';	my $link = '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 262 ENDCLOSE	Line 212 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'}) {
	$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 271 ENDCLOSE	Line 224 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'}) {
	$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 290 ENDCLOSE	Line 246 ENDCLOSE
<select name="sort" onchange="document.sortForm.submit()">	<select name="sort" onchange="document.sortForm.submit()">
<option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>	<option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>
<option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>	<option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>
<option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>	<option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</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 322 ENDCLOSE	Line 279 ENDCLOSE
$r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");	$r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");
}	}
}	}
	#my $td=&tv_interval($t0);
	#$r->print("<br />$td");
&endContentScreen($r);	&endContentScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
$r->rflush();	$r->rflush();
Line 329 ENDCLOSE	Line 288 ENDCLOSE
return OK;	return OK;
}	}

sub startpage {
my ($r) = @_;
# ----------------------------------------------------- Force menu registration
# Header
my $course_type = &Apache::loncommon::course_type();
my $title = $course_type . ' Contents';
my $brcrum = [{href => '/adm/navmaps',
text => &mt($course_type . ' Contents'),
no_mt => 1},
];
my $args = {'bread_crumbs' => $brcrum};
my $start_page = &Apache::loncommon::start_page($title,undef,$args);
$r->print($start_page.
'<script type="text/javascript">'."\n".
'// <![CDATA['."\n".
'window.focus();'."\n".
'// ]]>'."\n".
'</script>');
return;
}

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

$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");
	$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.23