--- loncom/interface/loncreateuser.pm	2012/12/28 04:12:32	1.370
+++ loncom/interface/loncreateuser.pm	2013/02/06 16:10:27	1.373
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.370 2012/12/28 04:12:32 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.373 2013/02/06 16:10:27 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1672,7 +1672,7 @@ sub display_existing_roles {
                 }
             }
             if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
-                $carea.='<br />Section: '.$3;
+                $carea.='<br />'.&mt('Section: [_1]',$3);
                 $sortkey.="\0$3";
                 if (!$allowed) {
                     if ($env{'request.course.sec'} eq $3) {
@@ -3062,7 +3062,7 @@ sub display_userinfo {
                    ref($newsetting) eq 'HASH' &&
                    ref($newsettingtext) eq 'HASH');
     my %lt=&Apache::lonlocal::texthash(
-         'ui'             => 'User Information (unchanged)',
+         'ui'             => 'User Information',
          'uic'            => 'User Information Changed',
          'firstname'      => 'First Name',
          'middlename'     => 'Middle Name',
@@ -3083,10 +3083,8 @@ sub display_userinfo {
          'prvs'           => 'Previous Value:',
          'chto'           => 'Changed To:'
     );
-    my $title = $lt{'ui'}; 
     if ($changed) {
-        $title = $lt{'uic'};
-        $r->print('<h4>'.$title.'</h4>'.
+        $r->print('<h3>'.$lt{'uic'}.'</h3>'.
                 &Apache::loncommon::start_data_table().
                 &Apache::loncommon::start_data_table_header_row());
         $r->print("<th>&nbsp;</th>\n");
@@ -3145,6 +3143,9 @@ sub display_userinfo {
             }
         }
         $r->print(&Apache::loncommon::end_data_table().'<br />');
+    } else {
+        $r->print('<h3>'.$lt{'ui'}.'</h3>'.
+                  '<p>'.&mt('No changes made to user information').'</p>');
     }
     return;
 }
@@ -3345,7 +3346,7 @@ sub update_roles {
                 $r->print(&Apache::lonhtmlcommon::confirm_success(
                             &mt('Revoking [_1] in [_2]',
                                 &Apache::lonnet::plaintext($role),
-                                '"'.&cid_to_cname($scope).'"'),
+                                &Apache::loncommon::show_role_extent($scope,$context,$role)),
                                 $result ne "ok").'<br />');
                 if ($result ne "ok") {
                     $r->print(&mt('Error: [_1]',$result).'<br />');
@@ -3367,7 +3368,7 @@ sub update_roles {
                     $env{'form.ccdomain'},$env{'form.ccuname'},$1,$2,$3,$4,'','',$context);
                 $r->print(&Apache::lonhtmlcommon::confirm_success(
                             &mt('Revoking custom role [_1] by [_2] in [_3]',
-                                $4,$3.':'.$2,'"'.&cid_to_cname($1).'"'),
+                                $4,$3.':'.$2,&Apache::loncommon::show_role_extent($1,$context,'cr')),
                             $result ne 'ok').'<br />');
                 if ($result ne "ok") {
                     $r->print(&mt('Error: [_1]',$result).'<br />');
@@ -3388,7 +3389,7 @@ sub update_roles {
                 $r->print(&Apache::lonhtmlcommon::confirm_success(
                             &mt('Deleting [_1] in [_2]',
                                 &Apache::lonnet::plaintext($role),
-                                '"'.&cid_to_cname($scope).'"'),
+                                &Apache::loncommon::show_role_extent($scope,$context,$role)),
                             $result ne 'ok').'<br />');
                 if ($result ne "ok") {
                     $r->print(&mt('Error: [_1]',$result).'<br />');
@@ -3413,7 +3414,7 @@ sub update_roles {
                         $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                         0,1,$context);
                 $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Deleting custom role [_1] by [_2] in [_3]',
-                      $rolename,$rnam.':'.$rdom,'"'.&cid_to_cname($1).'"'),
+                      $rolename,$rnam.':'.$rdom,&Apache::loncommon::show_role_extent($1,$context,'cr')),
                       $result ne "ok").'<br />');
                 if ($result ne "ok") {
                     $r->print(&mt('Error: [_1]',$result).'<br />');
@@ -3442,8 +3443,10 @@ sub update_roles {
                                 $output = &mt('Error: [_1]',$result)."\n";
                             }
                         } else {
-                            $output = &Apache::lonhtmlcommon::confirm_success(&mt('Assigning [_1] in [_2] starting [_3]',&Apache::lonnet::plaintext($role),
-                                        '"'.&cid_to_cname($url).'"',&Apache::lonlocal::locallocaltime($now))).'<br />'.$logmsg.'<br />';
+                            $output = &Apache::lonhtmlcommon::confirm_success(&mt('Assigning [_1] in [_2] starting [_3]',
+                                        &Apache::lonnet::plaintext($role),
+                                        &Apache::loncommon::show_role_extent($url,$context,'st'),
+                                        &Apache::lonlocal::locallocaltime($now))).'<br />'.$logmsg.'<br />';
                         }
                     }
                 } else {
@@ -3451,7 +3454,8 @@ sub update_roles {
                                $env{'form.ccuname'},$url,$role,0,$now,'','',
                                $context);
                         $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
-                                        &Apache::lonnet::plaintext($role),'"'.&cid_to_cname($url).'"'),$result ne "ok").'<br />';
+                                        &Apache::lonnet::plaintext($role),
+                                        &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").'<br />';
                     if ($result ne "ok") {
                         $output .= &mt('Error: [_1]',$result).'<br />';
                     }
@@ -3469,7 +3473,7 @@ sub update_roles {
                                $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
                 $r->print(&Apache::lonhtmlcommon::confirm_success(
                     &mt('Re-enabling custom role [_1] by [_2] in [_3]',
-                        $rolename,$rnam.':'.$rdom,'"'.&cid_to_cname($1).'"'),
+                        $rolename,$rnam.':'.$rdom,&Apache::loncommon::show_role_extent($1,$context,'cr')),
                     $result ne "ok").'<br />');
                 if ($result ne "ok") {
                     $r->print(&mt('Error: [_1]',$result).'<br />');
@@ -3613,7 +3617,7 @@ sub update_roles {
 # Flush the course logs so reverse user roles immediately updated
     $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
     if (@rolechanges == 0) {
-        $r->print(&mt('No roles to modify'));
+        $r->print('<p>'.&mt('No roles to modify').'</p>');
     }
     return @rolechanges;
 }
@@ -4604,7 +4608,8 @@ function updateCols(caller) {
         }
     }
     if (caller == 'showrole') {
-        if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') {
+        if ((document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') ||
+            (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'cr')) {
             document.getElementById('showcolrole').checked = true;
             document.getElementById('showcolrole').disabled = '';
         } else {
@@ -6975,12 +6980,7 @@ sub get_selfenroll_titles {
 #--------------------------------- functions for &phase_two and &phase_three
 
 #--------------------------end of functions for &phase_two and &phase_three
-sub cid_to_cname(){
-    my $courseid = shift;
-    $courseid =~ s/^\///;
-    $courseid =~ s/\//_/;
-    return $env{'course.'.$courseid.'.description'};
-}
+
 1;
 __END__