--- loncom/interface/lonnavdisplay.pm 2009/03/09 13:27:56 1.7 +++ loncom/interface/lonnavdisplay.pm 2010/06/24 14:21:39 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavdisplay.pm,v 1.7 2009/03/09 13:27:56 schulted Exp $ +# $Id: lonnavdisplay.pm,v 1.18 2010/06/24 14:21:39 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,65 +67,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,30 +80,26 @@ 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(); - $r->print(&Apache::loncommon::start_page(#'Navigate '.$course_type. - 'Course Contents', - $js, - {'only_body' => $body_only, - 'force_register' => - $env{'form.register'},})); - $r->print(''); - + 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. + ''); $r->rflush(); # Check that it's defined @@ -198,27 +135,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. @@ -261,8 +177,12 @@ MENU .""); } } else { + my $link = 'navmaps?jumpToFirstHomework'; + if ($env{'form.register'}) { + $link .= '&register='.$env{'form.register'}; + } &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework', - 'location.href="navmaps?jumpToFirstHomework"', + 'location.href="'.$link.'"', "Show my first due problem"); } @@ -278,33 +198,41 @@ MENU $filterFunc = sub { my $res = shift; return $res->completable() || $res->is_map(); }; + my $link = 'navmaps?sort='.$env{'form.sort'}; + if ($env{'form.register'}) { + $link .= '&register='.$env{'form.register'}; + } &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything', - 'location.href="navmaps?sort='.$env{'form.sort'}.'"', - "Show everything"); + 'location.href="'.$link.'"', + 'Show everything'); $r->print("".&mt("Uncompleted Problems").""); $env{'form.filter'} = ''; $env{'form.condition'} = 1; $resource_no_folder_link = 1; } else { + my $link = 'navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1'; + if ($env{'form.register'}) { + $link .= '&register='.$env{'form.register'}; + } &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted', - 'location.href="navmaps?sort='.$env{'form.sort'}. - '&showOnlyHomework=1"', - "Show only uncompleted problems"); + 'location.href="'.$link.'"', + 'Show only uncompleted problems'); } - my %selected=($env{'form.sort'} => 'selected=on'); - my $sort_html=("
- - - - + '.&mt('Sort by:').' + - -
"); + + + '); # renderer call my $renderArgs = { 'cols' => [0,1,2,3], 'sort' => $env{'form.sort'}, @@ -338,35 +266,6 @@ MENU 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; -} - 1; __END__