--- loncom/interface/lonnavdisplay.pm 2010/12/07 01:15:39 1.19
+++ loncom/interface/lonnavdisplay.pm 2014/02/28 19:20:06 1.25
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavdisplay.pm,v 1.19 2010/12/07 01:15:39 www Exp $
+# $Id: lonnavdisplay.pm,v 1.25 2014/02/28 19:20:06 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -101,7 +101,7 @@ sub real_handler {
}
$r->print($start_page.
'<script type="text/javascript">window.focus();</script>');
- &Apache::londocs::startContentScreen($r,'navmaps');
+ &startContentScreen($r,'navmaps');
$r->rflush();
# Check that it's defined
@@ -113,21 +113,31 @@ sub real_handler {
return OK;
}
- # See if there's only one map in the top-level, if we don't
- # already have a filter... if so, automatically display it
- # (older code; should use retrieveResources)
- if ($ENV{QUERY_STRING} !~ /filter/) {
- my $iterator = $navmap->getIterator(undef, undef, undef, 0);
- my $curRes;
- my $sequenceCount = 0;
- my $sequenceId;
- while ($curRes = $iterator->next()) {
- if (ref($curRes) && $curRes->is_sequence()) {
+ my @resources = $navmap->retrieveResources();
+ my $sequenceCount = 0;
+ my $problemCount = 0;
+ my $notaprobCount = 0;
+ my $sequenceId;
+ my $notools;
+ foreach my $curRes (@resources) {
+ if (ref($curRes)) {
+ if ($curRes->is_sequence()) {
$sequenceCount++;
$sequenceId = $curRes->map_pc();
+ } elsif ($curRes->is_problem()) {
+ $problemCount ++;
+ } else {
+ $notaprobCount ++;
}
}
-
+ }
+ if (($sequenceCount == 1) && (!$problemCount) && ($notaprobCount <= 1)) {
+ $notools = 1;
+ }
+
+ # If there's only one map in the top-level and we don't
+ # already have a filter, automatically display it
+ if ($ENV{QUERY_STRING} !~ /filter/) {
if ($sequenceCount == 1) {
# The automatic iterator creation in the render call
# will pick this up. We know the condition because
@@ -183,9 +193,11 @@ sub real_handler {
if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};
}
- &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
- 'location.href="'.$link.'"',
- "Show my first due problem");
+ unless ($notools) {
+ &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
+ 'location.href="'.$link.'"',
+ "Show my first due problem");
+ }
}
my $suppressEmptySequences = 0;
@@ -216,25 +228,31 @@ sub real_handler {
if ($env{'form.register'}) {
$link .= '&register='.$env{'form.register'};
}
- &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
- 'location.href="'.$link.'"',
- 'Show only uncompleted problems');
+ unless ($notools) {
+ &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
+ 'location.href="'.$link.'"',
+ 'Show only uncompleted problems');
+ }
}
my %selected=($env{'form.sort'} => ' selected="selected"');
- my $sort_html=('<form name="sortForm" action="">
+ my $sort_html;
+ unless ($notools) {
+ $sort_html=(
+ '<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()">
<option value="default"'.$selected{'default'}.'>'.&mt('Default').'</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>
</select>
<input type="hidden" name="register" value="'.$env{'form.register'}.'" />
</span>
</form>');
+ }
# renderer call
my $renderArgs = { 'cols' => [0,1,2,3],
'sort' => $env{'form.sort'},
@@ -247,7 +265,9 @@ sub real_handler {
'sort_html'=> $sort_html,
'r' => $r,
'caller' => 'navmapsdisplay',
- 'linkitems' => \%toplinkitems};
+ 'linkitems' => \%toplinkitems,
+ 'notools' => $notools};
+
my $render = &Apache::lonnavmaps::render($renderArgs);
# If no resources were printed, print a reassuring message so the
@@ -261,13 +281,39 @@ sub real_handler {
}
#my $td=&tv_interval($t0);
#$r->print("<br />$td");
- &Apache::londocs::endContentScreen($r);
+ &endContentScreen($r);
$r->print(&Apache::loncommon::end_page());
$r->rflush();
return OK;
}
+sub startContentScreen {
+ my ($r,$mode)=@_;
+
+ $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");
+ 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 '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>');
+}
+
1;
__END__