Diff for /loncom/interface/lonmodifycourse.pm between versions 1.62 and 1.67

version 1.62, 2013/07/19 18:24:16 version 1.67, 2014/02/27 11:44:40
Line 449  sub print_setquota { Line 449  sub print_setquota {
             $uploadquota = $domdefs{$lctype.'quota'};              $uploadquota = $domdefs{$lctype.'quota'};
         } elsif ($settings{'internal.instcode'}) {          } elsif ($settings{'internal.instcode'}) {
             $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 996  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 1241  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 1252  sub modify_quota { Line 1255  sub modify_quota {
                               '<b>'.$updatedsettings{'internal.uploadquota'}.'</b>').'<br />');                                '<b>'.$updatedsettings{'internal.uploadquota'}.'</b>').'<br />');
             }              }
         } else {          } else {
             $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content.').              $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content: ').
                       $putreply);                        $putreply);
         }          }
     }      }
Line 1636  sub hidden_form_elements { Line 1639  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.62  
changed lines
  Added in v.1.67


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