--- loncom/interface/lonmenu.pm 2022/05/06 19:36:09 1.515 +++ loncom/interface/lonmenu.pm 2022/05/28 16:25:45 1.520 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.515 2022/05/06 19:36:09 raeburn Exp $ +# $Id: lonmenu.pm,v 1.520 2022/05/28 16:25:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -99,7 +99,7 @@ It gets filled in the BEGIN block of thi =over -=item prep_menuitems(\@menuitem,$ltitarget) +=item prep_menuitems(\@menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr) This routine wraps a menuitem in proper HTML. It is used by primary_menu() and secondary_menu(). @@ -220,7 +220,7 @@ use vars qw(@desklines %category_names % my @inlineremote; sub prep_menuitem { - my ($menuitem,$ltitarget,$listclass,$linkattr) = @_; + my ($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr) = @_; return '' unless(ref($menuitem) eq 'ARRAY'); my $link; if ($$menuitem[1]) { # graphical Link @@ -233,6 +233,8 @@ sub prep_menuitem { my $target = ' target="_top"'; if ($ltitarget eq 'iframe') { $target =''; + } elsif ($deeplinktarget eq '_self') { + $target = ' target="'.$deeplinktarget.'"'; } return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a' # highlighting for new messages @@ -265,7 +267,7 @@ sub primary_menu { my %roles_in_env; $rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update); } - my ($lti,$ltitarget); + my ($lti,$ltitarget,$deeplinktarget); if ($env{'request.lti.login'}) { $lti = 1; $ltitarget = $env{'request.lti.target'}; @@ -277,6 +279,9 @@ sub primary_menu { } } } + if ($env{'request.deeplink.login'}) { + $deeplinktarget = $env{'request.deeplink.target'}; + } if (($menucoll) && (ref($menuref) eq 'HASH')) { %menuopts = %{$menuref}; } @@ -341,7 +346,7 @@ sub primary_menu { my ($link,$target); if ($menuitem->[0] ne '') { $link = $menuitem->[0]; - unless ($ltitarget eq 'iframe') { + unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { $target = '_top'; } } else { @@ -391,7 +396,7 @@ sub primary_menu { 'helpdeskmail', $defdom,$origmail); if ($to ne '') { - $menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr); + $menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); } } else { $menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>'). @@ -404,9 +409,9 @@ sub primary_menu { $$menuitem[0] = '/adm/login'; } } - $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); } else { - $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); } } my @output = ('',''); @@ -537,10 +542,13 @@ sub secondary_menu { } } - my ($roleswitcher_js,$roleswitcher_form,$ltitarget); + my ($roleswitcher_js,$roleswitcher_form,$ltitarget,$deeplinktarget); if ($env{'request.lti.login'}) { $ltitarget = $env{'request.lti.target'}; } + if ($env{'request.deeplink.login'}) { + $deeplinktarget = $env{'request.deeplink.target'}; + } foreach my $menuitem (@secondary_menu) { # evaluate conditions @@ -598,7 +606,7 @@ sub secondary_menu { my ($link,$target); if ($menuitem->[0] ne '') { $link = $menuitem->[0]; - unless ($ltitarget eq 'iframe') { + unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { $target = '_top'; } } else { @@ -649,7 +657,7 @@ sub secondary_menu { &roles_selector( $env{'course.' . $env{'request.course.id'} . '.domain'}, $env{'course.' . $env{'request.course.id'} . '.num'}, - $httphost,$ltitarget + $httphost,$menucoll,$menuref ); if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) { next unless ($has_opa_priv); @@ -683,7 +691,7 @@ sub secondary_menu { } $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"'); } - $menu .= &prep_menuitem(\@$menuitem,$ltitarget,$listclass,$linkattr); + $menu .= &prep_menuitem(\@$menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); } } if ($menu =~ /\[url\].*\[symb\]/) { @@ -2235,10 +2243,13 @@ sub utilityfunctions { my $countdown = &countdown_toggle_js(); - my $ltitarget; + my ($ltitarget,$deeplinktarget); if ($env{'request.lti.login'}) { $ltitarget = $env{'request.lti.target'}; } + if ($env{'request.deeplink.login'}) { + $deeplinktarget = $env{'request.deeplink.target'}; + } my $annotateurl = '/adm/annotation'; if ($httphost) { @@ -2357,7 +2368,8 @@ function golist(url) { currentSymb= null; var lcHostname = setLCHost(); var ltitarget = '$ltitarget'; - if (ltitarget == 'iframe') { + var deeplinktarget = '$deeplinktarget'; + if ((ltitarget == 'iframe') || (deeplinktarget == '_self')) { document.location.href=lcHostname+url; } else { top.location.href=lcHostname+url; @@ -2455,6 +2467,9 @@ sub serverform { unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) { $target = ' target="_top"'; } + if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) { + $target = ' target="_self"'; + } return(<<ENDSERVERFORM); <form name="server" action="/adm/logout" method="post"$target> <input type="hidden" name="postdata" value="none" /> @@ -2466,10 +2481,17 @@ ENDSERVERFORM } sub constspaceform { + my ($frameset) = @_; my ($target,$printtarget); - unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) { - $target = ' target="_top"'; + if ($frameset) { + $target = ' target="_parent"'; $printtarget = ' target="_parent"'; + } else { + unless ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || + (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) { + $target = ' target="_top"'; + $printtarget = ' target="_parent"'; + } } return(<<ENDCONSTSPACEFORM); <form name="constspace" action="/adm/logout" method="post"$target> @@ -2504,7 +2526,7 @@ sub hidden_button_check { } sub roles_selector { - my ($cdom,$cnum,$httphost,$ltitarget) = @_; + my ($cdom,$cnum,$httphost,$menucoll,$menuref) = @_; my $crstype = &Apache::loncommon::course_type(); my $now = time; my (%courseroles,%seccount,%courseprivs,%roledesc); @@ -2611,7 +2633,8 @@ sub roles_selector { } if ((keys(%seccount) > 1) || ($numdiffsec > 1)) { my @submenu; - $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref); + $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs, + \%roledesc,$privref,$menucoll,$menuref); $form = '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n". ' <input type="hidden" name="destinationurl" value="'. @@ -2676,7 +2699,7 @@ sub roles_selector { } } if (@submenu > 0) { - $switcher = &create_submenu('','',&mt('Switch role'),\@submenu,'','',$ltitarget); + $switcher = &create_submenu('#','',&mt('Switch role'),\@submenu); } } return ($js,$form,$switcher,$has_opa_priv); @@ -2846,7 +2869,8 @@ sub get_customadhoc_roles { } sub jump_to_role { - my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref) = @_; + my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref, + $menucoll,$menuref) = @_; my %lt = &Apache::lonlocal::texthash( this => 'This role has section(s) associated with it.', ente => 'Enter a specific section.', @@ -2857,6 +2881,7 @@ sub jump_to_role { role => 'The role you selected is not permitted to view the current page.', swit => 'Switch role, but display Main Menu page instead?', ); + &js_escape(\%lt); my $js; if (ref($courseroles) eq 'HASH') { $js = ' var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n". @@ -2879,6 +2904,8 @@ sub jump_to_role { } } my $checkroles = 0; + my $fallback = '/adm/menu'; + my $displaymsg = $lt{'swit'}; if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) { my %disallowed; foreach my $role (sort(keys(%{$courseprivs}))) { @@ -2900,8 +2927,22 @@ sub jump_to_role { $checkroles = 1; $js .= " var disallow = new Array('".join("','",keys(%disallowed))."');\n". " var rolecheck = 1;\n"; + if ($menucoll) { + if (ref($menuref) eq 'HASH') { + if ($menuref->{'main'} eq 'n') { + $fallback = '/adm/navmaps'; + if (&Apache::loncommon::course_type() eq 'Community') { + $displaymsg = &mt('Switch role, but display Community Contents page instead?'); + } else { + $displaymsg = &mt('Switch role, but display Course Contents page instead?'); + } + &js_escape(\$displaymsg); + } + } + } } } + &js_escape(\$fallback); if (!$checkroles) { $js .= " var disallow = new Array();\n". " rolecheck = 0;\n"; @@ -2924,8 +2965,8 @@ function adhocRole(newrole) { if (rolecheck > 0) { for (var i=0; i<disallow.length; i++) { if (disallow[i] == newrole) { - if (confirm("$lt{'role'}\\n$lt{'swit'}")) { - document.rolechooser.destinationurl.value = '/adm/menu'; + if (confirm("$lt{'role'}\\n$displaymsg")) { + document.rolechooser.destinationurl.value = '$fallback'; } else { return; }