--- loncom/interface/loncreateuser.pm	2024/09/03 03:45:35	1.482
+++ loncom/interface/loncreateuser.pm	2025/02/26 15:39:20	1.484
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.482 2024/09/03 03:45:35 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.484 2025/02/26 15:39:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2853,7 +2853,7 @@ sub personal_data_display {
     }
 
     my $genhelp=&Apache::loncommon::help_open_topic('Generation');
-    $output = '<h3>'.$lt{'pd'}.'</h3>'.
+    $output = '<h3 class="LC_heading_3">'.$lt{'pd'}.'</h3>'.
               &Apache::lonhtmlcommon::start_pick_box();
     if (($context eq 'selfcreate') && ($newuser eq 'email')) {
         my $size = 25;
@@ -2869,9 +2869,9 @@ sub personal_data_display {
                 undef($condition);
             }
         }
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
+        $output .= &Apache::lonhtmlcommon::row_title('<label for="uname_selfcreate">'.$lt{'email'}.'</label><b>*</b>',undef,
                                                      'LC_oddrow_value')."\n".
-                   '<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />';
+                   '<input type="text" name="uname" id="uname_selfcreate" size="'.$size.'" value="" autocomplete="off" />';
         if ($condition) {
             $output .= $condition;
         } elsif ($excluded) {
@@ -2890,14 +2890,14 @@ sub personal_data_display {
         }
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
-        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="new-password" />';
-        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="new-password" />';
-        $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
+        my $upassone = '<input type="password" name="upass'.$now.'" id="upass_selfcreate" size="20" autocomplete="new-password" />';
+        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" id="upasscheck_selfcreate" size="20" autocomplete="new-password" />';
+        $output .= &Apache::lonhtmlcommon::row_title('<label for="upass_selfcreate">'.&mt('Password').'</label><b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
                    $upassone."\n".
                    &Apache::lonhtmlcommon::row_closure(1)."\n".
-                   &Apache::lonhtmlcommon::row_title(&mt('Confirm password').'<b>*</b>',
+                   &Apache::lonhtmlcommon::row_title('<label for="upasscheck_selfcreate">'.&mt('Confirm password').'</label><b>*</b>',
                                                      'LC_pick_box_title',
                                                      'LC_oddrow_value')."\n".
                    $upasstwo.
@@ -2911,59 +2911,85 @@ sub personal_data_display {
                        '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
                        &mt('No').'</label></span>'."\n".
                        '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
-                       '<br /><span class="LC_nobreak">'.&mt('Preferred username').
+                       '<br /><span class="LC_nobreak"><label>'.&mt('Preferred username').
                        '&nbsp;<input type="text" name="username" value="" size="20" autocomplete="off"/>'.
-                       '</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1);
+                       '</label></span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1);
             $rowcount ++;
         }
     }
+    my %shownfields;
+    if ($env{'request.role.domain'} ne $ccdomain) {
+        my %shownfields_by_type =
+            &Apache::lonuserutils::get_othdom_shownfields($ccdomain,\@userinfo);
+        my @types = split(/:/,$userenv{'inststatus'});
+        if (@types == 0) {
+            @types = ('default');
+        }
+        foreach my $type (@types) {
+            if (ref($shownfields_by_type{$type}) eq 'HASH') {
+                foreach my $field (keys(%{$shownfields_by_type{$type}})) {
+                    if ($shownfields_by_type{$type}{$field}) {
+                        $shownfields{$field} = 1;
+                    }
+                }
+            }
+        }
+    }
     foreach my $item (@userinfo) {
         my $rowtitle = $lt{$item};
         my $hiderow = 0;
         if ($item eq 'generation') {
             $rowtitle = $genhelp.$rowtitle;
         }
-        my $row = &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
+        my $row = &Apache::lonhtmlcommon::row_title('<label for="userinfo_'.$item.'">'.$rowtitle.'</label>',undef,'LC_oddrow_value')."\n";
         if ($newuser) {
             if (ref($inst_results) eq 'HASH') {
                 if ($inst_results->{$item} ne '') {
-                    $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
+                    $row .= '<input type="hidden" name="c'.$item.'" id="userinfo_'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
                 } else {
                     if ($context eq 'selfcreate') {
                         if ($canmodify{$item}) {
-                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
+                            $row .= '<input type="text" name="c'.$item.'" id="userinfo_'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
                             $editable ++;
                         } else {
                             $hiderow = 1;
                         }
                     } else {
-                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
+                        $row .= '<input type="text" name="c'.$item.'" id="userinfo_'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
                     }
                 }
             } else {
                 if ($context eq 'selfcreate') {
                     if ($canmodify{$item}) {
                         if ($newuser eq 'email') {
-                            $row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
+                            $row .= '<input type="text" name="'.$item.'" id="userinfo_'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
                         } else {
-                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
+                            $row .= '<input type="text" name="c'.$item.'" id="userinfo_'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
                         }
                         $editable ++;
                     } else {
                         $hiderow = 1;
                     }
                 } else {
-                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
+                    $row .= '<input type="text" name="c'.$item.'" id="userinfo_'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
                 }
             }
         } else {
             if ($canmodify{$item}) {
-                $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
+                $row .= '<input type="text" name="c'.$item.'" id="userinfo_'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
                 if (($item eq 'id') && (!$newuser)) {
                     $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
                 }
             } else {
-                $row .= $userenv{$item};
+                if ($env{'request.role.domain'} ne $ccdomain) {
+                    if ($shownfields{$item}) {
+                        $row .= $userenv{$item};
+                    } else {
+                        $row .= &mt('not shown');
+                    }
+                } else {
+                    $row .= $userenv{$item};
+                }
             }
         }
         $row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -3019,7 +3045,8 @@ sub personal_data_display {
         }
         if ($showsubmit) {
             my $submit_text = &mt('Create account');
-            $output .= &Apache::lonhtmlcommon::row_title()."\n".
+            $output .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.
+                                                         &mt('Submit').'</span>','','','',1)."\n".
                        '<br /><input type="submit" name="createaccount" value="'.
                        $submit_text.'" />';
             if ($usertype ne '') {