--- loncom/auth/lonroles.pm	2010/01/02 19:06:39	1.231.4.8
+++ loncom/auth/lonroles.pm	2009/10/26 15:54:20	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.231.4.8 2010/01/02 19:06:39 raeburn Exp $
+# $Id: lonroles.pm,v 1.235 2009/10/26 15:54:20 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,8 +158,12 @@ sub redirect_user {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
 
+    # Breadcrumbs
+    my $brcrum = [{'href' => $url,
+                   'text' => 'Switching Role'},];
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
-                                                    {'redirect' => [1,$url]});
+                                                    {'redirect' => [1,$url],
+                                                     'bread_crumbs' => $brcrum,});
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -185,17 +189,25 @@ sub error_page {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
-    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
+    # Breadcrumbs
+    my $brcrum = [{'href' => $dest,
+                   'text' => 'Problems during Course Initialization'},];
+    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
+    $r->print(
         '<script type="text/javascript">'.
         '// <![CDATA['.
         &Apache::lonmenu::rawconfig().
         '// ]]>'.
         '</script>'.
 	      '<p class="LC_error">'.&mt('The following problems occurred:').
-              '<br />'.
+          '<br />'.
 	      $error.
-	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
-              &Apache::loncommon::end_page());
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
+    );
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub handler {
@@ -659,7 +671,7 @@ ENDHEADER
             if ($reinit) {
                 $r->print(
  '<h3><span class="LC_error">'.
- &mt('As your session file for the course or community has expired, you will need to re-select the course.').'</span></h3>');
+ &mt('As your session file for the course or community has expired, you will need to re-select it.').'</span></h3>');
             } else {
 	        $r->print(
  '<h3><span class="LC_error">'.
@@ -692,16 +704,15 @@ ENDHEADER
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
     if ($env{'user.adv'}) {
+        $r->print(
+              '<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
         if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-        $r->print(' />'.&mt('Show all roles').'</label>'
-                 .' <input type="submit" value="'.&mt('Update display').'" />'
-                 .'</p>');
+        $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></p>');
     } else {
         if ($countactive > 0) {
             &queued_selfenrollment($r);
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-
             $r->print(
                 '<p>'
                .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
@@ -726,7 +737,7 @@ ENDHEADER
 	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
 	}
         &findcourse_advice($r);
-        &requestcourse_advice($r);
+        &requestcourse_advice($r); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1098,7 +1109,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
+    my @types = ('Domain','Construction Space','Course','Unavailable','System');
     return @types; 
 }
 
@@ -1162,7 +1173,7 @@ sub findcourse_advice {
     }
     $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
               '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
+    $r->print(&mt('You can search the Course/Community Catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
     &queued_selfenrollment($r);
     return;
 }
@@ -1175,22 +1186,16 @@ sub requestcourse_advice {
     &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
     if (keys(%request_doms) > 0) {
         my ($types,$typename) = &Apache::loncommon::course_types();
-        if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+        if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { 
             $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
-                      '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
+                      '<p>'.&mt('You have rights to create courses and/or communities in the following domain(s):').'<ul>');
             my (@reqdoms,@reqtypes);
             foreach my $type (sort(keys(%request_doms))) {
-                push(@reqtypes,$type);
+                push(@reqtypes,$type); 
                 if (ref($request_doms{$type}) eq 'ARRAY') {
                     my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
-                    $r->print(
-                        '<li>'
-                       .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
-                            '<i>',
-                            '</i>',
-                            '<b>'.$domstr.'</b>')
-                       .'</li>'
-                    );
+                    $r->print(&mt('[_1] in domain: [_2]',
+                              '<li><i>'.$typename->{$type}.'</i>','<b>'.$domstr.'</b></li>'));
                     foreach my $dom (@{$request_doms{$type}}) {
                         unless (grep(/^\Q$dom\E/,@reqdoms)) {
                             push(@reqdoms,$dom);
@@ -1213,7 +1218,7 @@ sub requestcourse_advice {
             }
             if (@reqdoms == 1 || @showtypes > 0) {
                 $requrl .= '&state=crstype&action=new';
-            }
+            } 
             $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
         }
     }
@@ -1526,7 +1531,7 @@ sub courselink {
 
 sub coursepick_jscript {
     my %lt = &Apache::lonlocal::texthash(
-                  plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
+                  plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course or community you wish to enter.",
                   youc => 'You can only use this screen to select courses and communities in the current domain.',
              );
     my $verify_script = <<"END";