--- loncom/interface/Attic/londropadd.pm	2006/12/21 20:05:20	1.153
+++ loncom/interface/Attic/londropadd.pm	2007/04/17 18:28:44	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.153 2006/12/21 20:05:20 raeburn Exp $
+# $Id: londropadd.pm,v 1.159 2007/04/17 18:28:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,7 +106,7 @@ sub domain_form {
     # Set up domain and server selection forms
     #
     # Get the domains
-    my @domains = &Apache::loncommon::get_domains();
+    my @domains = &Apache::lonnet::all_domains();
     # build up the menu information to be passed to 
     # &Apache::loncommon::linked_select_forms
     my %select_menus;
@@ -117,7 +117,7 @@ sub domain_form {
         $select_menus{$dom}->{'default'}= 'default';
         $select_menus{$dom}->{'select2'}->{'default'} = 'default';
         # Now build up the other items in the second menu
-        my %servers = &Apache::loncommon::get_library_servers($dom);
+        my %servers = &Apache::lonnet::get_servers($dom,'library');
         foreach my $server (keys(%servers)) {
             $select_menus{$dom}->{'select2'}->{$server} 
                                             = "$server $servers{$server}";
@@ -766,7 +766,7 @@ sub enroll_single_student {
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
-            my %home_servers =&Apache::loncommon::get_library_servers($domain);
+            my %home_servers =&Apache::lonnet::get_servers($domain,'library');
             if (! exists($home_servers{$desiredhost})) {
                 $r->print('<font color="#ff0000">'.&mt('Error').':</font>'.
                           &mt('Invalid home server specified'));
@@ -822,6 +822,7 @@ sub enroll_single_student {
     } else {
         $r->print(&mt('Invalid username or domain'));
     }    
+    $r->print("<p><a href='/adm/dropadd?action=enrollstudent'>".&mt("Enroll another student")."</a></p>");
 }
 
 sub setup_date_selectors {
@@ -948,11 +949,11 @@ sub get_student_username_domain_form {
 <input type="hidden" name="state"  value="gotusername" />
 <h3>$lt{'eos'}</h3>
 <table>
-<tr><th>$lt{'usr'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cuname">$lt{'usr'}</label>:</td>
     <td><input type="text" name="cuname"  size="15" /></td></tr>
-<tr><th>$lt{'dom'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cudomain">$lt{'dom'}</label>:</td>
     <td>$domform</td></tr>
-<tr><th>&nbsp;</th>
+<tr><td>&nbsp;</td>
     <td>
     <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
     </td></tr>
@@ -996,7 +997,7 @@ sub print_enroll_single_student_form {
         #
         # Set up domain selection form
         my $homeserver_form = '';
-        my %servers = &Apache::loncommon::get_library_servers($domain);
+        my %servers = &Apache::lonnet::get_servers($domain,'library');
         $homeserver_form = '<select name="lcserver" size="1">'."\n".
             '<option value="default" selected>default</option>'."\n";
         while (my ($servername,$serverdescription) = each (%servers)) {
@@ -1021,17 +1022,17 @@ sub print_enroll_single_student_form {
         $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>
 <table>
-<tr><th>$lt{'fn'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
     <td><input type="text" name="cfirst"  size="15"></td></tr>
-<tr><th>$lt{'mn'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
     <td><input type="text" name="cmiddle" size="15"></td></tr>
-<tr><th>$lt{'ln'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
     <td><input type="text" name="clast"   size="15"></td></tr>
-<tr><th>$lt{'gen'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
     <td><input type="text" name="cgen"    size="5"> </td></tr>
-<tr><th>$lt{'hs'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="lcserver">$lt{'hs'}</label>:</td>
     <td>$homeserver_form</td></tr>
-<tr><th>$lt{'mail'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
     <td><input type="text" name="emailaddress" size="20" /></td></tr>
 </table>
 <h3>$lt{'pswd'}</h3>
@@ -1061,23 +1062,23 @@ END
 <h3>$lt{'udf'} $username\@$domain</h3>
 <input type="hidden" name="lcserver" value="default" />
 <table>
-<tr><th>$lt{'fn'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
     <td>
     <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />
     </td></tr>
-<tr><th>$lt{'mn'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
     <td>
     <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />
     </td></tr>
-<tr><th>$lt{'ln'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
     <td>
     <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />
     </td></tr>
-<tr><th>$lt{'gen'}:</th>
-    <td>
+<tr><td><label for="cgen">$lt{'gen'}</label>:</td>
+    <td class="LC_dropadd_labeltext">
     <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
     </td></tr>
-<tr><th>$lt{'mail'}:</th>
+<tr><td><label for="emailaddress">$lt{'mail'}</label>:</td>
     <td>
     <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />
     </td></tr>
@@ -1142,13 +1143,13 @@ $user_data_html
 
 <h3>$lt{'cd'}</h3>
 
-<p>$lt{'gs'}: <input type="text" name="csec" size="5" />
+<p><label for="csec">$lt{'gs'}</label>: <input type="text" name="csec" size="5" />
 <p>
 $date_table
 </p>
 <h3>$lt{'idsn'}</h3>
 <p>
-$lt{'idsn'}: <input type="text" name="cstid" size="10">
+<label for="cstid">$lt{'idsn'}</label>: <input type="text" name="cstid" size="10">
 </p><p>
 <label>
 <input type="checkbox" name="forceid" value="yes"> 
@@ -1233,9 +1234,9 @@ sub print_html_classlist {
             $output_selector .= "\n".$option;
         }
         $output_selector .= '</select>';
-        $r->print(&mt('Output Format: [_1]',$output_selector).('&nbsp;'x3));
+        $r->print('<label>'.&mt('Output Format: [_1]',$output_selector).'</label>'.('&nbsp;'x3));
     }
-    $r->print(&mt('Student Status: [_1]',$status_select)."\n");
+    $r->print('<label>'.&mt('Student Status: [_1]',$status_select)."</label>\n");
     $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
               "\n</p>\n");
     #
@@ -2170,7 +2171,7 @@ sub upfile_drop_add {
     if (lc($desiredhost) eq 'default') {
         $desiredhost = undef;
     } else {
-        my %home_servers = &Apache::loncommon::get_library_servers($domain);
+        my %home_servers = &Apache::lonnet::get_servers($domain,'library');
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
                       &mt('Invalid home server specified'));
@@ -2204,7 +2205,7 @@ sub upfile_drop_add {
             $amode = ''; # This causes the loop below to be skipped
         }
     }
-    if ( $domain eq &clean_domain($domain)
+    if ( $domain eq &LONCAPA::clean_domain($domain)
 	&& ($amode ne '')) {
         #######################################
         ##         Enroll Students           ##