--- rat/lonpageflip.pm 2009/04/23 17:31:25 1.79 +++ rat/lonpageflip.pm 2010/03/16 19:56:02 1.80 @@ -2,7 +2,7 @@ # # Page flip handler # -# $Id: lonpageflip.pm,v 1.79 2009/04/23 17:31:25 bisitz Exp $ +# $Id: lonpageflip.pm,v 1.80 2010/03/16 19:56:02 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -217,26 +217,6 @@ sub get_next_possible_move { return ($next,$mapurl); } -sub navlaunch { - my ($r)=@_; - &Apache::loncommon::content_type($r,'text/html'); - &Apache::loncommon::no_cache($r); - $r->send_http_header; - $r->print(&Apache::loncommon::start_page('Launched')); - $r->print(<Goto first resource

- -

Collapse external navigation window

-ENDNAV - $r->print(&Apache::loncommon::end_page()); -} - sub first_accessible_resource { my $furl; if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', @@ -302,7 +282,7 @@ sub handler { return REDIRECT; } - if ($direction eq 'return' || $direction eq 'navlaunch') { + if ($direction eq 'return') { # -------------------------------------------------------- Return to last known my $last; if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', @@ -326,16 +306,11 @@ sub handler { } else { $newloc='/adm/navmaps'; } - if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') { - &navlaunch($r); - return OK; - } else { &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => &Apache::lonnet::absolute_url().$newloc); return REDIRECT; - } } $currenturl=~s/^https?\:\/\///; $currenturl=~s/^[^\/]+//; @@ -352,16 +327,11 @@ sub handler { if ($last) { $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); } else { - if ($direction eq 'return') { &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => &Apache::lonnet::absolute_url(). '/adm/noidea.html'); return REDIRECT; - } else { - &navlaunch($r); - return OK; - } } } # ------------------------------------------- Do we have any idea where we are? @@ -561,8 +531,6 @@ described at http://www.lon-capa.org. =item get_next_possible_move() -=item navlaunch() - =item first_accessible_resource() =item handler()