--- loncom/interface/Attic/londropadd.pm	2004/01/21 00:29:56	1.91.2.2
+++ loncom/interface/Attic/londropadd.pm	2003/12/08 21:01:03	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.91.2.2 2004/01/21 00:29:56 albertel Exp $
+# $Id: londropadd.pm,v 1.92 2003/12/08 21:01:03 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,6 @@ use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common :http REDIRECT);
 use Spreadsheet::WriteExcel;
 use Apache::lonlocal;
-use localenroll();
 
 ###############################################################
 ###############################################################
@@ -172,14 +171,10 @@ sub print_main_menu {
     <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
 </font>
 </p><p>
-END
-    if (&localenroll::run() ) {
-	$r->print(<<END);
 <font size="+1">
     <a href="/adm/populate">$Text{'populate'}</a>
 </font>
 END
-    }
 }
 
 ###############################################################
@@ -240,7 +235,7 @@ sub print_upload_manager_header {
 ###############################################################
 ###############################################################
 sub javascript_validations {
-    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield)=@_;
+    my ($mode,$krbdefdom)=@_;
     my $authheader;
     if ($mode eq 'auth') {
         my %param = ( formname => 'studentform',
@@ -250,15 +245,7 @@ sub javascript_validations {
         my %param = ( formname => 'ccrs',
                   kerb_def_dom => $krbdefdom );
         $authheader = &Apache::loncommon::authform_header(%param);
-    } elsif ($mode eq 'modifycourse') {
-        my %param = ( formname => 'cmod',
-                  kerb_def_dom => $krbdefdom,
-                  mode => 'modifycourse',
-                  curr_authtype => $curr_authtype,
-                  curr_autharg => $curr_authfield );
-        $authheader = &Apache::loncommon::authform_header(%param);
     }
-
     
     my %alert = &Apache::lonlocal::texthash
         (username => 'You need to specify the username field.',
@@ -276,59 +263,24 @@ sub javascript_validations {
     my $function_name =(<<END);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
 END
-    my $auth_checks;
-    if ($mode eq 'createcourse') {
-        $auth_checks .= (<<END);
-    if (vf.autoadds[0].checked == true) {
-        if (current.radiovalue == null || current.radiovalue == 'nochange') {
-            alert('$alert{'authen'}');
-            return;
-        }
-    }
+    my $auth_checks = (<<END);
+    var foundatype=0;
 END
-    } else {
+    unless ($mode eq 'createcourse') {
         $auth_checks .= (<<END);
-    var foundatype=0;
     if (founduname==0) {
 	alert('$alert{'username'}');
         return;
     }
+END
+    }
+    $auth_checks .= (<<END);
     // alert('current.radiovalue = '+current.radiovalue);
     if (current.radiovalue == null || current.radiovalue == 'nochange') {
         // They did not check any of the login radiobuttons.
         alert('$alert{'authen'}');
         return;
     }
-END
-    }
-    if ($mode eq 'createcourse') {
-        $auth_checks .= "
-    if ( (vf.autoadds[0].checked == true) &&
-         (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') ) {
-";
-    } elsif ($mode eq 'modifycourse') {
-        $auth_checks .= " 
-    if (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') {
-";
-    }
-    if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
-        $auth_checks .= (<<END);
-        var alertmsg = '';
-        switch (current.radiovalue) {
-            case 'krb':
-                alertmsg = '$alert{'krb'}';
-                break;
-            default:
-                alertmsg = '';
-        }
-        if (alertmsg != '') {
-            alert(alertmsg);
-            return;
-        }
-    }
-END
-    } else {
-        $auth_checks .= (<<END);
     foundatype=1;
     if (current.argfield == null || current.argfield == '') {
         var alertmsg = '';
@@ -352,9 +304,8 @@ END
         }
     }
 END
-    }
     my $optional_checks = '';
-    if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+    if ($mode eq 'createcourse') {
         $optional_checks = (<<END);
     vf.submit();
 }
@@ -397,11 +348,11 @@ END
 END
     }
     my $result = $function_name;
-    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
+    if ( ($mode eq 'auth') || ($mode eq 'createcourse') ) {
         $result .= $auth_checks;
     }
     $result .= $optional_checks;
-    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
+    if ( ($mode eq 'auth') || ($mode eq 'createcourse') ) {
         $result .= $authheader;
     }
     return $result;
@@ -1025,7 +976,7 @@ END
 # ========================================================= Menu Phase Two Drop
 sub print_drop_menu {
     my $r=shift;
-    $r->print("<h3>Drop Students</h3>");
+    $r->print("<h3>".&mt('Drop Students')."</h3>");
     my $cid=$ENV{'request.course.id'};
     my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
@@ -1144,7 +1095,7 @@ END
             $r->print('"'.join('","',("username","domain","ID","student name",
                                       "section","status")).'"'."\n");
         } else {
-            $r->print('"'.join('","',("username","domain","ID","student name",
+            $r->print('"'.join('","',(&mt("username"),"domain","ID","student name",
                                       "section")).'"'."\n");
         }
     } elsif ($mode eq 'excel') {
@@ -1563,7 +1514,7 @@ END
 <tr>
     <th>&nbsp;</th>
     <th>username</th>
-    <th>domain</th>
+    <th>domaind</th>
     <th>ID</th>
     <th>student name</th>
     <th>section</th>
@@ -1571,19 +1522,23 @@ END
 END
 
     } else  {
+        my $wordusername=&mt('username');
+        my $worddomain=&mt('domain');
+        my $wordstudentname=&mt('student name');
+        my $wordsection=&mt('section');
         $r->print(<<END);
 <table border=2>
 <tr><th>&nbsp;</th>
     <th>
-       <a href="/adm/dropadd?action=$action&sortby=username">username</a>
+       <a href="/adm/dropadd?action=$action&sortby=username">$wordusername</a>
     </th><th>
-       <a href="/adm/dropadd?action=$action&sortby=domain">domain</a>
+       <a href="/adm/dropadd?action=$action&sortby=domain">$worddomain</a>
     </th><th>
        <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
     </th><th>
-       <a href="/adm/dropadd?action=$action&sortby=fullname">student name</a>
+       <a href="/adm/dropadd?action=$action&sortby=fullname">$wordstudentname</a>
     </th><th>
-       <a href="/adm/dropadd?action=$action&sortby=section">section</a>
+       <a href="/adm/dropadd?action=$action&sortby=section">$wordsection</a>
     </th>
 </tr>
 END
@@ -1627,11 +1582,14 @@ END
 END
     }
     $r->print('</table><br>');
+    my $DropStudents=&mt('Drop Students');
+    my $CheckAll=&mt('check all');
+    my $UncheckAll=&mt('uncheck all');
     $r->print(<<"END");
 </p><p>
-<input type="button" value="check all" onclick="javascript:checkAll(document.studentform.droplist)"> &nbsp;
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.droplist)"> 
-<p><input type=submit value="Drop Students"></p>
+<input type="button" value="$CheckAll" onclick="javascript:checkAll(document.studentform.droplist)"> &nbsp;
+<input type="button" value="$UncheckAll" onclick="javascript:uncheckAll(document.studentform.droplist)"> 
+<p><input type=submit value="$DropStudents"></p>
 END
     return;
 }
@@ -1653,10 +1611,10 @@ sub print_first_courselist_upload_form {
     $str .= '<input type="checkbox" name="noFirstLine" /> '.
         &mt('Ignore First Line')."</p>\n";
     $str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
-                         "How do I create a class list from a spreadsheet").
+                         &mt("How do I create a class list from a spreadsheet")).
                              "<br />\n";
     $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
-                           "How do I create a CSV file from a spreadsheet").
+                           &mt("How do I create a CSV file from a spreadsheet")).
                                "<br />\n";
     $str .= "</body>\n</html>\n";
     $r->print($str);