--- loncom/interface/lonnavdisplay.pm 2010/08/14 21:42:59 1.13.4.3 +++ loncom/interface/lonnavdisplay.pm 2012/05/13 12:04:23 1.22.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavdisplay.pm,v 1.13.4.3 2010/08/14 21:42:59 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.22.4.1 2012/05/13 12:04:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::lonnavmaps(); use Apache::lonhtmlcommon(); use Apache::lonnet; use Apache::lonlocal; +use Apache::londocs(); use Time::HiRes qw( gettimeofday tv_interval ); sub handler { @@ -67,65 +68,6 @@ sub real_handler { &Apache::loncommon::no_cache($r); my %toplinkitems=(); - &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','', - "Select Action"); - if ($ENV{QUERY_STRING} eq 'collapseExternal') { - &Apache::lonnet::put('environment',{'remotenavmap' => 'off'}); - &Apache::lonnet::appenv({'environment.remotenavmap' => 'off'}); - my $menu=&Apache::lonmenu::reopenmenu(); - my $navstatus=&Apache::lonmenu::get_nav_status(); - if ($menu) { - $menu=(<send_http_header; - my $js =<<"ENDSUBM"; - -ENDSUBM - $r->print(&Apache::loncommon::start_page(undef,$js, - {'only_body' => 1, - 'bgcolor' => '#FFFFFF', - 'add_entries' => - {'onload' => - "submitthis()"}}). - &Apache::loncommon::end_page()); - - return OK; - } - if ($ENV{QUERY_STRING} =~ /^launchExternal/) { - &Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); - &Apache::lonnet::appenv({'environment.remotenavmap' => 'on'}); - my $menu=&Apache::lonmenu::reopenmenu(); - my $navstatus=&Apache::lonmenu::get_nav_status(); - if ($menu) { - $r->print(< - swmenu=$menu - swmenu.clearTimeout(swmenu.menucltim); - $navstatus - -MENU - } - } - if ($ENV{QUERY_STRING} eq 'turningOffExternal') { - $env{'environment.remotenavmap'}='off'; - } # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); @@ -139,43 +81,27 @@ MENU $r->send_http_header; # ------------------------------------------------------------ Get query string - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']); # ----------------------------------------------------- Force menu registration - my $body_only=''; - my $js; - if ($env{'environment.remotenavmap'} eq 'on') { - $js=''; - $body_only=1; - } - # Header my $course_type = &Apache::loncommon::course_type(); - my ($title,$breadcrumb_text,$start_page,$args); - if ($course_type eq 'Community') { - $title = 'Community Contents'; - $breadcrumb_text = &mt('Community Contents'); - } else { - $title = 'Course Contents'; - $breadcrumb_text = &mt('Course Contents'); - } + 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,$js,$args); + $start_page = &Apache::loncommon::start_page($title,undef,$args); } else { my $brcrum = [{href => '/adm/navmaps', - text => $breadcrumb_text, + text => &mt($course_type . ' Contents'), no_mt => 1}, ]; $args = {'bread_crumbs' => $brcrum}; - $start_page = &Apache::loncommon::start_page($title,$js,$args); + $start_page = &Apache::loncommon::start_page($title,undef,$args); } $r->print($start_page. ''); + &startContentScreen($r,'navmaps'); $r->rflush(); # Check that it's defined @@ -187,21 +113,31 @@ MENU 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 @@ -211,27 +147,6 @@ MENU } } - if ($ENV{QUERY_STRING} eq 'launchExternal') { - $r->print(' -
-
'); - $r->print(' - '); - } - - if ($env{'environment.remotenavmap'} ne 'on') { - $r->print(&launch_win('link','yes',\%toplinkitems)); - } - if ($env{'environment.remotenavmap'} eq 'on') { - &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'closenav', - 'collapse()', - "Close navigation window"); - } - - # Check to see if the student is jumping to next open, do-able problem if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) { # Find the next homework problem that they can do. @@ -278,9 +193,11 @@ MENU 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; @@ -301,7 +218,7 @@ MENU } &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything', 'location.href="'.$link.'"', - "Show everything"); + 'Show everything'); $r->print("".&mt("Uncompleted Problems").""); $env{'form.filter'} = ''; $env{'form.condition'} = 1; @@ -311,13 +228,18 @@ MENU 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=('
+ my $sort_html; + unless ($notools) { + $sort_html=( + ' '.&mt('Sort by:').' @@ -326,10 +248,11 @@ MENU - +
'); + } # renderer call my $renderArgs = { 'cols' => [0,1,2,3], 'sort' => $env{'form.sort'}, @@ -342,7 +265,9 @@ MENU '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 @@ -356,40 +281,27 @@ MENU } #my $td=&tv_interval($t0); #$r->print("
$td"); - + &endContentScreen($r); $r->print(&Apache::loncommon::end_page()); $r->rflush(); return OK; } -sub launch_win { - my ($mode,$script,$toplinkitems,$firsttime)=@_; - my $result; - if ($script ne 'no') { - $result.=''; - } - if ($mode eq 'link') { - &Apache::lonnavmaps::add_linkitem($toplinkitems,'launchnav', - 'launch_navmapwin()', - "Launch navigation window"); - } - return $result; +sub startContentScreen { + my ($r,$mode)=@_; + + $r->print("\n".''."\n"); + $r->print('
'); +} + +sub endContentScreen { + my ($r)=@_; + $r->print('
'); } 1;