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

[raeburn]

raeburn		Tue Feb 18 23:10:54 2020 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - Exclude Catalog and Evaluation from buttons on right side of inline menu
    for a "Composite Page" in a course.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.501 loncom/interface/lonmenu.pm:1.502
--- loncom/interface/lonmenu.pm:1.501	Mon Feb 17 23:04:18 2020
+++ loncom/interface/lonmenu.pm	Tue Feb 18 23:10:53 2020
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.501 2020/02/17 23:04:18 raeburn Exp $
+# $Id: lonmenu.pm,v 1.502 2020/02/18 23:10:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1098,12 +1098,14 @@
 }
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
-		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/}) && ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
+		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) &&
+                    ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) &&
+                    ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.png&Info&info[_1]&catalog_info(currentURL,'$is_mobile')&Show Metadata
 ENDREALRES
                 }
-                unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) ||
+                unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) ||
                         ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) ||
                         ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) {
                     $menuitems.=(<<ENDREALRES);