--- loncom/interface/loncreateuser.pm	2008/08/27 22:00:11	1.249.2.7
+++ loncom/interface/loncreateuser.pm	2008/11/27 15:15:06	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.249.2.7 2008/08/27 22:00:11 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.264 2008/11/27 15:15:06 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,11 +33,13 @@ package Apache::loncreateuser;
 
 =head1 NAME
 
-Apache::loncreateuser - handler to create users and custom roles
+Apache::loncreateuser.pm
 
 =head1 SYNOPSIS
 
-Apache::loncreateuser provides an Apache handler for creating users,
+    Handler to create users and custom roles
+
+    Provides an Apache handler for creating users,
     editing their login parameters, roles, and removing roles, and
     also creating and assigning custom roles.
 
@@ -833,10 +835,10 @@ ENDNOPORTPRIV
                 $addrolesdisplay = $add_domainroles;
             }
             $r->print(&course_level_dc($env{'request.role.domain'},'Course'));
-            $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");
         } elsif ($context eq 'author') {
             if ($addrolesdisplay) {
-                $r->print('<br /><input type="button" value="'.&mt('Modify User').'"');
+                $r->print('<br /><input type="button" value="'.&mt('Save').'"');
                 if ($newuser) {
                     $r->print(' onClick="auth_check()" \>'."\n");
                 } else {
@@ -848,7 +850,7 @@ ENDNOPORTPRIV
             }
         } else {
             $r->print(&course_level_table(%inccourses));
-            $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setSections(this.form)" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");
         }
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -1448,7 +1450,7 @@ sub personal_data_display {
                     $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
                 } else {
                     if ($context eq 'selfcreate') {
-                        if ($canmodify{$item}) {
+                        if ($canmodify{$item}) { 
                             $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
                             $editable ++;
                         } else {
@@ -1859,9 +1861,9 @@ sub update_user_data {
             if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
                 $env{'form.cid'} = $userenv{'id'};
                 $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
-                                    .'<br />'
-                                    .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
-                                    .'<br />'."\n";        
+                                   .'<br />'
+                                   .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
+                                   .'<br />'."\n";
             }
         }
         if ($env{'form.cid'} ne $userenv{'id'}) {
@@ -2605,7 +2607,7 @@ sub custom_role_editor {
     my @template_roles = ("cc","in","ta","ep","st");
     foreach my $role (@template_roles) {
         $head_script .= &make_script_template($role);
-        $button_code .= &make_button_code($role);
+        $button_code .= &make_button_code($role).' ';
     }
     $head_script .= "\n".$jsback."\n".'</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
@@ -2625,10 +2627,15 @@ sub custom_role_editor {
 		    'crl'  => "Course Level",
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level");
-    $r->print(&mt('Select a Template').'<br />');
-    $r->print('<form action="">');
-    $r->print($button_code);
-    $r->print('</form>');
+
+    $r->print('<div>'
+             .'<form action=""><fieldset>'
+             .'<legend>'.&mt('Select a Template').'</legend>'
+             .$button_code
+             .'</fieldset></form>'
+             .'</div>'
+    );
+
     $r->print(<<ENDCCF);
 <form name="form1" method="post">
 <input type="hidden" name="phase" value="set_custom_roles" />
@@ -2731,7 +2738,7 @@ sub make_script_template {
 sub make_button_code {
     my ($role) = @_;
     my $label = &Apache::lonnet::plaintext($role);
-    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';    
+    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
 # ---------------------------------------------------------- Call to definerole
@@ -3622,15 +3629,15 @@ sub visible_in_cat {
         $cathash = $domconf{'coursecategories'}{'cats'};
     }
     if ($settable{'togglecats'} && $settable{'categorize'}) {
-        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
+        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');   
     } elsif ($settable{'togglecats'}) {
-        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.');
+        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.'); 
     } elsif ($settable{'categorize'}) {
-        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');
+        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');  
     } else {
-        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.');
+        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.'); 
     }
-
+     
     my %currsettings =
         &Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
                              $cdom,$cnum);
@@ -3640,7 +3647,7 @@ sub visible_in_cat {
             $cathash = $domconf{'coursecategories'}{'cats'};
             if (ref($cathash) eq 'HASH') {
                 if ($cathash->{'instcode::0'} eq '') {
-                    push(@vismsgs,'dc_addinst');
+                    push(@vismsgs,'dc_addinst'); 
                 } else {
                     $visible = 1;
                 }
@@ -3679,7 +3686,7 @@ sub visible_in_cat {
                         }
                     }
                     if (!$matched) {
-                        if ($settable{'categorize'}) {
+                        if ($settable{'categorize'}) { 
                             push(@vismsgs,'chgcat');
                         } else {
                             push(@vismsgs,'dc_chgcat');
@@ -3690,7 +3697,7 @@ sub visible_in_cat {
         }
     } else {
         if (ref($cathash) eq 'HASH') {
-            if ((keys(%{$cathash}) > 1) ||
+            if ((keys(%{$cathash}) > 1) || 
                 (keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} eq '')) {
                 if ($settable{'categorize'}) {
                     push(@vismsgs,'addcat');
@@ -4885,7 +4892,7 @@ sub update_selfenroll_config {
             }
             $r->print($cansetvis);
         }
-    }
+    } 
     return;
 }