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

www lon-capa-cvs-allow@mail.lon-capa.org
Mon, 03 Mar 2008 16:41:49 -0000


www		Mon Mar  3 11:41:49 2008 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
    /rat	lonratmenu.pm 
  Log:
  Bug #5626: remove big header logos when generating AdvRAT inline menu while in Remote mode
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.643 loncom/interface/loncommon.pm:1.644
--- loncom/interface/loncommon.pm:1.643	Mon Mar  3 05:50:26 2008
+++ loncom/interface/loncommon.pm	Mon Mar  3 11:41:42 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.643 2008/03/03 10:50:26 foxr Exp $
+# $Id: loncommon.pm,v 1.644 2008/03/03 16:41:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3994,7 +3994,7 @@
         $dc_info = '('.$dc_info.')';
     }
 
-    if ($env{'environment.remote'} eq 'off') {
+    if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) {
         # No Remote
 	if ($env{'request.state'} eq 'construct') {
 	    $forcereg=1;
Index: rat/lonratmenu.pm
diff -u rat/lonratmenu.pm:1.8 rat/lonratmenu.pm:1.9
--- rat/lonratmenu.pm:1.8	Mon Jun 26 18:47:35 2006
+++ rat/lonratmenu.pm	Mon Mar  3 11:41:49 2008
@@ -41,8 +41,7 @@
     my %loaditem = ('onunload' => "leave();",);
     my $start_page = 
 	&Apache::loncommon::start_page('Advanced Editor',$js,
-				       {'add_entries' => \%loaditem,}).
-	&Apache::loncommon::help_open_menu('Sequence_Advanced_Editor_Creation','Sequence_Advanced_Editor_Creation',6,'RAT');
+				       {'add_entries' => \%loaditem, 'suppress_header_logos' => 1});
     $r->print($start_page);
     my $readfile=$r->uri;
     $readfile=~s/\/loadonly\/adveditmenu$//;
@@ -53,9 +52,12 @@
 
 sub print_html {
     my $readfile=shift;
+    my $help=&Apache::loncommon::help_open_menu('Sequence_Advanced_Editor_Creation','Sequence_Advanced_Editor_Creation',6,'RAT');
+
     my $pagetext = <<"END";
 <table border=0><tr><td bgcolor="#aaaaaa">
 <table border=0><tr>
+<td bgcolor="#ffffcc">$help</td>
 <td bgcolor="#ffffcc"><a href="javascript:togglemode();"><font size="-2">Toggle display</font></a></td>
 <td bgcolor="#ffffcc"><a href="javascript:if (zscale>1) { zscale--; draw();}"><font size="-2">Zoom out</font></a></td>
 <td bgcolor="#ffffcc"><a href="javascript:if (zscale<3) { zscale++; draw();}"><font size="-2">Zoom in</font></a></td>