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

[raeburn]

raeburn		Sun Dec 29 02:02:29 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11
    Backport 1.373, 1.374
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269.2.41 loncom/auth/lonroles.pm:1.269.2.42
--- loncom/auth/lonroles.pm:1.269.2.41	Thu Jul  4 02:04:57 2024
+++ loncom/auth/lonroles.pm	Sun Dec 29 02:02:29 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.41 2024/07/04 02:04:57 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.42 2024/12/29 02:02:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -639,7 +639,7 @@
 						     $env{'user.name'},
                                                      &mt('Assigned from [_1] at [_2] for [_3]'
                                                         ,$ip
-                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,&Apache::lonlocal::locallocaltime($now)
                                                         ,$trolecode)
                                                      );
 				 unless ($assignresult eq 'ok') {
@@ -1077,14 +1077,16 @@
     if ($domdefs{'catauth'}) {
         $cattype = $domdefs{'catauth'};
     }
-    my ($funcs,$crumbsright);
+    my ($funcs,$crumbsright,$crumbs_style);
     $funcs = &get_roles_functions($showcount,$cattype);
     if ($env{'browser.mobile'}) {
         $crumbsright = $funcs;
         undef($funcs);
+        $crumbs_style = 'overflow: visible;';
     }
     my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum,
-                                                                    bread_crumbs_component=>$crumbsright});
+                                                                    bread_crumbs_component=>$crumbsright,
+                                                                    bread_crumbs_style=>$crumbs_style,});
     &js_escape(\$standby);
     my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
@@ -1998,7 +2000,7 @@
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
-    if (($trolecode !~ m/^(dc|ca|au|aa)\./) && (!$skipcal)) {
+    if (($trolecode !~ m/^(ca|aa)\./) && ($trest ne '') && (!$skipcal)) {
 	$tremark.=&Apache::lonannounce::showday(time,1,
 			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
     }