--- loncom/interface/loncommon.pm	2005/10/13 22:37:40	1.279
+++ loncom/interface/loncommon.pm	2005/11/01 20:47:15	1.281
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.279 2005/10/13 22:37:40 raeburn Exp $
+# $Id: loncommon.pm,v 1.281 2005/11/01 20:47:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1565,10 +1565,11 @@ sub authform_nochange{
               kerb_def_dom => 'MSU.EDU',
               @_,
           );
-    my $result = &mt('[_1] Do not change login data',
+    my $result = '<label>'.&mt('[_1] Do not change login data',
                      '<input type="radio" name="login" value="nochange" '.
                      'checked="checked" onclick="'.
-            "javascript:changed_radio('nochange',$in{'formname'});".'" />');
+            "javascript:changed_radio('nochange',$in{'formname'});".'" />').
+	    '</label>';
     return $result;
 }
 
@@ -1600,14 +1601,15 @@ sub authform_kerberos{
     my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
     my $result .= &mt
         ('[_1] Kerberos authenticated with domain [_2] '.
-         '[_3] Version 4 [_4] Version 5',
-         '<input type="radio" name="login" value="krb" '.
+         '[_3] Version 4 [_4] Version 5 [_5]',
+         '<label><input type="radio" name="login" value="krb" '.
              'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
-         '<input type="text" size="10" name="krbarg" '.
+         '</label><input type="text" size="10" name="krbarg" '.
              'value="'.$krbarg.'" '.
              'onchange="'.$jscall.'" />',
-         '<input type="radio" name="krbver" value="4" '.$check4.' />',
-         '<input type="radio" name="krbver" value="5" '.$check5.' />');
+         '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
+         '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
+	 '</label>');
     return $result;
 }
 
@@ -1632,9 +1634,9 @@ sub authform_internal{
     my $jscall = "javascript:changed_radio('int',$args{'formname'});";
     my $result.=&mt
         ('[_1] Internally authenticated (with initial password [_2])',
-         '<input type="radio" name="login" value="int" '.$intcheck.
+         '<label><input type="radio" name="login" value="int" '.$intcheck.
              ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-         '<input type="text" size="10" name="intarg" '.$intarg.
+         '</label><input type="text" size="10" name="intarg" '.$intarg.
              ' onchange="'.$jscall.'" />');
     return $result;
 }
@@ -1659,9 +1661,9 @@ sub authform_local{
 
     my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
     my $result.=&mt('[_1] Local Authentication with argument [_2]',
-                    '<input type="radio" name="login" value="loc" '.$loccheck.
+                    '<label><input type="radio" name="login" value="loc" '.$loccheck.
                         ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-                    '<input type="text" size="10" name="locarg" '.$locarg.
+                    '</label><input type="text" size="10" name="locarg" '.$locarg.
                         ' onchange="'.$jscall.'" />');
     return $result;
 }
@@ -1675,9 +1677,9 @@ sub authform_filesystem{
     my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
     my $result.= &mt
         ('[_1] Filesystem Authenticated (with initial password [_2])',
-         '<input type="radio" name="login" value="fsys" '.
+         '<label><input type="radio" name="login" value="fsys" '.
          'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-         '<input type="text" size="10" name="fsysarg" value="" '.
+         '</label><input type="text" size="10" name="fsysarg" value="" '.
                   'onchange="'.$jscall.'" />');
     return $result;
 }
@@ -3716,7 +3718,7 @@ the routine &Apache::lonnet::transfer_pr
 my $uniq=0;
 sub get_cgi_id {
     $uniq=($uniq+1)%100000;
-    return (time.'_'.$uniq);
+    return (time.'_'.$$.'_'.$uniq);
 }
 
 ############################################################