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

[raeburn]

raeburn		Tue May 29 20:56:35 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11.
    - Backport 1.486, 1.487 (part).
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.5 loncom/interface/londocs.pm:1.484.2.6
--- loncom/interface/londocs.pm:1.484.2.5	Fri May 25 23:02:22 2012
+++ loncom/interface/londocs.pm	Tue May 29 20:56:34 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.5 2012/05/25 23:02:22 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.6 2012/05/29 20:56:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -425,9 +425,11 @@
 
 sub docs_change_log {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_;
+    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &Apache::loncommon::display_filter_js('docslog')."\n".
+             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag)."\n".
              &history_tab_js()."\n".
              &Apache::lonratedt::editscript('simple')."\n".
              '// ]]>'."\n".
@@ -2540,7 +2542,7 @@
                 'upld' => 'Import Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
-                'book' => 'Import from Stored Links',
+                'lnks' => 'Import from Stored Links',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',