version 1.507, 2021/06/07 03:32:02
|
version 1.510, 2021/09/21 22:54:26
|
Line 295 sub primary_menu {
|
Line 295 sub primary_menu {
|
# users |
# users |
next if $$menuitem[4] eq 'roles' ##show links depending on |
next if $$menuitem[4] eq 'roles' ##show links depending on |
&& (&Apache::loncommon::show_course() ##term 'Courses' or |
&& (&Apache::loncommon::show_course() ##term 'Courses' or |
|| $env{'request.lti.login'}); ##'Roles' wanted |
|| $lti); ##'Roles' wanted |
next if $$menuitem[4] eq 'courses' ##and not LTI access |
next if $$menuitem[4] eq 'courses' ##and not LTI access |
&& (!&Apache::loncommon::show_course() |
&& (!&Apache::loncommon::show_course() |
|| !$env{'request.lti.login'}); |
|| $lti); |
next if $$menuitem[4] eq 'notlti' |
next if $$menuitem[4] eq 'notlti' |
&& $lti; |
&& $lti; |
next if $$menuitem[4] eq 'ltiexc' |
next if $$menuitem[4] eq 'ltiexc' |
Line 316 sub primary_menu {
|
Line 316 sub primary_menu {
|
$position = 'right'; |
$position = 'right'; |
} |
} |
if ($env{'request.course.id'} && $menucoll) { |
if ($env{'request.course.id'} && $menucoll) { |
next if (($menuitem->[6]) && (!$menuopts{$menuitem->[6]})); |
if (($menuitem->[6]) && (!$menuopts{$menuitem->[6]})) { |
|
if ($menuitem->[6] eq 'pers') { |
|
if ($menuopts{'name'} && !$ltiexc{'fullname'} && |
|
$env{'user.name'} && $env{'user.domain'}) { |
|
$menu{$position} .= '<li><a href="#">'. |
|
&Apache::loncommon::plainname($env{'user.name'}, |
|
$env{'user.domain'}).'</a></li>'; |
|
next; |
|
} else { |
|
next; |
|
} |
|
} else { |
|
next; |
|
} |
|
} |
} |
} |
if (defined($primary_submenu{$title})) { |
if (defined($primary_submenu{$title})) { |
my ($link,$target); |
my ($link,$target); |
Line 342 sub primary_menu {
|
Line 356 sub primary_menu {
|
} |
} |
push(@primsub,$item); |
push(@primsub,$item); |
} |
} |
if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) { |
if ($title eq 'Personal') { |
unless (($ltiexc{'fullname'}) || |
if ($env{'user.name'} && $env{'user.domain'} && !$ltiexc{'fullname'}) { |
(($env{'request.course.id'}) && ($menucoll) && (!$menuopts{'name'}))) { |
unless (($env{'request.course.id'}) && ($menucoll) && (!$menuopts{'name'})) { |
$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
|
} |
} |
} |
|
next if (($env{'request.course.id'}) && ($menucoll) && ($title eq 'Personal') && |
|
(!@primsub)); |
} else { |
} else { |
$title = &mt($title); |
$title = &mt($title); |
} |
} |
Line 370 sub primary_menu {
|
Line 387 sub primary_menu {
|
} else { |
} else { |
$menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>'; |
$menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>'; |
} |
} |
|
} elsif ($$menuitem[3] eq 'Log In') { |
|
if ($public) { |
|
if (&Apache::lonnet::get_saml_landing()) { |
|
$$menuitem[0] = '/adm/login'; |
|
} |
|
} |
|
$menu{$position} .= prep_menuitem($menuitem,$ltitarget); |
} else { |
} else { |
$menu{$position} .= prep_menuitem($menuitem,$ltitarget); |
$menu{$position} .= prep_menuitem($menuitem,$ltitarget); |
} |
} |