--- rat/lonpageflip.pm	2008/11/20 15:19:05	1.77
+++ rat/lonpageflip.pm	2013/05/10 12:49:39	1.81
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.77 2008/11/20 15:19:05 jms Exp $
+# $Id: lonpageflip.pm,v 1.81 2013/05/10 12:49:39 raeburn 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(<<ENDNAV);
-    <p><a href="/adm/flip?postdata=firstres%3a">Goto first resource</a></p>
-    <script type="text/javascript">
-	function collapse() {
-	    menu=window.open("/adm/navmaps?collapseExternal","loncapanav",
-			     "height=600,width=400,scrollbars=1");
-	    this.document.location='/adm/navmaps?turningOffExternal';
-	}
-    </script>
-    <p><a href="javascript:collapse();">Collapse external navigation window</a></p>
-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,18 +306,13 @@ 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/^http\:\/\///;
+      $currenturl=~s/^https?\:\/\///;
       $currenturl=~s/^[^\/]+//;
 #
 # Is the current URL on the map? If not, start with last known URL
@@ -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?
@@ -478,7 +448,7 @@ $start_page
 <p>
 $lt{'pick'}:
 <p>
-<table border=2>
+<table border="2">
 <tr><th>$lt{'titleheader'}</th><th>$lt{'type'}</th></tr>
 ENDSTART
                      foreach my $id (@possibilities) {
@@ -519,6 +489,7 @@ ENDMENU
       } else {
 # ---------------------------------------- No, could not determine where we are
 	  $r->internal_redirect('/adm/ambiguous');
+          return OK;
       }
   } else {
 # -------------------------- Class was not initialized or page fliped strangely
@@ -561,8 +532,6 @@ described at http://www.lon-capa.org.
 
 =item get_next_possible_move()
 
-=item navlaunch()
-
 =item first_accessible_resource()
 
 =item handler()