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 and 1.22.4.6

version 1.22, 2012/01/02 23:10:58	version 1.22.4.6, 2015/03/11 15:43:40
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# Navigate Maps Handler	# Navigate Maps Display Handler
#	#
# $Id$	# $Id$
#	#
Line 30	Line 30
package Apache::lonnavdisplay;	package Apache::lonnavdisplay;

use strict;	use strict;
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http REDIRECT);
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 Time::HiRes qw( gettimeofday tv_interval );

sub handler {	sub handler {
my $r = shift;	my $r = shift;
Line 47 sub handler {	Line 46 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) {
if ($env{'browser.mathml'}) {	&Apache::loncommon::content_type($r,'text/html');
&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;
}	}

# Send header, don't cache this page	# Check for critical messages and redirect if present.
if ($env{'browser.mathml'}) {	my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
&Apache::loncommon::content_type($r,'text/xml');	if ($redirect) {
} 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);

my %toplinkitems=();	# Check if course needs to be re-initialized
	my $loncaparev = $r->dir_config('lonVersion');
	my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);

	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;
	} elsif ($result eq 'update') {
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
	if ($ferr) {
	my $requrl = $r->uri;
	$env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
	$env{'user.reinit'} = 1;
	return HTTP_NOT_ACCEPTABLE;
	}
	}

# Create the nav map	# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 78 sub real_handler {	Line 91 sub real_handler {
$env{'user.reinit'} = 1;	$env{'user.reinit'} = 1;
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}

	# Send header, don't cache this page
	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

# ------------------------------------------------------------ Get query string	# ------------------------------------------------------------ Get query string
Line 113 sub real_handler {	Line 129 sub real_handler {
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 246 sub real_handler {	Line 263 sub real_handler {
<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('Duedate').'</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'}.'" />	<input type="hidden" name="register" value="'.$env{'form.register'}.'" />
Line 279 sub real_handler {	Line 296 sub real_handler {
$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 293 sub startContentScreen {	Line 308 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");
$r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');	my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
	my ($suppcount,$errors);
	unless ($allowed) {
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
	}
	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 '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
changed lines
	Added in v.1.22.4.6