--- loncom/interface/lonmenu.pm 2011/11/27 20:55:58 1.362 +++ loncom/interface/lonmenu.pm 2011/12/09 01:04:27 1.365 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.362 2011/11/27 20:55:58 www Exp $ +# $Id: lonmenu.pm,v 1.365 2011/12/09 01:04:27 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -428,7 +428,7 @@ sub innerregister { "gocmd('/adm/parmset','set')", 'Content Settings'); } - if ($env{'request.symb'} ne '' && + if ($env{'request.symb'}=~/^uploaded/ && &Apache::lonnet::allowed('mdc',$crs)) { $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]', "gocmd('/adm/coursedocs','direct')", @@ -1230,7 +1230,7 @@ function golist(url) { function catalog_info() { - loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); + openMyModal(window.location.pathname+'.meta',500,400,'yes'); } function chat_win() { @@ -1256,18 +1256,6 @@ function annotate() { annotator.document.close(); } -function set_wishlistlink(title, path) { - if (!title) { - title = document.title; - title = title.replace(/^LON-CAPA /,''); - } - if (!path) { - path = location.pathname; - } - Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path, - 'wishlistNewLink','width=560,height=350,scrollbars=0'); -} - function open_Wishlist_Import(rat) { var newWin; if (rat) { @@ -1670,9 +1658,9 @@ sub required_privs { '/adm/statistics' => 'vgr', }; unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') { - $privs->{'/adm/classcalc'} => 'vgr', - $privs->{'/adm/assesscalc'} => 'vgr', - $privs->{'/adm/studentcalc'} => 'vgr'; + $privs->{'/adm/classcalc'} = 'vgr', + $privs->{'/adm/assesscalc'} = 'vgr', + $privs->{'/adm/studentcalc'} = 'vgr'; } return $privs; }