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.5 and 1.29

version 1.22.4.5, 2014/05/22 12:25:32	version 1.29, 2015/03/01 20:42:08
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'}) {	if ($env{'browser.mathml'}) {
Line 59 sub real_handler {	Line 57 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);
if ($redirect) {	if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 67 sub real_handler {	Line 65 sub real_handler {
return REDIRECT;	return REDIRECT;
}	}



# Send header, don't cache this page	# Send header, don't cache this page
if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($r,'text/xml');	&Apache::loncommon::content_type($r,'text/xml');
Line 108 sub real_handler {	Line 108 sub real_handler {
$start_page = &Apache::loncommon::start_page($title,undef,$args);	$start_page = &Apache::loncommon::start_page($title,undef,$args);
}	}
$r->print($start_page.	$r->print($start_page.
'<script type="text/javascript">window.focus();</script>');	'<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
	'window.focus();'."\n".
	'// ]]>'."\n".
	'</script>');
&startContentScreen($r,'navmaps');	&startContentScreen($r,'navmaps');
$r->rflush();	$r->rflush();

Line 287 sub real_handler {	Line 291 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 312 sub startContentScreen {	Line 314 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.5
changed lines
	Added in v.1.29