--- loncom/interface/lonnavdisplay.pm 2024/07/02 02:17:56 1.22.4.11
+++ loncom/interface/lonnavdisplay.pm 2013/08/07 00:03:25 1.23
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
-# Navigate Maps Display Handler
+# Navigate Maps Handler
#
-# $Id: lonnavdisplay.pm,v 1.22.4.11 2024/07/02 02:17:56 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.23 2013/08/07 00:03:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,7 @@
package Apache::lonnavdisplay;
use strict;
-use Apache::Constants qw(:common :http REDIRECT);
+use Apache::Constants qw(:common :http);
use Apache::lonmenu();
use Apache::loncommon();
use Apache::lonnavmaps();
@@ -38,7 +38,7 @@ use Apache::lonhtmlcommon();
use Apache::lonnet;
use Apache::lonlocal;
use Apache::londocs();
-use Apache::lonuserstate;
+use Time::HiRes qw( gettimeofday tv_interval );
sub handler {
my $r = shift;
@@ -47,100 +47,62 @@ sub handler {
sub real_handler {
my $r = shift;
+ #my $t0=[&gettimeofday()];
# Handle header-only request
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;
return OK;
}
- # Check for critical messages and redirect if present.
- my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
- if ($redirect) {
+ # Send header, don't cache this page
+ if ($env{'browser.mathml'}) {
+ &Apache::loncommon::content_type($r,'text/xml');
+ } else {
&Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location => $url);
- return REDIRECT;
}
+ &Apache::loncommon::no_cache($r);
-# ------------------------------------------------------------ Get query string
- &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;
- } elsif ($result eq 'update') {
- my $cid = $env{'request.course.id'};
- my $cnum = $env{'course.'.$cid.'.num'};
- my $cdom = $env{'course.'.$cid.'.domain'};
- &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;
- }
- }
+ my %toplinkitems=();
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();
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;
$env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
$env{'user.reinit'} = 1;
return HTTP_NOT_ACCEPTABLE;
}
+ $r->send_http_header;
- if ($result eq 'update') {
- $r->rflush();
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->print($closure);
- $r->rflush();
+# ------------------------------------------------------------ Get query string
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
+
+# ----------------------------------------------------- Force menu registration
+ # 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 {
- # Send header, don't cache this page
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- &startpage($r);
+ my $brcrum = [{href => '/adm/navmaps',
+ 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.
+ '<script type="text/javascript">window.focus();</script>');
&startContentScreen($r,'navmaps');
- unless ($result eq 'update') {
- $r->rflush();
- }
+ $r->rflush();
# Check that it's defined
if (!($navmap->courseMapDefined())) {
@@ -151,7 +113,6 @@ ENDCLOSE
return OK;
}
- my %toplinkitems=();
my @resources = $navmap->retrieveResources();
my $sequenceCount = 0;
my $problemCount = 0;
@@ -228,7 +189,10 @@ ENDCLOSE
."</span>");
}
} else {
- my $link = '/adm/navmaps?jumpToFirstHomework';
+ my $link = 'navmaps?jumpToFirstHomework';
+ if ($env{'form.register'}) {
+ $link .= '&register='.$env{'form.register'};
+ }
unless ($notools) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
'location.href="'.$link.'"',
@@ -248,7 +212,10 @@ ENDCLOSE
$filterFunc = sub { my $res = shift;
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',
'location.href="'.$link.'"',
'Show everything');
@@ -257,7 +224,10 @@ ENDCLOSE
$env{'form.condition'} = 1;
$resource_no_folder_link = 1;
} 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) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
'location.href="'.$link.'"',
@@ -276,9 +246,10 @@ ENDCLOSE
<select name="sort" onchange="document.sortForm.submit()">
<option value="default"'.$selected{'default'}.'>'.&mt('Default').'</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>
</select>
+ <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
</span>
</form>');
}
@@ -308,6 +279,8 @@ ENDCLOSE
$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);
$r->print(&Apache::loncommon::end_page());
$r->rflush();
@@ -315,26 +288,6 @@ ENDCLOSE
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};
- $r->print(&Apache::loncommon::start_page($title,undef,$args).
- '<script type="text/javascript">'."\n".
- '// <![CDATA['."\n".
- 'window.focus();'."\n".
- '// ]]>'."\n".
- '</script>');
- return;
-}
-
sub startContentScreen {
my ($r,$mode)=@_;
@@ -344,13 +297,14 @@ sub startContentScreen {
my ($suppcount,$errors);
unless ($allowed) {
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);
}
- if ($allowed || $suppcount) {
+ 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 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b> '.&mt('Content Index').' </b></a></li>'."\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;">');
}