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

[raeburn]

raeburn		Mon May  6 14:12:21 2013 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - Supplemental folder display.
    Only show link to Course Editor if user has mdc priv.
  - Exit Editor link points back to Course Contents if editor accessed via 
    "Edit folder" icon/link in Functions for an item, and that item has been
    removed or cut. 
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.543 loncom/interface/londocs.pm:1.544
--- loncom/interface/londocs.pm:1.543	Wed Apr  3 02:00:19 2013
+++ loncom/interface/londocs.pm	Mon May  6 14:12:21 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.543 2013/04/03 02:00:19 raeburn Exp $
+# $Id: londocs.pm,v 1.544 2013/05/06 14:12:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2630,7 +2630,9 @@
 
     my $need_save;
     if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) {
-        my $toolslink = '<table><tr><td>'
+        my $toolslink;
+        if ($allowed || &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+            $toolslink = '<table><tr><td>'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            'Navigation_Screen',undef,'RAT')
                        .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
@@ -2640,6 +2642,7 @@
                        .'class="LC_toolbarItem" '
                        .'title="'.&mt('Supplemental Content Editor').'">'
                        .'</a></li></ul></td></tr></table><br />';
+        }
         if ($shown) {
             if ($allowed) {
                 $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
@@ -5379,6 +5382,8 @@
             if (&Apache::lonnet::is_on_map($res)) {
                 $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
                              &HTML::Entities::encode($caller,'<>&"');
+            } else {
+                $backtourl = '/adm/navmaps';
             }
         }
     } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {