--- rat/lonpageflip.pm	2006/10/20 22:04:16	1.74
+++ rat/lonpageflip.pm	2013/11/28 02:23:25	1.83
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.74 2006/10/20 22:04:16 albertel Exp $
+# $Id: lonpageflip.pm,v 1.83 2013/11/28 02:23:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,8 @@
 # http://www.lon-capa.org/
 #
 
+
+
 package Apache::lonpageflip;
 
 use strict;
@@ -215,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',
@@ -300,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',
@@ -324,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
@@ -350,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?
@@ -444,7 +416,7 @@ sub handler {
 			   $redirectsymb='';
                         }
                      }
-                     &Apache::lonnet::appenv('user.criticalcheck.time'=>time);
+                     &Apache::lonnet::appenv({'user.criticalcheck.time'=>time});
 		  }
 
 		  &Apache::loncommon::content_type($r,'text/html');
@@ -460,13 +432,16 @@ sub handler {
 						     'explain' =>
 						     'You have reached the end of the sequence of materials.',
 						     'back' => 'Go Back',
-						     'nav' => 'Navigate Course Content',
+						     'nav' => 'Course Contents',
 						     'wherenext' =>
 						     'There are several possibilities of where to go next',
 						     'pick' =>
 						     'Please click on the the resource you intend to access',
 						     'titleheader' => 'Title',
 						     'type' => 'Type');
+                  if (&Apache::loncommon::course_type() eq 'Community') {
+                      $lt{'nav'} = &mt('Community Contents');
+                  }
                   if ($#possibilities>0) {
 		      my $start_page=
 			  &Apache::loncommon::start_page('Multiple Resources');
@@ -476,7 +451,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) {
@@ -492,21 +467,17 @@ ENDSTART
                      }
                      $r->print('</table>');
                   } else {
-		      my $start_page=
-			  &Apache::loncommon::start_page('No Resource');
-		      $r->print(<<ENDNONE);
-$start_page
-<h3>$lt{'title'}</h3>
-<p>$lt{'explain'}</p>
-ENDNONE
-		  }
-		  $r->print(<<ENDMENU);
-<ul>
-<li><a href="/adm/flip?postdata=return:">$lt{'back'}</a></li>
-<li><a href="/adm/navmaps">$lt{'nav'}</a></li>
-</ul>
-ENDMENU
-                  $r->print(&Apache::loncommon::end_page());
+                      $r->print(
+                          &Apache::loncommon::start_page('No Resource')
+                         .'<h2>'.$lt{'title'}.'</h2>'
+                         .'<p>'.$lt{'explain'}.'</p>');
+                  }
+                  $r->print(
+                      &Apache::lonhtmlcommon::actionbox(
+                          ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
+                           '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
+                          ])
+                     .&Apache::loncommon::end_page());
                   return OK;
 	      }
 	  } else {
@@ -517,6 +488,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
@@ -528,6 +500,44 @@ ENDMENU
 1;
 __END__
 
+=pod
+
+=head1 NAME
+
+Apache::lonpageflip
+
+=head1 SYNOPSIS
+
+Deals with forward, backward, and other page flips.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+(empty)
+
+=head1 SUBROUTINES
+
+=over cleanup()
+
+=item addrid()
+
+=item fullmove()
+
+=item hash_src()
+
+=item move()
+
+=item get_next_possible_move()
+
+=item first_accessible_resource()
+
+=item handler()
+
+=back
+
+=cut