--- loncom/interface/lonmodifycourse.pm	2008/06/30 01:28:56	1.38
+++ loncom/interface/lonmodifycourse.pm	2009/05/08 17:22:17	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.38 2008/06/30 01:28:56 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.44 2009/05/08 17:22:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,20 +118,21 @@ sub print_course_search_page {
     &print_header($r);
     my $filterlist = ['descriptfilter',
                       'instcodefilter','ownerfilter',
-                      'ownerdomfilter','coursefilter'];
+                      'coursefilter'];
     my $filter = {};
+    my $numtitles;
     my $type = 'Course';
     my $action = '/adm/modifycourse';
     my $cctitle = &Apache::lonnet::plaintext('cc',$type);
     my $dctitle = &Apache::lonnet::plaintext('dc');
     $r->print(
         '<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>'.
-        &mt('Actions available after selecting a course:').'<ul>'.  
+        &mt('Actions available after searching for a course:').'<ul>'.  
         '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
         '<li>'.&mt('View or modify course settings which only a [_1] may modify.'
                   ,$dctitle).'</li>'."\n".'</ul>');
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                             undef,undef,$filter,$action,'modifycourse'));
+                             undef,undef,$filter,$action,\$numtitles,'modifycourse'));
 }
 
 sub print_course_selection_page {
@@ -155,7 +156,7 @@ sub print_course_selection_page {
     $filter{'domainfilter'} = $dom;
     my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
                                                          \%filter);
-    &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,
+    &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,
                                                     %courses);
     return;
 }
@@ -173,7 +174,7 @@ sub print_modification_menu {
     );
     my @menu =
         (
-          { text  => 'Modify quota for group portfolio files',
+          { text  => 'Modify quota for group portfolio',
             phase => 'setquota',
             },
           { text  => 'Display current settings for automated enrollment',
@@ -269,7 +270,7 @@ sub print_settings_display {
     $disp_table .= &Apache::loncommon::end_data_table()."\n";
     &print_header($r,$cdesc);
     $r->print('
-<h3>'.$lt{'caes'}.'</h3>
+<h3>'.$lt{'caes'}.$cdesc.'</h3>
 <p>
 <form action="/adm/modifycourse" method="post" name="viewparms">
 '.$lt{'cose'}.'<ul><li>'.&mt('Settings that can be modified by a [_1] using the <a href="/adm/populate">Automated Enrollment Manager</a>.',$cctitle).'</li><li>'.&mt('Settings that may only be modified by a [_1] from this menu.',$dctitle).'</li></ul>
@@ -290,10 +291,10 @@ sub print_setquota {
     my $cctitle = &Apache::lonnet::plaintext('cc',$type);
     my $subdiv = &mt('Although a [_1] will assign the disk quota for each individual group, the size of the quota is constrained by the total disk space allocated by the [_2] for portfolio files in a course.',$cctitle,$dctitle);
     my %lt = &Apache::lonlocal::texthash(
-                'cquo' => 'Disk space for storage of group portfolio files',
+                'cquo' => 'Disk space for storage of group portfolio',
                 'gpqu' => 'Course portfolio files disk space',
                 'each' => 'Each course group can be assigned a quota for portfolio files uploaded to the group.',
-                'modi' => 'Modify quota',
+                'modi' => 'Save',
                 'back' => "Back to options page",
     );
     my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
@@ -341,10 +342,10 @@ sub print_catsettings {
                 $excludeoff = ''; 
             }
             $r->print('<h4>'.&mt('Visibility in Course Catalog').'</h4>'.
-                      &mt("Unless excluded, a course is listed in this domain's publicly accessible course catalog if at least of one the following applies").':<ul>'.
+                      &mt("Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies").':<ul>'.
                       '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code').'</li>'.
                       '<li>'.&mt('The course has been categorized into at least one of the course categories defined for the domain.').'</li></ul>'.
-                      '<br />'.&mt('Exclude from course catalog').'&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br />'); 
+                      &mt('Exclude from course catalog').'&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br />'); 
         }
         if (grep(/^categorize$/,@cat_params)) {
             $r->print('<h4>'.&mt('Categorize Course').'</h4>');
@@ -387,7 +388,7 @@ sub print_course_modification_page {
             'name' => "Name",
             'unme' => "Username:Domain",
             'stus' => "Status",
-            'cquo' => "Disk space for storage of group portfolio files",
+            'cquo' => "Disk space for storage of group portfolio",
             'gpqu' => "Course portfolio files disk space",
             'each' => "Each course group can be assigned a quota for portfolio files uploaded to the group.",
             'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ",
@@ -783,7 +784,7 @@ sub modify_quota {
                                         );
     $r->print('
 <form action="/adm/modifycourse" method="post" name="processquota">
-<h3>'.&mt('Disk space for storage of group portfolio files for [_1]',$cdesc).
+<h3>'.&mt('Disk space for storage of group portfolio for [_1]',$cdesc).
              '</h3>');
     my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
     my $defaultquota = 20;
@@ -792,7 +793,7 @@ sub modify_quota {
         if ($newquota =~ /^\s*(\d+\.?\d*|\.\d+)\s*$/) {
             $newquota = $1;
             if ($oldsettings{'internal.coursequota'} eq $env{'form.coursequota'}) {
-                $r->print(&mt('The disk space allocated for group portfolio files remains unchanged as ').$env{'form.coursequota'}.' Mb');
+                $r->print(&mt('The disk space allocated for group portfolio remains unchanged as ').$env{'form.coursequota'}.' Mb');
             } else {
                 my %cenv = (
                            'internal.coursequota' => $env{'form.coursequota'},
@@ -801,11 +802,11 @@ sub modify_quota {
                                                     $cnum);
                 if (($oldsettings{'internal.coursequota'} eq '') && 
                     ($env{'form.coursequota'} == $defaultquota)) {
-                    $r->print(&mt('The disk space allocated for group portfolio files in this course is the default quota for this domain:').' '.$defaultquota.' Mb');
+                    $r->print(&mt('The disk space allocated for group portfolio in this course is the default quota for this domain:').' '.$defaultquota.' Mb');
                 } else {
                     if ($putreply eq 'ok') {
                         my %updatedsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
-                        $r->print(&mt('The disk space allocated for group portfolio files is now:').' '.$updatedsettings{'internal.coursequota'}.' Mb.');
+                        $r->print(&mt('The disk space allocated for group portfolio is now:').' '.$updatedsettings{'internal.coursequota'}.' Mb.');
                         my $usage = &Apache::longroup::sum_quotas($cdom.'_'.$cnum);
                         if ($usage >= $updatedsettings{'internal.coursequota'}) {
                             my $newoverquota;
@@ -1009,9 +1010,13 @@ ENDSCRIPT
 					     $js,$starthash));
     my $bread_text = "View/Modify Courses";
     if ($cdesc ne '') {
-        $bread_text = "Course Settings: $cdesc"; 
-    } 
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
+        $bread_text = &mt('Course Settings: [_1]',$cdesc);
+        my $no_mt = 1;
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,undef,undef,
+                                                      undef,undef,$no_mt));
+    } else {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
+    }
     return;
 }