Diff for /loncom/interface/lonmodifycourse.pm between versions 1.64 and 1.69

version 1.64, 2013/11/13 00:09:28 version 1.69, 2014/03/13 14:46:46
Line 153  sub print_course_search_page { Line 153  sub print_course_search_page {
         $type = 'Course';          $type = 'Course';
     }      }
     &print_header($r,$type);      &print_header($r,$type);
     my $filterlist = ['descriptfilter',      my ($filterlist,$filter) = &get_filters();
                       'instcodefilter','ownerfilter',  
                       'coursefilter'];  
     my $filter = {};  
     my ($numtitles,$cctitle,$dctitle,@codetitles);      my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';      my $ccrole = 'cc';
     if ($type eq 'Community') {      if ($type eq 'Community') {
Line 169  sub print_course_search_page { Line 166  sub print_course_search_page {
         $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');          $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
     } else {      } else {
         $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');          $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
     }         }
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,      $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                              undef,undef,$filter,$action,\$numtitles,'modifycourse',                                                  \$numtitles,'modifycourse',undef,undef,undef,
                              undef,undef,undef,\@codetitles));                                                  \@codetitles,$filter->{'domainfilter'}));
     if ($type eq 'Community') {      if ($type eq 'Community') {
         $r->print(&mt('Actions available after searching for a community:').'<ul>'.          $r->print(&mt('Actions available after searching for a community:').'<ul>'.
                   '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".                    '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
Line 184  sub print_course_search_page { Line 181  sub print_course_search_page {
                   '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).                    '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
                   '</li>'."\n".'</ul>');                    '</li>'."\n".'</ul>');
     }      }
       return;
 }  }
   
 sub print_course_selection_page {  sub print_course_selection_page {
Line 195  sub print_course_selection_page { Line 193  sub print_course_selection_page {
     &print_header($r,$type);      &print_header($r,$type);
   
 # Criteria for course search   # Criteria for course search 
     my $filterlist = ['descriptfilter',      my ($filterlist,$filter) = &get_filters();
                       'instcodefilter','ownerfilter',  
                       'ownerdomfilter','coursefilter'];  
     my %filter;  
     my $action = '/adm/modifycourse';      my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');      my $dctitle = &Apache::lonnet::plaintext('dc');
     my ($numtitles,@codetitles);      my ($numtitles,@codetitles);
     $r->print(&Apache::lonpickcourse::js_changer());      $r->print(&Apache::lonpickcourse::js_changer());
     $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');      $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,      $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                        undef,undef,\%filter,$action,\$numtitles,                                                  \$numtitles,'modifycourse',undef,undef,undef,
                                        undef,undef,undef,undef,\@codetitles));                                                  \@codetitles,$filter->{'domainfilter'},
     $filter{'domainfilter'} = $dom;                                                  $env{'form.form'}));
     my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,      if (ref($filter) eq 'HASH') {
                                                          \%filter,$numtitles,undef,          $filter->{'domainfilter'} = $dom;
                                                          undef,undef,\@codetitles);      }
       my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,$filter,$numtitles,
                                                            undef,undef,undef,\@codetitles);
     &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,      &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
                                                     %courses);                                                      %courses);
     return;      return;
 }  }
   
   sub get_filters {
       my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',
                         'ownerdomfilter','coursefilter','sincefilter');
       # created filter
       my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'form.domainfilter'});
       if ($loncaparev ne 'unknown_cmd') {
           push(@filterlist,'createdfilter');
       }
       my %filter;
       foreach my $item (@filterlist) {
           $filter{$item} = $env{'form.'.$item};
       }
       return (\@filterlist,\%filter);
   }
   
 sub print_modification_menu {  sub print_modification_menu {
     my ($r,$cdesc,$domdesc,$dom,$type) = @_;      my ($r,$cdesc,$domdesc,$dom,$type) = @_;
     &print_header($r,$type);      &print_header($r,$type);
Line 436  sub print_setquota { Line 448  sub print_setquota {
                            coursequota   => 20,                             coursequota   => 20,
                            uploadquota   => 500,                             uploadquota   => 500,
                          );                           );
     my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.instcode'],      my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.coursecode'],
                                         $cdom,$cnum);                                          $cdom,$cnum);
     my $coursequota = $settings{'internal.coursequota'};      my $coursequota = $settings{'internal.coursequota'};
     my $uploadquota = $settings{'internal.uploadquota'};      my $uploadquota = $settings{'internal.uploadquota'};
Line 447  sub print_setquota { Line 459  sub print_setquota {
         my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);          my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
         if ($type eq 'Community') {          if ($type eq 'Community') {
             $uploadquota = $domdefs{$lctype.'quota'};              $uploadquota = $domdefs{$lctype.'quota'};
         } elsif ($settings{'internal.instcode'}) {          } elsif ($settings{'internal.coursecode'}) {
             $uploadquota = $domdefs{'officialquota'};              $uploadquota = $domdefs{'officialquota'};
           } elsif ($settings{'internal.textbook'}) {
               $uploadquota = $domdefs{'textbookquota'};
         } else {          } else {
             $uploadquota = $domdefs{'unofficialquota'};              $uploadquota = $domdefs{'unofficialquota'};
         }          }
Line 994  sub modify_course { Line 1008  sub modify_course {
     $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".      $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
              '<p>'.$reply.'</p>'."\n".               '<p>'.$reply.'</p>'."\n".
              '<form action="/adm/modifycourse" method="post" name="processparms">'.               '<form action="/adm/modifycourse" method="post" name="processparms">'.
              &hidden_form_elements().               &hidden_form_elements();
              '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.      my @actions =
              &mt('Pick another action').'</a>';          ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
                    &mt('Pick another action').'</a>');
     if ($numwarnings) {      if ($numwarnings) {
         my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;          my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
         my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.          my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
                                              '=1&destinationurl=/adm/populate','&<>"');                                               '=1&destinationurl=/adm/populate','&<>"');
   
         $reply .= '<br /><a href="'.$escuri.'">'.          push(@actions, '<a href="'.$escuri.'">'.
                   &mt('Go to Automated Enrollment Manager for course').'</a>';                    &mt('Go to Automated Enrollment Manager for course').'</a>');
     }      }
     $reply .= '</form>';      $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
     $r->print($reply);      $r->print($reply);
     return;      return;
 }  }
Line 1238  sub modify_quota { Line 1253  sub modify_quota {
                     }                      }
                     $r->print('<p>');                      $r->print('<p>');
                     if ($type eq 'Community') {                      if ($type eq 'Community') {
                         $r->print(&mt('Disk usage [_1] exceeds the quota for this community.',$newoverquota).' '.                          $r->print(&mt("Disk usage $newoverquota exceeds the quota for this community.").' '.
                                   &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.'));                                    &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.'));
                     } else {                      } else {
                         $r->print(&mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.                          $r->print(&mt("Disk usage $newoverquota exceeds the quota for this course.").' '.
                                   &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.'));                                    &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.'));
                     }                      }
                     $r->print('</p>');                      $r->print('</p>');
Line 1636  sub hidden_form_elements { Line 1651  sub hidden_form_elements {
 sub showcredits {  sub showcredits {
     my ($dom) = @_;      my ($dom) = @_;
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);      my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {      if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) {
         return 1;          return 1;
     }      }
 }  }

Removed from v.1.64  
changed lines
  Added in v.1.69


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>