[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonroles.pm

[raeburn]

raeburn		Wed Jun  5 15:35:32 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11
    - Backport 1.287, 1.288
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269.2.9 loncom/auth/lonroles.pm:1.269.2.10
--- loncom/auth/lonroles.pm:1.269.2.9	Thu May 23 14:56:40 2013
+++ loncom/auth/lonroles.pm	Wed Jun  5 15:35:32 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.9 2013/05/23 14:56:40 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.10 2013/06/05 15:35:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -697,7 +697,7 @@
                             $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
-                        &redirect_user($r,&mt('Entering Construction Space'),
+                        &redirect_user($r,&mt('Entering Authoring Space'),
                                        $redirect_url);
                         return OK;
                     }
@@ -729,11 +729,13 @@
     my $crumbtext = 'User Roles';
     my $pagetitle = 'My Roles';
     my $recent = &mt('Recent Roles');
+    my $standby = &mt('Role selected. Please stand by.');
     my $show_course=&Apache::loncommon::show_course();
     if ($show_course) {
         $crumbtext = 'Courses';
         $pagetitle = 'My Courses';
         $recent = &mt('Recent Courses');
+        $standby = &mt('Course selected. Please stand by.');
     }
     my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
 
@@ -1161,7 +1163,7 @@
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
+                    $ttype='Authoring Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
                         ': '.$tdom.'<br />'.
                         ' '.&mt('Server').': '.$home;
@@ -1180,7 +1182,7 @@
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
+                    $ttype='Authoring Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
                         ': '.$home;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
@@ -1353,7 +1355,7 @@
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
+    my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -1492,7 +1494,7 @@
 	my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
 	if ($trest) {
 	    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
-		$ttype='Construction Space';
+		$ttype='Authoring Space';
 		$twhere='User: '.$trest.', Domain: '.$tdom;
 	    } else {
 		$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);