--- loncom/interface/lonmenu.pm 2023/09/02 15:56:34 1.369.2.83.2.9 +++ loncom/interface/lonmenu.pm 2024/07/03 04:09:36 1.369.2.85 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.83.2.9 2023/09/02 15:56:34 raeburn Exp $ +# $Id: lonmenu.pm,v 1.369.2.85 2024/07/03 04:09:36 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,$target,$listclass,$linkattr) +=item prep_menuitems(\@menuitem) This routine wraps a menuitem in proper HTML. It is used by primary_menu() and secondary_menu(). @@ -240,9 +240,9 @@ use vars qw(@desklines %category_names % my @inlineremote; sub prep_menuitem { - my ($menuitem,$target,$listclass,$linkattr) = @_; + my ($menuitem,$listclass,$linkattr) = @_; return '' unless(ref($menuitem) eq 'ARRAY'); - my ($link,$targetattr); + my $link; if ($$menuitem[1]) { # graphical Link $link = "':'
  • ').'$link
    • |; + . qq| href="$$menuitem[0]" target="_top" $linkattr>$link|; } # primary_menu() evaluates @primary_menu and returns a two item array, @@ -266,8 +263,8 @@ sub prep_menuitem { # @primary_menu is filled within the BEGIN block of this module with # entries from mydesk.tab sub primary_menu { - my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_; - my (%menu,%ltiexc,%menuopts); + my ($links_disabled) = @_; + my %menu; # each element of @primary contains following array: # (link url, icon path, alt text, link text, condition, position) my $public; @@ -275,41 +272,6 @@ sub primary_menu { || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { $public = 1; } - my $lti; - if ($env{'request.lti.login'}) { - $lti = 1; - if (ref($ltimenu) eq 'HASH') { - foreach my $item ('fullname','logout') { - unless ($ltimenu->{$item}) { - $ltiexc{$item} = 1; - } - } - } - } - my ($listclass,$linkattr,$target); - if ($links_disabled) { - $listclass = 'LCisDisabled'; - $linkattr = 'aria-disabled="true"'; - } - if ($links_target ne '') { - $target = $links_target; - } else { - my ($ltitarget,$deeplinktarget); - if ($env{'request.lti.login'}) { - $ltitarget = $env{'request.lti.target'}; - } - if ($env{'request.deeplink.login'}) { - $deeplinktarget = $env{'request.deeplink.target'}; - } - if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { - $target = '_self'; - } else { - $target = '_top'; - } - } - if (($menucoll) && (ref($menuref) eq 'HASH')) { - %menuopts = %{$menuref}; - } foreach my $menuitem (@primary_menu) { # evaluate conditions next if ref($menuitem) ne 'ARRAY'; # @@ -324,41 +286,25 @@ sub primary_menu { && !$public; # only visible to public # users next if $$menuitem[4] eq 'roles' ##show links depending on - && (&Apache::loncommon::show_course() ##term 'Courses' or - || $lti); ##'Roles' wanted - next if $$menuitem[4] eq 'courses' ##and not LTI access - && (!&Apache::loncommon::show_course() - || $lti); - next if $$menuitem[4] eq 'notlti' - && $lti; - next if $$menuitem[4] eq 'ltiexc' - && exists($ltiexc{lc($menuitem->[3])}); + && &Apache::loncommon::show_course(); ##term 'Courses' or + next if $$menuitem[4] eq 'courses' ##'Roles' wanted + && !&Apache::loncommon::show_course(); ## + my $title = $menuitem->[3]; my $position = $menuitem->[5]; if ($position eq '') { $position = 'right'; } - if ($env{'request.course.id'} && $menucoll) { - if (($menuitem->[6]) && (!$menuopts{$menuitem->[6]})) { - if ($menuitem->[6] eq 'pers') { - if ($menuopts{'name'} && !$ltiexc{'fullname'} && - $env{'user.name'} && $env{'user.domain'}) { - $menu{$position} .= '
  • '. - &Apache::loncommon::plainname($env{'user.name'}, - $env{'user.domain'}).'
    • '; - next; - } else { - next; - } - } else { - next; - } - } + my ($listclass,$linkattr); + if ($links_disabled) { + $listclass = 'LCisDisabled'; + $linkattr = 'aria-disabled="true"'; } if (defined($primary_submenu{$title})) { - my $link; + my ($link,$target); if ($menuitem->[0] ne '') { $link = $menuitem->[0]; + $target = '_top'; } else { $link = '#'; } @@ -370,30 +316,18 @@ sub primary_menu { ($item->[2] eq 'blog')) && (!&Apache::lonnet::usertools_access('','',$item->[2], undef,'tools'))); - if ($env{'request.course.id'} && $menucoll) { - next if ($item->[3]) && (!$menuopts{$item->[3]}); - } push(@primsub,$item); } - if ($title eq 'Personal') { - if ($env{'user.name'} && $env{'user.domain'} && !$ltiexc{'fullname'}) { - unless (($env{'request.course.id'}) && ($menucoll) && (!$menuopts{'name'})) { - $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); - } - } - next if (($env{'request.course.id'}) && ($menucoll) && ($title eq 'Personal') && - (!@primsub)); - if ($title eq 'Personal') { + if (@primsub > 0) { + if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) { + $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); + } else { $title = &mt($title); } - } else { - $title = &mt($title); - } - if (@primsub > 0) { $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1,undef,$listclass,$linkattr); } elsif ($link) { $menu{$position} .= ($listclass?'
  • ':'
  • '). - ''.$title.'
    • '; + ''.&mt($title).''; } } } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink @@ -404,7 +338,7 @@ sub primary_menu { 'helpdeskmail', $defdom,$origmail); if ($to ne '') { - $menu{$position} .= &prep_menuitem($menuitem,$target,$listclass,$linkattr); + $menu{$position} .= &prep_menuitem($menuitem,$listclass,$linkattr); } } else { $menu{$position} .= ($listclass?'
  • ':'
  • '). @@ -417,9 +351,9 @@ sub primary_menu { $$menuitem[0] = '/adm/login'; } } - $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$listclass,$linkattr); } else { - $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$listclass,$linkattr); } } my @output = ('',''); @@ -458,8 +392,7 @@ sub getauthor{ } sub secondary_menu { - my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref, - $links_disabled,$links_target) = @_; + my ($httphost,$links_disabled) = @_; my $menu; my $crstype = &Apache::loncommon::course_type(); @@ -480,11 +413,9 @@ sub secondary_menu { my $canmodpara = &Apache::lonnet::allowed('opa', $crs_sec); my $canvgr = &Apache::lonnet::allowed('vgr', $crs_sec); my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec); - my $canplc = &Apache::lonnet::allowed('plc', $crs_sec); my $author = &getauthor(); - my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools, - $lti,$ltimapres,%ltiexc,%menuopts); + my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools); $grouptools = 0; if ($env{'request.course.id'}) { $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; @@ -518,25 +449,9 @@ sub secondary_menu { } } } - if ($env{'request.lti.login'}) { - $lti = 1; - if (ref($ltimenu) eq 'HASH') { - foreach my $item ('fullname','coursetitle','role','logout','grades') { - unless ($ltimenu->{$item}) { - $ltiexc{$item} = 1; - } - } - } - if (($ltiscope eq 'map') || ($ltiscope eq 'resource')) { - $ltimapres = 1; - } - } - } - if (($menucoll) && (ref($menuref) eq 'HASH')) { - %menuopts = %{$menuref}; } - my ($listclass,$linkattr,$target); + my ($listclass,$linkattr); if ($links_disabled) { $listclass = 'LCisDisabled'; $linkattr = 'aria-disabled="true"'; @@ -552,22 +467,6 @@ sub secondary_menu { } my ($roleswitcher_js,$roleswitcher_form); - if ($links_target ne '') { - $target = $links_target; - } else { - my ($ltitarget,$deeplinktarget); - if ($env{'request.lti.login'}) { - $ltitarget = $env{'request.lti.target'}; - } - if ($env{'request.deeplink.login'}) { - $deeplinktarget = $env{'request.deeplink.target'}; - } - if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { - $target = '_self'; - } else { - $target = '_top'; - } - } foreach my $menuitem (@secondary_menu) { # evaluate conditions @@ -582,7 +481,7 @@ sub secondary_menu { next if $$menuitem[4] eq 'crseditCommunity' && ($crstype eq 'Course'); next if $$menuitem[4] eq 'nvgr' - && ($canvgr || $ltiexc{'grades'}); + && $canvgr; next if $$menuitem[4] eq 'vgr' && !$canvgr; next if $$menuitem[4] eq 'viewusers' @@ -603,33 +502,17 @@ sub secondary_menu { && !$showsyllabus; next if $$menuitem[4] eq 'showfeeds' && !$showfeeds; - next if $$menuitem[4] eq 'plc' - && !$canplc; next if $$menuitem[4] eq 'author' && !$author; next if $$menuitem[4] eq 'cca' && !$canmodifycoauthor; - next if $$menuitem[4] eq 'notltimapres' - && $ltimapres; - next if $$menuitem[4] eq 'notlti' - && $lti; - next if $$menuitem[4] eq 'lti' - && (!$lti || !$noprimary); - next if $$menuitem[3] eq 'Logout' - && $ltiexc{'logout'}; my $title = $menuitem->[3]; - if ($env{'request.course.id'} && $menucoll) { - if ($$menuitem[5] eq 'main') { - next if ($menuopts{$$menuitem[5]} eq 'n'); - } elsif ($$menuitem[5] ne 'roles') { - next if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})); - } - } if (defined($secondary_submenu{$title})) { - my $link; + my ($link,$target); if ($menuitem->[0] ne '') { $link = $menuitem->[0]; + $target = '_top'; } else { $link = '#'; } @@ -647,21 +530,9 @@ sub secondary_menu { next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara); next if ($item->[2] eq 'author' && !$author); next if ($item->[2] eq 'cca' && !$canmodifycoauthor); - next if ($item->[2] eq 'lti' && !$lti); - if ($item->[2] =~ /^lti(portfolio|wishlist|blog)$/) { - my $tool = $1; - next if !$lti; - next if (!&Apache::lonnet::usertools_access('','',$tool, - undef,'tools')); - } push(@scndsub,$item); } } - if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'}) { - unless ($ltiexc{'fullname'}) { - $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); - } - } if (@scndsub > 0) { $menu .= &create_submenu($link,$target,&mt($title),\@scndsub,1,undef, $listclass,$linkattr); @@ -673,16 +544,12 @@ sub secondary_menu { } } elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { # special treatment for role selector - my ($switcher,$has_opa_priv); - ($roleswitcher_js,$roleswitcher_form,$switcher,$has_opa_priv) = + ($roleswitcher_js,$roleswitcher_form,my $switcher) = &roles_selector( $env{'course.' . $env{'request.course.id'} . '.domain'}, $env{'course.' . $env{'request.course.id'} . '.num'}, - $httphost,$target,$menucoll,$menuref + $httphost ); - if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) { - next unless ($has_opa_priv); - } $menu .= $switcher; } else { if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) { @@ -709,7 +576,7 @@ sub secondary_menu { } $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"'); } - $menu .= &prep_menuitem(\@$menuitem,$target,$listclass,$linkattr); + $menu .= &prep_menuitem(\@$menuitem,$listclass,$linkattr); } } if ($menu =~ /\[url\].*\[symb\]/) { @@ -732,7 +599,6 @@ sub secondary_menu { } $menu =~ s/\[uname\]/$$author{user}/g; $menu =~ s/\[udom\]/$$author{dom}/g; - $menu =~ s/\[javascript\]/javascript:/g; if ($env{'request.course.id'}) { $menu =~ s/\[cnum\]/$cnum/g; $menu =~ s/\[cdom\]/$cdom/g; @@ -749,12 +615,12 @@ sub secondary_menu { sub create_submenu { my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_; return unless (ref($submenu) eq 'ARRAY'); - my $targetattr; - if (($target ne '') && ($link ne '#')) { - $targetattr = ' target="'.$target.'"'; + my $disptarget; + if ($target ne '') { + $disptarget = ' target="'.$target.'"'; } my $menu = '
  • '. - ''. + ''. ''.$title. ''. ' ▼'. @@ -831,17 +697,14 @@ sub build_submenu { } $href =~ s/\[returnurl\]/$returnurl/; } - my $targetattr; unless (($href eq '') || ($href =~ /^\#/)) { - if ($target ne '') { - $targetattr = ' target="'.$target.'"'; - } + $target = ' target="_top"'; } $menu .= '
  • '; - $menu .= '' . $title . ''; + $menu .= '' . $title . ''; $menu .= '
    • '; } } @@ -878,8 +741,7 @@ sub registerurl { } sub innerregister { - my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname, - $ltiscope,$ltiuri,$showncrumbsref) = @_; + my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname) = @_; my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; @@ -920,33 +782,26 @@ sub innerregister { my $restitle = &Apache::lonnet::gettitle($symb); my (@crumbs,@mapcrumbs); - if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '')) { - unless ($ltiscope eq 'resource') { - if (($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) && - !(($ltiscope eq 'map') && (&Apache::lonnet::clutter($resurl) eq $ltiuri))) { - $navmap = Apache::lonnavmaps::navmap->new(); - if (ref($navmap)) { - @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle); - } - } + if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') && + ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'})) { + $navmap = Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle); } } - unless (($ltiscope eq 'map') || ($ltiscope eq 'resource')) { - @crumbs = ({text => $crstype.' Contents', - href => "Javascript:gopost('/adm/navmaps','')"}); - } + @crumbs = ({text => $crstype.' Contents', + href => "Javascript:gopost('/adm/navmaps','')"}); if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { if (@mapcrumbs) { push(@crumbs,@mapcrumbs); - } elsif (($ltiscope ne 'map') && ($ltiscope ne 'resource')) { + } else { push(@crumbs, {text => '...', no_mt => 1}); } } unless ((@mapcrumbs) || (!$maptitle) || ($maptitle eq 'default.sequence') || - ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) || - ($ltiscope eq 'resource')) { + ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { push @crumbs, {text => $maptitle, no_mt => 1, href => &Apache::lonnet::clutter($mapurl).'?navmap=1'}; } @@ -975,39 +830,27 @@ sub innerregister { if ($env{'form.title'}) { $title = $env{'form.title'}; } - my ($trail,$cnum,$cdom); - if ($env{'form.folderpath'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); - } + my $trail; if ($env{'form.folderpath'}) { &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname); - $title = &HTML::Entities::encode($title,'\'"<>&'); ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } else { &Apache::lonhtmlcommon::add_breadcrumb( {text => "Supplemental $crstype Content", href => "javascript:gopost('/adm/supplemental','')"}); - $title = &HTML::Entities::encode(&mt('View Resource'),'\'"<>&'); + $title = &mt('View Resource'); ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); - } - if (ref($showncrumbsref)) { - $$showncrumbsref = 1; + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } return $trail; } elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) { &Apache::lonhtmlcommon::clear_breadcrumbs(); &prepare_functions('/public'.$courseurl."/syllabus", $forcereg,$group,undef,undef,1,$hostname); - $title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&'); + $title = &mt('Syllabus File'); my ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); - if (ref($showncrumbsref)) { - $$showncrumbsref = 1; - } + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname); return $trail; } unless ($env{'request.state'} eq 'construct') { @@ -1059,14 +902,8 @@ sub innerregister { $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); $perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'}); my @privs; - my $gradable_exttool; if ($env{'request.symb'} ne '') { - if ($env{'request.noversionuri'} =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) { - if (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i) { - $gradable_exttool = 1; - push(@privs,('mgr','vgr')); - } - } elsif ($env{'request.filename'}=~/$LONCAPA::assess_re/) { + if ($env{'request.filename'}=~/$LONCAPA::assess_re/) { push(@privs,('mgr','vgr')); } push(@privs,('opa','vpa')); @@ -1081,8 +918,8 @@ sub innerregister { # # Determine whether or not to show Grades and Submissions buttons # - if (($env{'request.symb'} ne '') && - (($env{'request.filename'}=~/$LONCAPA::assess_re/) || ($gradable_exttool))) { + if ($env{'request.symb'} ne '' && + $env{'request.filename'}=~/$LONCAPA::assess_re/) { if ($perms{'mgr'}) { $hwkadd.= &switch('','',7,2,'pgrd.png','Content Grades', 'grades[_4]', @@ -1148,13 +985,31 @@ s&6&1&list.png&Directory&dir[_1]&golist( s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource +ENDMENUITEMS +# +# Print only makes sense for certain mime types +# + if ($thisdisfn=~/\.(xml|html|htm|xhtml|xhtm|tex)$/ || $thisdisfn=~/$LONCAPA::assess_re/) { + $menuitems .= (<new(); - if (ref($navmap)) { - my $mapres = $navmap->getResourceByUrl($ltiuri); - if (ref($mapres)) { - if ($navmap->isLastResource($mapres,$env{'request.symb'})) { - $showforw = 0; - } - if ($navmap->isFirstResource($mapres,$env{'request.symb'})) { - $showback = 0; - } - } - } - if ($showback) { - $menuitems.=" -s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1"; - } - if ($showforw) { - $menuitems.=" -s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3"; - } - } else { - $menuitems.=" -s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1 -s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3"; - } - $menuitems .= (<'.$pic.''; @@ -2438,220 +2256,6 @@ function toggleCountdown() { END } -# This creates a "done button" for timed events. The confirmation box is a jQuery -# dialog widget. If the interval parameter requires a proctor key for the timed -# event to be marked done, there will also be a textbox where that can be entered. -# Clicking OK will set the value of LC_interval_done to 'true', and, if needed will -# set the value of LC_interval_done_proctorpass to the text entered in that box, -# and submit the corresponding form. -# -# The &zero_time() routine in lonhomework.pm is called when a page is rendered if -# LC_interval_done is true. -# -sub done_button_js { - my ($type,$width,$height,$proctor,$donebuttontext) = @_; - return unless (($type eq 'map') || ($type eq 'resource')); - my %lt = &Apache::lonlocal::texthash( - title => 'WARNING!', - preamble => 'You are trying to end this timed event early.', - map => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.', - resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', - okdone => 'Click "OK" if you are completely finished.', - cancel => 'Click "Cancel" to continue working.', - proctor => 'Ask a proctor to enter the key, then click "OK" if you are completely finished.', - ok => 'OK', - exit => 'Cancel', - 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)) { - my @resources=(); - if ($type eq 'map') { - my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($env{'request.symb'}); - if ($env{'request.symb'} =~ /\.page$/) { - @resources=$navmap->retrieveResources($resurl,sub { $_[0]->is_problem() }); - } else { - @resources=$navmap->retrieveResources($mapurl,sub { $_[0]->is_problem() }); - } - } else { - my $res = $navmap->getBySymb($env{'request.symb'}); - if (ref($res)) { - if ($res->is_problem()) { - push(@resources,$res); - } - } - } - foreach my $res (@resources) { - if (ref($res->parts()) eq 'ARRAY') { - foreach my $part (@{$res->parts()}) { - if (!$res->tries($part)) { - $missing++; - } else { - $tried++; - } - } - } - } - } - if ($missing) { - $lt{'miss'} .= '

    '; - if ($type eq 'map') { - $lt{'miss'} .= &mt('Submissions are missing for [quant,_1,question part,question parts] in this folder.',$missing); - } else { - $lt{'miss'} .= &mt('Submissions are missing for [quant,_1,part] in this question.',$missing); - } - if ($missing > 1) { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit answers for them.').''; - } else { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit an answer for it.').'

    '; - } - } - $donebuttontext = &HTML::Entities::encode($donebuttontext,'<>&"'); - if ($proctor) { - if ($height !~ /^\d+$/) { - $height = 400; - if ($missing) { - $height += 60; - } - } - if ($width !~ /^\d+$/) { - $width = 400; - if ($missing) { - $width += 60; - } - } - return < - - - - - - -
    -

    $lt{'preamble'} $lt{$type}

    - $lt{'miss'} -

    $lt{'proctor'}

    -
    - - -
    -

    $lt{'cancel'}

    -
    - - - -END - } else { - if ($height !~ /^\d+$/) { - $height = 320; - if ($missing) { - $height += 60; - } - } - if ($width !~ /^\d+$/) { - $width = 320; - if ($missing) { - $width += 60; - } - } - if ($missing) { - $lt{'miss'} = '

    '.$lt{'miss'}.'

    '; - } - return < - - - - - -

    -

    $lt{'preamble'} $lt{$type} $lt{'miss'} $lt{'okdone'} $lt{'cancel'}

    -
    - - - -END - } -} - sub utilityfunctions { my ($httphost) = @_; my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); @@ -2692,14 +2296,6 @@ sub utilityfunctions { my $countdown = &countdown_toggle_js(); - 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) { $annotateurl = '/adm/annotations'; @@ -2788,6 +2384,10 @@ function gocstr(url,filename) { this.document.cstrprint.submit(); return; } + if (url == '/adm/preferences?action=authorsettings') { + document.location.href=url+'&returnurl='+filename; + return; + } if (url !='') { this.document.constspace.filename.value = filename; this.document.constspace.action = url; @@ -2800,23 +2400,17 @@ function golist(url) { currentURL = null; currentSymb= null; var lcHostname = setLCHost(); - var ltitarget = '$ltitarget'; - var deeplinktarget = '$deeplinktarget'; - if ((ltitarget == 'iframe') || (deeplinktarget == '_self')) { - document.location.href=lcHostname+url; - } else { - top.location.href=lcHostname+url; - } + top.location.href=lcHostname+url; } } -function catalog_info(url,isMobile) { +function catalog_info(isMobile) { if (isMobile == 1) { - openMyModal(url+'.meta?modal=1',500,400,'yes'); + openMyModal(window.location.pathname+'.meta?modal=1',500,400,'yes'); } else { - loncatinfo=window.open(url+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); + loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); } } @@ -2864,17 +2458,6 @@ function open_source() { 'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes'); } -function open_aboutLC() { - var isMobile = "$env{'browser.mobile'}"; - var url = '/adm/about.html'; - if (isMobile == 1) { - openMyModal(url,600,400,'yes'); - } else { - window.open(url,"aboutLONCAPA","height=400,width=600,scrollbars=1,resizable=1,menubar=0,location=1"); - } - return; -} - (function (\$) { \$(document).ready(function () { \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1])); @@ -2895,14 +2478,8 @@ ENDUTILITY } sub serverform { - my $target; - if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) { - $target = ' target="_self"'; - } else { - $target = ' target="_top"'; - } return(< +
    @@ -2912,27 +2489,15 @@ ENDSERVERFORM } sub constspaceform { - my ($frameset) = @_; - my ($target,$printtarget); - 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="_top"'; - } - } return(< + -
    +
    -
    + @@ -2962,12 +2527,12 @@ sub hidden_button_check { } sub roles_selector { - my ($cdom,$cnum,$httphost,$target,$menucoll,$menuref) = @_; + my ($cdom,$cnum,$httphost) = @_; my $crstype = &Apache::loncommon::course_type(); my $now = time; my (%courseroles,%seccount,%courseprivs,%roledesc); my $is_cc; - my ($js,$form,$switcher,$has_opa_priv); + my ($js,$form,$switcher); my $ccrole; if ($crstype eq 'Community') { $ccrole = 'co'; @@ -3068,15 +2633,10 @@ sub roles_selector { } } if ((keys(%seccount) > 1) || ($numdiffsec > 1)) { - my $targetattr; - if ($target ne '') { - $targetattr = ' target="'.$target.'"'; - } my @submenu; - $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs, - \%roledesc,$privref,$menucoll,$menuref); + $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref); $form = - ''."\n". + ''."\n". ' '."\n". ' '."\n". @@ -3093,19 +2653,12 @@ sub roles_selector { if ($env{'request.role'} =~ m{^\Q$role\E}) { if ($seccount{$role} > 1) { $include = 1; - } else { - if ($env{'user.priv.'.$env{'request.role'}."./$cdom/$cnum"} =~/opa\&([^\:]*)/) { - $has_opa_priv = 1; - } } } else { $include = 1; } } if ($include) { - if ($env{"user.priv.$role./$cdom/$cnum./$cdom/$cnum"} =~/opa\&([^\:]*)/) { - $has_opa_priv = 1; - } push(@submenu,['javascript:adhocRole('."'$role'".')', &Apache::lonnet::plaintext($role,$crstype)]); } @@ -3130,19 +2683,16 @@ sub roles_selector { } else { $rolename = &Apache::lonnet::plaintext($role); } - if ($env{"user.priv.$role./$cdom/$cnum./$cdom/$cnum"} =~/opa\&([^\:]*)/) { - $has_opa_priv = 1; - } push(@submenu,['javascript:adhocRole('."'$role'".')', $rolename]); } } } if (@submenu > 0) { - $switcher = &create_submenu('#',$target,&mt('Switch role'),\@submenu); + $switcher = &create_submenu('#','',&mt('Switch role'),\@submenu); } } - return ($js,$form,$switcher,$has_opa_priv); + return ($js,$form,$switcher); } sub get_all_courseroles { @@ -3309,8 +2859,7 @@ sub get_customadhoc_roles { } sub jump_to_role { - my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref, - $menucoll,$menuref) = @_; + my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref) = @_; my %lt = &Apache::lonlocal::texthash( this => 'This role has section(s) associated with it.', ente => 'Enter a specific section.', @@ -3321,7 +2870,6 @@ 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". @@ -3344,8 +2892,6 @@ 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}))) { @@ -3367,22 +2913,8 @@ 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"; @@ -3405,8 +2937,8 @@ function adhocRole(newrole) { if (rolecheck > 0) { for (var i=0; i{'starttime'} < $now) && @@ -3529,20 +3051,10 @@ sub countdown_timer { } my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); my @interval=&Apache::lonnet::EXT("resource.0.interval"); - my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret); if (@interval > 1) { - ($timelimit,my $donesuffix) = split(/_/,$interval[0],2); - if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) { - $usesdone = 'done'; - $donebuttontext = $1; - (undef,$proctor,$secret) = split(/_/,$2); - } elsif ($donesuffix =~ /^done(|_.+)$/) { - $donebuttontext = &mt('Done'); - ($usesdone,$proctor,$secret) = split(/_/,$donesuffix); - } my $first_access=&Apache::lonnet::get_first_access($interval[1]); if ($first_access > 0) { - if ($first_access+$timelimit > time) { + if ($first_access+$interval[0] > time) { $hastimeleft = 1; } } @@ -3550,16 +3062,11 @@ sub countdown_timer { if (($duedate && $duedate > time) || (!$duedate && $hastimeleft) || ($slot_name ne '' && $slothastime)) { - my ($collapse,$expand,$alttxt,$title,$currdisp,$donebutton); + my ($collapse,$expand,$alttxt,$title,$currdisp); if ((@interval > 1 && $hastimeleft) || ($type eq 'Task' && $slothastime)) { $currdisp = 'inline'; $collapse = '► '; - if ((@interval > 1) && ($hastimeleft)) { - if ($usesdone eq 'done') { - $donebutton = &done_button_js($interval[1],'','',$proctor,$donebuttontext); - } - } } else { $currdisp = 'none'; $expand = '◄ '; @@ -3570,7 +3077,7 @@ sub countdown_timer { } my $desc = &mt('Countdown to due date/time'); return < $collapse @@ -3585,94 +3092,6 @@ END return; } -sub linkprot_exit { - if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) { - my ($deeplink_symb,$deeplink); - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - if (($cnum ne '') && ($cdom ne '')) { - $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); - if ($deeplink_symb) { - if ($deeplink_symb =~ /\.(page|sequence)$/) { - my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]); - my $navmap = Apache::lonnavmaps::navmap->new(); - if (ref($navmap)) { - $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink'); - } - } else { - $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb); - } - if ($deeplink ne '') { - my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink); - my %lt = &Apache::lonlocal::texthash( - title => 'Exit Tool', - okdone => 'Click "OK" to exit embedded tool', - cancel => 'Click "Cancel" to continue working.', - ok => 'OK', - exit => 'Cancel', - ); - if ($exit) { - my ($show,$text) = split(/:/,$exit); - unless ($show eq 'no') { - my $height = 250; - my $width = 300; - my $exitbuttontext; - if ($text eq '') { - $exitbuttontext = &mt('Exit Tool'); - } else { - $exitbuttontext = $text; - } - return < - - - - -
    -

    $lt{'okdone'} $lt{'cancel'}

    -
    - - - -END - } - } - } - } - } - } - return; -} - # ================================================================ Main Program BEGIN { @@ -3689,13 +3108,13 @@ BEGIN { $category_positions{$entries[2]}=$entries[1]; $category_names{$entries[2]}=$entries[3]; } elsif ($configline=~/^prim\:/) { - my @entries = (split(/\:/, $configline))[1..7]; + my @entries = (split(/\:/, $configline))[1..6]; push(@primary_menu,\@entries); } elsif ($configline=~/^primsub\:/) { - my ($parent,@entries) = (split(/\:/, $configline))[1..5]; + my ($parent,@entries) = (split(/\:/, $configline))[1..4]; push(@{$primary_submenu{$parent}},\@entries); } elsif ($configline=~/^scnd\:/) { - my @entries = (split(/\:/, $configline))[1..6]; + my @entries = (split(/\:/, $configline))[1..5]; push(@secondary_menu,\@entries); } elsif ($configline=~/^scndsub\:/) { my ($parent,@entries) = (split(/\:/, $configline))[1..4];