--- loncom/interface/lonnavdisplay.pm 2021/02/18 14:48:02 1.38
+++ loncom/interface/lonnavdisplay.pm 2025/02/26 19:50:21 1.46
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Display Handler
#
-# $Id: lonnavdisplay.pm,v 1.38 2021/02/18 14:48:02 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.46 2025/02/26 19:50:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,7 +66,7 @@ sub real_handler {
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
'showOnlyHomework',
- 'postsymb','register']);
+ 'postsymb']);
# Check if course needs to be re-initialized
my $loncaparev = $r->dir_config('lonVersion');
my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
@@ -78,10 +78,14 @@ sub real_handler {
$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'};
+ }
+ 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);
@@ -111,18 +115,30 @@ ENDCLOSE
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);
+ }
+ }
my $course_type = &Apache::loncommon::course_type();
if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) {
my $furl = &Apache::lonpageflip::first_accessible_resource();
- if ($result eq 'update') {
+ if (($result eq 'main') || ($result eq 'both')) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure.&Apache::loncommon::end_page());
return OK;
} else {
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location => $furl);
- return REDIRECT;
+ unless ($furl eq '/adm/navmaps') {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $furl);
+ return REDIRECT;
+ }
}
}
@@ -144,7 +160,7 @@ ENDCLOSE
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
- if ($result eq 'update') {
+ if (($result eq 'main') || ($result eq 'both')) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure.&Apache::loncommon::end_page());
}
@@ -154,7 +170,7 @@ ENDCLOSE
return HTTP_NOT_ACCEPTABLE;
}
- if ($result eq 'update') {
+ if (($result eq 'main') || ($result eq 'both')) {
$r->rflush();
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure);
@@ -166,8 +182,8 @@ ENDCLOSE
&startpage($r);
}
- &startContentScreen($r,'navmaps');
- unless ($result eq 'update') {
+ &startContentScreen($r,'navmaps',$course_type);
+ unless (($result eq 'main') || ($result eq 'both')) {
$r->rflush();
}
@@ -258,9 +274,6 @@ ENDCLOSE
}
} else {
my $link = '/adm/navmaps?jumpToFirstHomework';
- if ($env{'form.register'}) {
- $link .= '&register='.$env{'form.register'};
- }
unless ($notools) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
'location.href="'.$link.'"',
@@ -281,9 +294,6 @@ ENDCLOSE
return $res->completable() || $res->is_map();
};
my $link = '/adm/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');
@@ -293,9 +303,6 @@ ENDCLOSE
$resource_no_folder_link = 1;
} else {
my $link = '/adm/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.'"',
@@ -310,14 +317,14 @@ ENDCLOSE
'<form name="sortForm" action="">
<span class="LC_nobreak">
<input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
- '.&mt('Sort by:').'
- <select name="sort" onchange="document.sortForm.submit()">
+ <label for="LC_navmap_sort">'.&mt('Sort by:').'</label>
+ <select name="sort" id="LC_navmap_sort">
<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="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
</select>
- <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
+ <input type="submit" value="'.&mt('Go').'" />
</span>
</form>');
}
@@ -360,19 +367,12 @@ sub startpage {
# 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 {
- 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.
+ 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".
@@ -382,29 +382,33 @@ sub startpage {
}
sub startContentScreen {
- my ($r,$mode)=@_;
+ my ($r,$mode,$course_type)=@_;
- $r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
+ $r->print("\n".'<div class="LC_landmark" role="main">'.
+ '<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");
- my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- my ($suppcount,$errors);
- unless ($allowed) {
+ my $supptab;
+ if ($env{'request.role.adv'}) {
+ $supptab = 1;
+ } else {
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);
+ $supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
}
- if ($allowed || $suppcount) {
+ if ($supptab) {
$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");
+ unless ($course_type eq 'Placement') {
+ $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;">');
}
sub endContentScreen {
my ($r)=@_;
- $r->print('</div></div></div>');
+ $r->print('</div></div></div></div>');
}
1;