print(<<"ENDSUBM");
-
+ $html
@@ -188,19 +213,20 @@ ENDSUBM
if (!defined($navmap)) {
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";
return HTTP_NOT_ACCEPTABLE;
}
-
- $r->print("\n");
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print("$html\n");
$r->print("".&mt('Navigate Course Contents')."");
# ------------------------------------------------------------ Get query string
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
# ----------------------------------------------------- Force menu registration
my $addentries='';
my $more_unload;
- if ($ENV{'environment.remotenavmap'} eq 'on') {
+ my $body_only='';
+ if ($env{'environment.remotenavmap'} eq 'on') {
$r->print('');
# FIXME need to be smarter to only catch window close events
# $more_unload="collapse()"
+ $body_only=1;
}
- if ($ENV{'form.register'}) {
+ if ($env{'form.register'}) {
$addentries=' onLoad="'.&Apache::lonmenu::loadevents().
'" onUnload="'.&Apache::lonmenu::unloadevents().';'.
$more_unload.'"';
@@ -221,14 +248,15 @@ ENDSUBM
# Header
$r->print(''.
&Apache::loncommon::bodytag('Navigate Course Contents','',
- $addentries,'','',$ENV{'form.register'}));
- $r->print(''.
- &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+ $addentries,$body_only,'',
+ $env{'form.register'}));
+ $r->print('');
$r->rflush();
# Check that it's defined
if (!($navmap->courseMapDefined())) {
+ $r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
$r->print('Coursemap undefined.' .
'');
return OK;
@@ -252,9 +280,9 @@ ENDSUBM
if ($sequenceCount == 1) {
# The automatic iterator creation in the render call
# will pick this up. We know the condition because
- # the defined($ENV{'form.filter'}) also ensures this
+ # the defined($env{'form.filter'}) also ensures this
# is a fresh call.
- $ENV{'form.filter'} = "$sequenceId";
+ $env{'form.filter'} = "$sequenceId";
}
}
@@ -269,19 +297,17 @@ ENDSUBM
');
}
- if ($ENV{'environment.remotenavmap'} ne 'on') {
- $r->print(&launch_win('link','yes'));
+ if ($env{'environment.remotenavmap'} ne 'on') {
+ $r->print(&launch_win('link','yes',\%toplinkitems));
}
- if ($ENV{'environment.remotenavmap'} eq 'on') {
-# $r->print("" .
- $r->print("" .
- &mt("Close external navmaps").
- " ");
+ if ($env{'environment.remotenavmap'} eq 'on') {
+ &add_linkitem(\%toplinkitems,'closenav','collapse()',
+ "Close navigation window");
}
my $jumpToFirstHomework = 0;
# Check to see if the student is jumping to next open, do-able problem
- if ($ENV{QUERY_STRING} eq 'jumpToFirstHomework') {
+ if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
$jumpToFirstHomework = 1;
# Find the next homework problem that they can do.
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -301,10 +327,10 @@ ENDSUBM
pop @$stack; # last resource in the stack is the problem
# itself, which we don't need in the map stack
my @mapPcs = map {$_->map_pc()} @$stack;
- $ENV{'form.filter'} = join(',', @mapPcs);
+ $env{'form.filter'} = join(',', @mapPcs);
# Mark as both "here" and "jump"
- $ENV{'form.postsymb'} = $curRes->symb();
+ $env{'form.postsymb'} = $curRes->symb();
}
}
}
@@ -314,8 +340,9 @@ ENDSUBM
$r->print("All homework assignments have been completed.
");
}
} else {
- $r->print("" .
- &mt("Go To My First Homework Problem")." ");
+ &add_linkitem(\%toplinkitems,'firsthomework',
+ 'location.href="navmaps?jumpToFirstHomework"',
+ "Show Me My First Homework Problem");
}
my $suppressEmptySequences = 0;
@@ -324,44 +351,53 @@ ENDSUBM
# Display only due homework.
my $showOnlyHomework = 0;
- if ($ENV{QUERY_STRING} eq 'showOnlyHomework') {
+ if ($env{'form.showOnlyHomework'} eq "1") {
$showOnlyHomework = 1;
$suppressEmptySequences = 1;
$filterFunc = sub { my $res = shift;
return $res->completable() || $res->is_map();
};
+ &add_linkitem(\%toplinkitems,'everything',
+ 'location.href="navmaps?sort='.$env{'form.sort'}.'"',
+ "Show Everything");
$r->print("".&mt("Uncompleted Homework")."
");
- $ENV{'form.filter'} = '';
- $ENV{'form.condition'} = 1;
+ $env{'form.filter'} = '';
+ $env{'form.condition'} = 1;
$resource_no_folder_link = 1;
} else {
- $r->print("" .
- &mt("Show Only Uncompleted Homework")." ");
+ &add_linkitem(\%toplinkitems,'uncompleted',
+ 'location.href="navmaps?sort='.$env{'form.sort'}.
+ '&showOnlyHomework=1"',
+ "Show Only Uncompleted Homework");
}
- $r->print("");
# renderer call
- my $renderArgs = { 'cols' => [0,2,3],
- 'sort' => $ENV{'form.sort'},
+ my $renderArgs = { 'cols' => [0,1,2,3],
+ 'sort' => $env{'form.sort'},
'url' => '/adm/navmaps',
'navmap' => $navmap,
'suppressNavmap' => 1,
'suppressEmptySequences' => $suppressEmptySequences,
'filterFunc' => $filterFunc,
'resource_no_folder_link' => $resource_no_folder_link,
- 'r' => $r};
+ 'sort_html'=> $sort_html,
+ 'r' => $r,
+ 'caller' => 'navmapsdisplay',
+ 'linkitems' => \%toplinkitems};
my $render = render($renderArgs);
- $navmap->untieHashes();
# If no resources were printed, print a reassuring message so the
# user knows there was no error.
@@ -372,6 +408,8 @@ ENDSUBM
$r->print("This course is empty.
");
}
}
+ #my $td=&tv_interval($t0);
+ #$r->print("
$td");
$r->print("