[LON-CAPA-cvs] cvs: loncom /homework chemresponse.pm /interface lonmenu.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 10 Aug 2004 18:05:12 -0000 

albertel		Tue Aug 10 14:05:12 2004 EDT

  Modified files:              
    /loncom/homework	chemresponse.pm 
    /loncom/interface	lonmenu.pm 
  Log:
   -BUG#3284, inline remote was appearing in reaction edit window now add the Url parm 'inhibitmenu' if it is set to yes, the menubuttons() routine returns nothing.
  
  
  
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.36 loncom/homework/chemresponse.pm:1.37
--- loncom/homework/chemresponse.pm:1.36	Thu Jul 15 14:53:11 2004
+++ loncom/homework/chemresponse.pm	Tue Aug 10 14:05:12 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.36 2004/07/15 18:53:11 albertel Exp $
+# $Id: chemresponse.pm,v 1.37 2004/08/10 18:05:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -313,7 +313,7 @@
     function create_reaction_window_${id}_${field} () {
 	editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
 	editor.document.open('text/html','replace');
-	editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0">  <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
+	editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0">  <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
     }
 </script>
 <input type='button' value='Edit Answer' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.111 loncom/interface/lonmenu.pm:1.112
--- loncom/interface/lonmenu.pm:1.111	Fri Jul 23 15:09:27 2004
+++ loncom/interface/lonmenu.pm	Tue Aug 10 14:05:12 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.111 2004/07/23 19:09:27 albertel Exp $
+# $Id: lonmenu.pm,v 1.112 2004/08/10 18:05:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,6 +68,11 @@
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
+    
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['inhibitmenu']);
+    if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
+
     my $navmaps='';
     my $reloadlink='';
     my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});