--- loncom/interface/lonmenu.pm	2011/11/10 21:15:55	1.361
+++ loncom/interface/lonmenu.pm	2012/02/03 00:15:14	1.368
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.361 2011/11/10 21:15:55 raeburn Exp $
+# $Id: lonmenu.pm,v 1.368 2012/02/03 00:15:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -428,6 +428,12 @@ sub innerregister {
 			     "gocmd('/adm/parmset','set')",
 			     'Content Settings');
 	}
+        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')",
+                             'Folder/Page Content');
+        }
 # -- End Homework
         ###
         ### Determine whether or not to display the 'cstr' button for this
@@ -709,7 +715,7 @@ ENDMENUITEMS
             
             unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
                 &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'advtools', @inlineremote[61,71,72,73,92]);
+                    'advtools', @inlineremote[61,71,72,73,74,92]);
             }
         }
     }
@@ -1126,12 +1132,14 @@ sub utilityfunctions {
     my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
                          &mt('Switch server?');
 
+    my $esc_url=&escape($currenturl);
+    my $esc_symb=&escape($currentsymb);
 
 return (<<ENDUTILITY)
 
-    var currentURL="$currenturl";
-    var reloadURL="$currenturl";
-    var currentSymb="$currentsymb";
+    var currentURL=unescape("$esc_url");
+    var reloadURL=unescape("$esc_url");
+    var currentSymb=unescape("$esc_symb");
 
 $dc_popup_cid
 
@@ -1224,7 +1232,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() {
@@ -1250,18 +1258,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) {
@@ -1662,11 +1658,13 @@ sub required_privs {
              '/adm/populate'     => 'cst',
              '/adm/trackstudent' => 'vsa',
              '/adm/statistics'   => 'vgr',
+             '/adm/setblock'     => 'dcm',
+             '/adm/coursedocs'   => 'mdc',
            };
     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;
 }