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

[raeburn]

raeburn		Fri Jan 22 01:23:35 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	londocs.pm 
  Log:
  - Backport 1.384, 1.404, 1.405, 1.407.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.325.2.4 loncom/interface/londocs.pm:1.325.2.5
--- loncom/interface/londocs.pm:1.325.2.4	Fri Jan 22 01:07:08 2010
+++ loncom/interface/londocs.pm	Fri Jan 22 01:23:34 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.325.2.4 2010/01/22 01:07:08 raeburn Exp $
+# $Id: londocs.pm,v 1.325.2.5 2010/01/22 01:23:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1697,7 +1697,7 @@
             return 'failed';
         } else {
             if ($parseaction eq 'parse') {
-                my $total_embedded = keys(%{$allfiles});
+                my $total_embedded = scalar(keys(%{$allfiles}));
                 if ($total_embedded > 0) {
                     my $num = 0;
 		    my $state = '
@@ -2552,7 +2552,7 @@
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>"Edit ".&Apache::loncommon::course_type(),
+					    text=>&Apache::loncommon::course_type().' Editor',
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2833,6 +2833,16 @@
                 'parse' => 'If HTML file, upload embedded images/multimedia files'
 					  );
 # -----------------------------------------------------------------------------
+    my %tabtitles = (
+                       main => {
+                                 Course => &mt('Main Course Documents'),
+                                 Community => &mt('Main Community Documents'),
+                               },
+                       supplemental => {
+                                 Course => &mt('Supplemental Course Documents'),        
+                                 Community => &mt('Supplemental Community Documents'),
+                               },
+                    );
     if ($allowed) {
 	&update_paste_buffer($coursenum,$coursedom);
        my $dumpbut=&dumpbutton();
@@ -2848,8 +2858,7 @@
        if (!$folderpath) {
 	   if ($env{'form.folder'} eq '' ||
 	       $env{'form.folder'} eq 'supplemental') {
-	       $folderpath='default&'.
-		   &escape(&mt('Main '.$type.' Documents'));
+	       $folderpath='default&'.&escape($tabtitles{'main'}{$type});
 	   }
        }
        unless ($env{'form.pagepath'}) {
@@ -3169,7 +3178,7 @@
        if ($folder =~ /^supplemental$/ &&
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
-                                    &escape(&mt('Supplemental '.$type.' Documents'));
+                                    &escape($tabtitles{'supplemental'}{$type});
        }
        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {