--- loncom/interface/lonmenu.pm 2020/07/19 00:24:36 1.369.2.79.2.2 +++ loncom/interface/lonmenu.pm 2021/03/08 02:34:20 1.369.2.79.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.79.2.2 2020/07/19 00:24:36 raeburn Exp $ +# $Id: lonmenu.pm,v 1.369.2.79.4.1 2021/03/08 02:34:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -512,7 +512,7 @@ sub secondary_menu { } } if (@scndsub > 0) { - $menu .= &create_submenu($link,$target,$title,\@scndsub,1); + $menu .= &create_submenu($link,$target,&mt($title),\@scndsub,1); } elsif ($link ne '#') { $menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>'; } @@ -1018,9 +1018,9 @@ if ($env{'browser.mobile'}) { $is_mobile = 1; } - unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio|ext\.tool)(\?|$)/) { + unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && - ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)})) { + ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)})) { $menuitems.=(<<ENDREALRES); s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata ENDREALRES @@ -1683,7 +1683,6 @@ sub prepare_functions { if (($env{'form.folderpath'} =~ /^supplemental/) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && (($resurl =~ m{^/adm/wrapper/ext/}) || - ($resurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) || ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || ($resurl eq '/adm/supplemental') || ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || @@ -2220,6 +2219,7 @@ sub done_button_js { key => 'Key:', nokey => 'A proctor key is required', ); + my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'})); my $navmap = Apache::lonnavmaps::navmap->new(); my ($missing,$tried) = (0,0); if (ref($navmap)) { @@ -2282,6 +2282,7 @@ sub done_button_js { <form method="post" name="LCdoneButton" action=""> <input type="hidden" name="LC_interval_done" value="" /> <input type="hidden" name="LC_interval_done_proctorpass" value="" /> + <input type="hidden" name="symb" value="$shownsymb" /> <button id="LC_done-confirm-opener" type="button">$donebuttontext</button> </form> @@ -2363,6 +2364,7 @@ END <form method="post" name="LCdoneButton" action=""> <input type="hidden" name="LC_interval_done" value="" /> + <input type="hidden" name="symb" value="$shownsymb" /> <button id="LC_done-confirm-opener" type="button">$donebuttontext</button> </form>