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

[raeburn]

raeburn		Tue May 21 13:02:51 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.547, 1.548.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.32 loncom/interface/londocs.pm:1.484.2.33
--- loncom/interface/londocs.pm:1.484.2.32	Sun May 19 15:34:59 2013
+++ loncom/interface/londocs.pm	Tue May 21 13:02:50 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.32 2013/05/19 15:34:59 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.33 2013/05/21 13:02:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -488,7 +488,7 @@
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Content').':::::');
+        $folderpath = 'default&'.&escape(&mt('Main Content').':::::');
     }
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
@@ -4052,7 +4052,7 @@
 }
 
 sub supplemental_base {
-    return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));
+    return 'supplemental&'.&escape(&mt('Supplemental Content'));
 }
 
 sub handler {
@@ -4185,7 +4185,7 @@
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
        $env{'form.folderpath'} = 'default&'.
-                                 &escape(&mt('Main '.$crstype.' Content').':::::');
+                                 &escape(&mt('Main Content').':::::');
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
        $env{'form.folderpath'} = 'supplemental&'.
@@ -4230,7 +4230,7 @@
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
        } else {
-          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Content').
+          $env{'form.folderpath'}='default&'.&escape(&mt('Main Content').
                                   ':::::');
        }
     }
@@ -4256,7 +4256,7 @@
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
                 $folderpath='default&'.
-                            &escape(&mt('Main '.$crstype.' Content').':::::');
+                            &escape(&mt('Main Content').':::::');
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -4581,7 +4581,7 @@
        if ($folder eq '' || $supplementalflag) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
            $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
@@ -5365,7 +5365,7 @@
         $main_container_page = 1;
     }
     my $toplevelmain = 
-        &escape(&mt('Main '.$crstype.' Content').':::::');
+        &escape(&mt('Main Content').':::::');
     my $toplevelsupp = &supplemental_base();
 
     my $backtourl;