[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonpickcourse.pm

[raeburn]

raeburn		Wed Sep 14 16:42:37 2005 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonpickcourse.pm 
  Log:
  Navigation links in bodytag not needed in pickcourse pop-up window.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.271 loncom/interface/loncommon.pm:1.272
--- loncom/interface/loncommon.pm:1.271	Thu Sep  8 18:37:06 2005
+++ loncom/interface/loncommon.pm	Wed Sep 14 16:42:36 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.271 2005/09/08 22:37:06 albertel Exp $
+# $Id: loncommon.pm,v 1.272 2005/09/14 20:42:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2689,7 +2689,7 @@
 =cut
 
 sub bodytag {
-    my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle)=@_;
+    my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,$notopbar)=@_;
     $title=&mt($title);
     $function = &get_users_function() if (!$function);
     my $img=&designparm($function.'.img',$domain);
@@ -2797,10 +2797,18 @@
                          '<tr><td bgcolor="'.$tabbg.'">'.
                          $titleinfo.'</td>'.$roleinfo.'</tr></table>';
         if ($env{'request.state'} eq 'construct') {
-            $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable);
+            if ($notopbar) {
+                $bodytag .= $titletable;
+            } else {
+                $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable);
+            }
 	} else {
-            $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg).
+            if ($notopbar) {
+                $bodytag .= $titletable;
+            } else {
+                $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg).
                         $titletable;
+            }
         }
         return $bodytag;
     }
Index: loncom/interface/lonpickcourse.pm
diff -u loncom/interface/lonpickcourse.pm:1.28 loncom/interface/lonpickcourse.pm:1.29
--- loncom/interface/lonpickcourse.pm:1.28	Mon Apr 11 20:20:01 2005
+++ loncom/interface/lonpickcourse.pm	Wed Sep 14 16:42:36 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.28 2005/04/12 00:20:01 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.29 2005/09/14 20:42:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,7 +115,7 @@
             $seclist = join('","',@sections);
         }
     }
-    $r->print(&Apache::loncommon::bodytag("Selecting a Course",undef,$loaditem));
+    $r->print(&Apache::loncommon::bodytag("Selecting a Course",undef,$loaditem,undef,undef,undef,undef,1));
     my %lt=&Apache::lonlocal::texthash(
 				       'cac' => 'Course Activity',
 				       'cde' => 'Course Description',