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

Fri May 10 20:01:52 EDT 2013

raeburn		Sat May 11 00:01:52 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.544, 1.545.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.30 loncom/interface/londocs.pm:1.484.2.31

--- loncom/interface/londocs.pm:1.484.2.30	Wed Apr  3 02:41:22 2013
+++ loncom/interface/londocs.pm	Sat May 11 00:01:52 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.30 2013/04/03 02:41:22 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.31 2013/05/11 00:01:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -340,10 +340,8 @@
                 }
                 my $initialtext = &mt('Replace with your own content.');
                 my $newhtml = <<END;
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>$name</title>
 </head>
 <body bgcolor="#ffffff">
@@ -2630,7 +2628,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 +2640,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')
@@ -5378,6 +5379,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') {


