[LON-CAPA-cvs] cvs: rat / lonpageflip.pm loncom/interface lonmenu.pm

[www]

www		Tue Nov  8 12:57:53 2005 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
    /rat	lonpageflip.pm 
  Log:
  Return to Last Location also in Construction Space, eliminate stupid
  "noidea.html" and go to Navigation instead.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.162 loncom/interface/lonmenu.pm:1.163
--- loncom/interface/lonmenu.pm:1.162	Tue Nov  8 09:45:44 2005
+++ loncom/interface/lonmenu.pm	Tue Nov  8 12:57:41 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.162 2005/11/08 14:45:44 albertel Exp $
+# $Id: lonmenu.pm,v 1.163 2005/11/08 17:57:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,7 @@
 					    ['inhibitmenu']);
     if (($env{'form.inhibitmenu'} eq 'yes') ||
         ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
-
+    my %lt=&initlittle();
     my $navmaps='';
     my $reloadlink='';
     my $docs='';
@@ -94,7 +94,6 @@
     }
     if ($env{'browser.interface'} eq 'textual') {
 # Textual display only
-	my %lt=&initlittle();
         $pgbg='#FFFFFF';
         $tabbg='#FFFFFF';
 	$font='#000000';
@@ -210,6 +209,13 @@
 ENDRELOAD
             }
         }
+	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
+	    my $escreload=&Apache::lonnet::escape('return:');
+	    $reloadlink=(<<ENDCRELOAD);
+<td bgcolor="$tabbg">
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
+ENDCRELOAD
+        }
         my $reg='';
         if ($registration) {
            $reg=&innerregister($forcereg,$target,$titletable);
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.56 rat/lonpageflip.pm:1.57
--- rat/lonpageflip.pm:1.56	Wed Aug 31 03:38:29 2005
+++ rat/lonpageflip.pm	Tue Nov  8 12:57:53 2005
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.56 2005/08/31 07:38:29 albertel Exp $
+# $Id: lonpageflip.pm,v 1.57 2005/11/08 17:57:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,13 +256,13 @@
 		if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); }
 			      
 	    } else {
-		$newloc='/adm/noidea.html';
+		$newloc='/adm/navmaps';
 	    }
             untie %hash;
          } else {
-	    $newloc='/adm/noidea.html';
+	    $newloc='/adm/navmaps';
          }  
-	 if ($newloc eq '/adm/noidea.html' && $direction eq 'navlaunch') {
+	 if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') {
 	     &navlaunch($r);
 	     return OK;
 	 } else {