[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[raeburn]

raeburn		Sun Sep 22 15:35:45 2013 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  - Suppress display of header items when displaying iframe in a file in 
    Authoring Space, where src attribute in /res or a relative path 
    (inhibitmenu=yes will have been appended to query string in src).
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.445 loncom/xml/londefdef.pm:1.446
--- loncom/xml/londefdef.pm:1.445	Sat Sep 14 02:04:47 2013
+++ loncom/xml/londefdef.pm	Sun Sep 22 15:35:45 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.445 2013/09/14 02:04:47 raeburn Exp $
+# $Id: londefdef.pm,v 1.446 2013/09/22 15:35:45 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -599,12 +599,16 @@
             $header=&Apache::lonmenu::constspaceform();
         }
         if ($env{'request.state'} ne 'published') {
-            $header.=&edit_controls();
+            unless ($env{'form.inhibitmenu'} eq 'yes') {
+                $header.=&edit_controls();
+            }
         }
         if ($env{'request.state'} eq 'construct') {
-            $currentstring.=&Apache::loncommon::head_subbox(
-                                &Apache::loncommon::CSTR_pageheader()
-                               .$header);
+            unless ($env{'form.inhibitmenu'} eq 'yes') {
+                $currentstring.=&Apache::loncommon::head_subbox(
+                                    &Apache::loncommon::CSTR_pageheader()
+                                   .$header);
+            }
         } elsif ($env{'request.state'} eq 'edit') {
             $currentstring.=&Apache::loncommon::head_subbox($header);
         }