--- loncom/interface/lonmenu.pm 2024/10/06 20:19:57 1.369.2.83.2.21 +++ loncom/interface/lonmenu.pm 2024/07/02 18:35:28 1.369.2.84 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.83.2.21 2024/10/06 20:19:57 raeburn Exp $ +# $Id: lonmenu.pm,v 1.369.2.84 2024/07/02 18:35:28 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 = "<img class=\"LC_noBorder\"" . " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\"" @@ -250,13 +250,10 @@ sub prep_menuitem { } else { # textual Link $link = &mt($$menuitem[3]); } - if ($target ne '') { - $targetattr = ' target="'.$target.'"'; - } return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a' # highlighting for new messages . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '') - . qq| href="$$menuitem[0]"$targetattr $linkattr>$link</a></li>|; + . qq| href="$$menuitem[0]" target="_top" $linkattr>$link</a></li>|; } # 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,$collapsible) = @_; - 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} .= '<li><a href="#">'. - &Apache::loncommon::plainname($env{'user.name'}, - $env{'user.domain'}).'</a></li>'; - 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,43 +316,18 @@ sub primary_menu { ($item->[2] eq 'blog')) && (!&Apache::lonnet::usertools_access('','',$item->[2], undef,'tools'))); - if (($item->[2] eq 'browsepub') && ($item->[0] eq '/res/')) { - if ($env{'request.role'} =~ /^au\./) { - $item->[0] .= $env{'request.role.domain'}.'/?launch=1'; - } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { - $item->[0] .= $1.'/'.$2.'/?launch=1'; - } elsif (&Apache::lonnet::allowed('bre',$env{'user.domain'})) { - $item->[0] .= $env{'user.domain'}.'/?launch=1'; - } elsif (&Apache::lonnet::allowed('bro','/res/')) { - $item->[0] .= '?launch=1'; - } else { - next; - } - } - 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?'<li class="'.$listclass.'">':'<li>'). - '<a href="'.$link.'" target="'.$target.'" '.$linkattr.'>'.$title.'</a></li>'; + '<a href="'.$link.'" target="'.$target.'" '.$linkattr.'>'.&mt($title).'</a></li>'; } } } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink @@ -417,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?'<li class="'.$listclass.'">':'<li>'). @@ -430,17 +351,13 @@ 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 = ('',''); if ($menu{'left'} ne '') { - if ($collapsible) { - $menu{'left'} = ($listclass?'<li class="'.$listclass.'">':'<li>'). - ' </li>'.$menu{'left'}; - } $output[0] = "<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>"; } if ($menu{'right'} ne '') { @@ -456,10 +373,10 @@ sub primary_menu { # #TODO this should probably be moved somewhere more central #since it can be used by different parts of the system -sub getauthor { +sub getauthor{ return unless $env{'request.role'}=~/^(ca|aa|au)/; #nothing to do if user isn't some kind of author - #co- or assistant author? + #co- or assistent author? my ($dom, $user) = ($env{'request.role'} =~ /^(?:ca|aa)\.\/($match_domain)\/($match_username)$/) ? ($1, $2) #domain, username of the parent author : @env{ ('request.role.domain', 'user.name') }; #own domain, username @@ -475,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(); @@ -497,20 +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 ($is_author,$is_coauthor); - if ($author) { - if ($env{'request.role'} =~ /^au\./) { - $is_author = 1; - } elsif ($env{'request.role'} =~ /^ca\./) { - $is_coauthor = 1; - } - } - - 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'}; @@ -544,77 +449,30 @@ 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"'; } - my ($canlistcoauthors,$canmodifycoauthor); + my ($canmodifycoauthor); if ($env{'request.role'} eq "au./$env{'user.domain'}/") { my $extent = "$env{'user.domain'}/$env{'user.name'}"; if ((&Apache::lonnet::allowed('cca',$extent)) || (&Apache::lonnet::allowed('caa',$extent))) { $canmodifycoauthor = 1; } - } elsif ($env{'request.role'} =~ m{^(aa|ca)\./($match_domain/$match_username)$}) { - my ($role,$extent) = ($1,$2); - if (&Apache::lonnet::allowed('vca',$extent)) { - if ($env{"environment.internal.manager./$extent"}) { - $canmodifycoauthor = 1; - } else { - $canlistcoauthors = 1; - } - } elsif (&Apache::lonnet::allowed('vaa',$extent)) { - $canlistcoauthors = 1; - } } 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 next if ref($menuitem) ne 'ARRAY'; next if $$menuitem[4] ne 'always' - && $$menuitem[4] ne 'coauthor' - && $$menuitem[4] ne 'author' - && $$menuitem[4] ne 'authorspace' - && $$menuitem[4] ne 'vca' - && $$menuitem[4] ne 'mca' + && ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') && !$env{'request.course.id'}; next if $$menuitem[4] =~ /^crsedit/ && (!$canedit && !$canvieweditor); @@ -623,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' @@ -644,41 +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 'authorspace' + next if $$menuitem[4] eq 'author' && !$author; - next if $$menuitem[4] eq 'author' - && !$is_author; - next if $$menuitem[4] eq 'coauthor' - && !$is_coauthor; - next if $$menuitem[4] eq 'vca' - && (!$canlistcoauthors || $canmodifycoauthor); - next if $$menuitem[4] eq 'vaa' - && (!$canlistcoauthors || $canmodifycoauthor); - next if $$menuitem[4] eq 'mca' + 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 = '#'; } @@ -694,23 +528,11 @@ sub secondary_menu { next if ($item->[2] eq 'vcg' && !$canviewgrps); next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor); next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara); - next if ($item->[2] eq 'author' && !$is_author); - next if ($item->[2] eq 'vca' && !$canlistcoauthors); - 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')); - } + next if ($item->[2] eq 'author' && !$author); + next if ($item->[2] eq 'cca' && !$canmodifycoauthor); 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); @@ -722,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'}) { @@ -758,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\]/) { @@ -778,24 +596,9 @@ sub secondary_menu { } $menu =~ s/\[url\]/$escurl/g; $menu =~ s/\[symb\]/$escsymb/g; - } elsif (($menu =~ m{/adm/preferences\?}) && ($menu =~ /\[returnurl\]/)) { - my $returnurl = $ENV{'REQUEST_URI'}; - if ($ENV{'REQUEST_URI'} =~ m{/adm/preferences\?action=authorsettings\&returnurl=([^\&]+)$}) { - $returnurl = $1; - } - if (($returnurl =~ m{^/adm/createuser($|\?action=)}) || - ($returnurl =~ m{^/priv/$match_domain/$match_username}) || - ($returnurl =~ m{^/res(/?$|/$match_domain/$match_username)})) { - $returnurl =~ s{\?.*$}{}; - $returnurl = '&returnurl='.&HTML::Entities::encode($returnurl,'"<>&\''); - } else { - undef($returnurl); - } - $menu =~ s/\[returnurl\]/$returnurl/; } $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; @@ -812,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 = '<li class="LC_hoverable '.$addclass.'">'. - '<a href="'.$link.'"'.$targetattr.'>'. + '<a href="'.$link.'"'.$disptarget.'>'. '<span class="LC_nobreak">'.$title. '<span class="LC_fontsize_small" style="font-weight:normal;">'. ' ▼</span></span></a>'. @@ -894,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 .= '<li '; $menu .= ($listclass?'class="'.$listclass.'" ':''); $menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">'; - $menu .= '<a href="'.$href.'"'.$targetattr.' '.$linkattr.'>' . $title . '</a>'; + $menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' . $title . '</a>'; $menu .= '</li>'; } } @@ -941,10 +741,9 @@ 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 $in_daxe = 0; + my $is_const_dir = 0; if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } @@ -983,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'}; } @@ -1038,51 +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'),'\'"<>&'); - my ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); - if (ref($showncrumbsref)) { - $$showncrumbsref = 1; - } - return $trail; - } elsif (($resurl eq '/public'.$courseurl.'/syllabus') && - ($env{'form.folderpath'})) { - if ($env{'form.title'}) { - $title = $env{'form.title'}; - } else { - $title = 'Syllabus'; - } - &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname); - $title = &HTML::Entities::encode($title,'\'"<>&'); + $title = &mt('Syllabus File'); my ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname); return $trail; } unless ($env{'request.state'} eq 'construct') { @@ -1134,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')); @@ -1156,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]', @@ -1192,107 +954,11 @@ sub innerregister { 'Folder/Page Content'); } # End modifiable folder/page container check - -# -# Determine whether to show View As button for shortcut to display problem, answer, and submissions -# - - if (($env{'request.symb'} ne '') && - ($env{'request.filename'}=~/$LONCAPA::assess_re/) && - (($perms{'mgr'}) || ($perms{'vgr'}))) { - my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$defdom, - $domselector,$righticon); - my %lt = &Apache::lonlocal::texthash( - view => 'View', - upda => 'Update', - ); - my $possdomstr = $env{'course.'.$env{'request.course.id'}.'.internal.userdomains'}; - if ($possdomstr =~ /,/) { - my @possdoms = split(/,/,$possdomstr); - if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) { - $defdom = $1; - } elsif (grep(/^\Q$cdom\E$/,@possdoms)) { - $defdom = $cdom; - } elsif (&Apache::lonnet::domain($possdoms[0]) ne '') { - $defdom = $possdoms[0]; - } - $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',\@possdoms); - } elsif (($possdomstr ne '') && (&Apache::lonnet::domain($possdomstr) ne '')) { - if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) { - $defdom = $1; - } else { - $defdom = $possdomstr; - } - } - if ($env{'request.user_in_effect'} =~ /^($match_username):($match_domain)$/) { - ($vuname,$vudom) = ($1,$2); - unless (&Apache::lonnet::is_advanced_user($vudom,$vuname)) { - $vid = (&Apache::lonnet::idrget($vudom,$vuname))[1]; - } - $viewas = $env{'request.user_in_effect'}; - $text = $lt{'upda'}; - $change = 'off'; - $visibility = 'inline'; - $leftvis = 'none'; - $defdom = $vudom; - $righticon = '✖'; - } else { - $text = $lt{'view'}; - $change = 'on'; - $visibility = 'none'; - $leftvis = 'inline'; - if ($defdom eq '') { - $defdom = $cdom; - } - } - my $sellink = &Apache::loncommon::selectstudent_link('userview','vuname','vudom','','','vuidentifier'); - my $selscript=&Apache::loncommon::studentbrowser_javascript(); - my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}),'<>&"'); - my $input; - my @items = ( - '<label><input type="radio" name="vuidentifier" value="uname" checked="checked" onclick="javascript:toggleIdentifier(this.form);" />', - '</label><input name="vuname" type="text" size="6" value="'.$vuname.'" id="LC_vuname" />', - '<label><input type="radio" name="vuidentifier" value="uid" onclick="javascript:toggleIdentifier(this.form);" />', - '</label><input name="vid" type="hidden" size="6" value="'.$vid.'" id="LC_vid" />' - ); - if ($domselector) { - push(@items,$domselector); - $input = &mt('[_1]User:[_2] or [_3]ID:[_4] at [_5] | ',@items); - } else { - $input = &mt('[_1]Username:[_2] or [_3]ID:[_4] | ',@items). - '<input name="vudom" type="hidden" value="'.$defdom.'" />'; - } - $input .= '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />', - '<input name="symb" type="hidden" value="'.$shownsymb.'" />'; - my $chooser = <<END; -$selscript -<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link"> -<span id="usexpand" class="LC_menubuttons_inline_text" style="display:$leftvis">► </span> -</a> -<fieldset id="LC_selectuser" style="display:$visibility"> -<form name="userview" action="" method="post" onsubmit="event.preventDefault(); return validCourseUser(this,'$change');"> -<span class="LC_menubuttons_inline_text LC_nobreak"> -$input -$sellink -</span> - <input type="submit" value="$text" /> -</form> -</fieldset> -<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link"> -<span id="uscollapse" class="LC_menubuttons_inline_text">$righticon</span> -</a> -END - &switch('','',7,5,'viewuser.png','View As','user[_1]', - 'toggleViewAsUser('."'$change'".')', - 'View As','','','',$chooser); - } -# End view as user check - } # End course context # Prepare the rest of the buttons - my ($menuitems,$got_prt,$got_wishlist,$cstritems,$toplevel_cstr); + my ($menuitems,$got_prt,$got_wishlist,$cstritems); if ($const_space) { # # We are in construction space @@ -1303,33 +969,14 @@ END ($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$}); my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; if ($currdir =~ m-/$-) { + $is_const_dir = 1; if ($thisdisfn eq '') { - $toplevel_cstr = 1; - } - my $esc_currdir = &Apache::loncommon::escape_single($currdir); - $menuitems=(<<ENDMENUITEMS); -s&6&3&pub.png&Publish&dir[_2]&gocstr('/adm/publish','$esc_currdir')&Publish this Directory -s&7&4&docs-22x22.png&Edit Metadata&defaults[_1]&gopost('${esc_currdir}default.meta','')&Edit metadata for this Directory -s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','$esc_currdir')&Print contents of directory -s&7&1&del.png&Delete&dir[_3]&gocstr('/adm/cfile?action=delete','$esc_currdir')&Delete this Directory -ENDMENUITEMS - if (($env{'environment.canarchive'}) && - ($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) { - $menuitems .= (<<ENDMENUITEMS); -s&7&7&archive.png&Export&dir[_1]&gocstr('/adm/cfile?action=archive','$esc_currdir')&Export Authoring Space Archive -ENDMENUITEMS + $is_const_dir = 2; } } else { $currdir =~ s|[^/]+$||; my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); my $esc_currdir = &Apache::loncommon::escape_single($currdir); - my $pubfile = "/res/$udom/$uname/$thisdisfn"; - my $candelete = 1; - if (-e $londocroot.$pubfile) { - unless (&Apache::lonnet::metadata($pubfile,'obsolete')) { - undef($candelete); - } - } # # Probably should be in mydesk.tab # @@ -1337,18 +984,8 @@ ENDMENUITEMS s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory 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&3©.png&Copy&resource[_4]&gocstr('/adm/cfile?action=copy','/priv/$udom/$uname/$cleandisfn')&Copy this resource -ENDMENUITEMS -# -# Rename and Delete only available if obsolete or unpublished -# - if ($candelete) { - $menuitems .= (<<ENDMENUITEMS); -s&7&4&rename.png&Rename&resource[_5]&gocstr('/adm/cfile?action=rename','/priv/$udom/$uname/$cleandisfn')&Rename 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 # @@ -1361,36 +998,18 @@ ENDMENUITEMS $cstritems = $menuitems; undef($menuitems); } -# -# "Exit Daxe" in Functions menu when using Daxe -# - if ((($env{'form.editmode'} eq 'daxe') && - ($thisdisfn=~/\.(xml|html|htm|xhtml|xhtm)$/)) || - (($env{'form.problemmode'} eq 'daxe') && - ($thisdisfn=~/$LONCAPA::assess_re/))) { - my %editors = &Apache::loncommon::permitted_editors(); - if ($editors{'daxe'}) { - my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn"); - $in_daxe = 1; - $menuitems .= (<<ENDMENUITEMS); -my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn"); -s&7&6&tolastloc.png&Exit Daxe&resource[_1]&go('$privfile')&Exit editing this resource -ENDMENUITEMS - } - } } # # Editing options usually accessed via "Settings" in inline menu need to be # accessed in a different way, when Authoring Space is accessed in course # context # - if (($env{'request.role'} !~/^(aa|ca|au)/) || (!$noremote)) { + if ($env{'request.role'} !~/^(aa|ca|au)/) { my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn"); $menuitems .= (<<ENDMENUITEMS); s&7&5&editops.png&Options&edit[_1]&gocstr('/adm/preferences?action=authorsettings','$privfile')&Authoring Space Options ENDMENUITEMS } - if (ref($bread_crumbs) eq 'ARRAY') { &Apache::lonhtmlcommon::clear_breadcrumbs(); foreach my $crumb (@{$bread_crumbs}){ @@ -1403,43 +1022,13 @@ ENDMENUITEMS # We are in a course and looking at a registered URL # Should probably be in mydesk.tab # - $menuitems = "c&3&1"; - if ($ltiscope eq 'resource') { -# Suppress display of backward arrow for LTI Provider if scope is resource. -# Suppress display of forward arrow for LTI Provider if scope is resource. - } elsif ($ltiscope eq 'map') { -# Suppress display of backward arrow for LTI Provider if scope is map and this is first resource. -# Suppress display of forward arrow for LTI Provider if scope is map and this is the last resource. - my $showforw = 1; - my $showback = 1; - my $navmap = Apache::lonnavmaps::navmap->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 .= (<<ENDMENUITEMS); + $menuitems=(<<ENDMENUITEMS); +c&3&1 +s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1 +s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3 c&6&3 +c&8&1 c&8&2 s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document ENDMENUITEMS @@ -1472,15 +1061,13 @@ if ($env{'browser.mobile'}) { 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{^/adm/.+/ext\.tool$})) { + ($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(currentURL,'$is_mobile')&Show Metadata +s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata ENDREALRES } unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) || - ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) || - ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) { + ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/})) { $menuitems.=(<<ENDREALRES); s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource ENDREALRES @@ -1537,10 +1124,6 @@ ENDMENUITEMS } } } - my $linkprotout; - if ($env{'request.deeplink.login'}) { - $linkprotout = &linkprot_exit(); - } if ($noremote) { my $addremote=0; foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } @@ -1566,27 +1149,16 @@ ENDMENUITEMS if ($countdown) { &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); } - if ($linkprotout) { - &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout); - } } else { my @tools = @inlineremote[93,91,81,82,83]; if ($countdown) { unshift(@tools,$countdown); } - if ($linkprotout) { - unshift(@tools,$linkprotout); - } &Apache::lonhtmlcommon::add_breadcrumb_tool( 'tools',@tools); - #exit editing link/icon when using daxe in construction space #publish button in construction space if ($env{'request.state'} eq 'construct'){ - if ($in_daxe) { - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', $inlineremote[76]); - } &Apache::lonhtmlcommon::add_breadcrumb_tool( 'advtools', $inlineremote[63]); } else { @@ -1601,13 +1173,9 @@ ENDMENUITEMS 'advtools', $inlineremote[75]); } } - } else { - if ($linkprotout) { - &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout); - } } my ($topic_help,$topic_help_text); - if ($toplevel_cstr) { + if ($is_const_dir == 2) { if ((($ENV{'SERVER_PORT'} == 443) || ($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) { @@ -1616,9 +1184,6 @@ ENDMENUITEMS $topic_help_text = 'About WebDAV access'; } } - if (ref($showncrumbsref)) { - $$showncrumbsref = 1; - } return &Apache::lonhtmlcommon::scripttag('', 'start') . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) . &Apache::lonhtmlcommon::scripttag('', 'end'); @@ -1632,7 +1197,7 @@ ENDMENUITEMS &switch('','',@rest); } &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools', - @inlineremote[76,63,74,61,71,72,77,75]); + @inlineremote[63,61,71,72]); $cstrcrumbs = &Apache::lonhtmlcommon::scripttag('', 'start') .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) @@ -2024,40 +1589,20 @@ sub prepare_functions { $editbutton = &get_editbutton($cfile,$home,$switchserver, $forceedit,$forceview,$forcereg); } - } elsif (!$env{'request.course.id'}) { - if (($env{'user.author'}) && ($resurl eq '/adm/viewcoauthors')) { - if ($env{'request.role'} =~/^(ca|au)/) { - my ($audom,$auname); - if ($env{'request.role'} eq "au./$env{'user.domain'}/") { - ($audom,$auname) = ($env{'user.domain'},$env{'user.name'}); - } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)}) { - ($audom,$auname) = ($1,$2); - } - if (($audom ne '') && ($auname ne '')) { - my $file=&Apache::lonnet::declutter($env{'request.filename'}); - ($cfile,$home,$switchserver,$forceedit,$forceview) = - &Apache::lonnet::can_edit_resource($file,$auname,$audom, - $resurl); - if ($cfile) { - $editbutton = &get_editbutton($resurl,'','',$forceedit, - $forceview); - } - } - } - } elsif (($env{'user.author'}) && ($env{'request.filename'}) && - ($env{'request.role'} !~/^(aa|ca|au)/)) { + } elsif ((!$env{'request.course.id'}) && + ($env{'user.author'}) && ($env{'request.filename'}) && + ($env{'request.role'} !~/^(aa|ca|au)/)) { # # Currently do not have the role of author or co-author. # Do we have authoring privileges for the resource? # - my $file=&Apache::lonnet::declutter($env{'request.filename'}); - ($cfile,$home,$switchserver,$forceedit,$forceview) = - &Apache::lonnet::can_edit_resource($file,$cnum,$cdom, - &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group); - if (($cfile) && ($home ne '') && ($home ne 'no_host')) { - $editbutton = &get_editbutton($cfile,$home,$switchserver, - $forceedit,$forceview,$forcereg); - } + my $file=&Apache::lonnet::declutter($env{'request.filename'}); + ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($file,$cnum,$cdom, + &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group); + if (($cfile) && ($home ne '') && ($home ne 'no_host')) { + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg); } } elsif ($env{'request.course.id'}) { # @@ -2201,7 +1746,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$}) || @@ -2259,13 +1803,8 @@ sub advtools_crumbs { &Apache::lonhtmlcommon::add_breadcrumb_tool( 'advtools', @funcs[61,64,65,66,67,74]); } elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { - if ($env{'request.state'} eq 'construct') { - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', @funcs[61,73,74,71,72,77]); - } else { - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', @funcs[61,71,72,73,74,75,92]); - } + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'advtools', @funcs[61,71,72,73,74,92]); } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') { &Apache::lonhtmlcommon::add_breadcrumb_tool( 'advtools', $funcs[61]); @@ -2290,7 +1829,7 @@ sub clear { # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". sub switch { - my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$infunc,$form)=@_; + my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$infunc)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; $top=&mt($top); @@ -2351,15 +1890,14 @@ sub switch { unless ($env{'request.state'} eq 'construct') { push(@tools,63); } - if ((($env{'environment.icons'} eq 'iconsonly') || - ($env{'environment.icons'} eq '') && ($env{'request.lti.login'})) && + if (($env{'environment.icons'} eq 'iconsonly') && (grep(/^$idx$/,@tools))) { $inlineremote[$idx] = '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>'; } else { $inlineremote[$idx] = '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic. - '<span class="LC_menubuttons_inline_text">'.$top.' </span></a>'.$form; + '<span class="LC_menubuttons_inline_text">'.$top.' </span></a>'; } } return ''; @@ -2511,8 +2049,6 @@ sub rawconfig { } else { next; } - } elsif ($priv eq 'cca') { - next if ($rol eq 'cm'); } if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) || (($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) { @@ -2594,24 +2130,6 @@ sub rawconfig { } } } - } elsif ($pro eq 'coauthor') { - if ($env{'request.role'}=~ m{^(ca|aa)\./($match_domain)/($match_username)$}) { - my ($role,$audom,$auname) = ($1,$2,$3); - if ((($prt eq 'raa') && ($role eq 'aa')) || - (($prt eq 'rca') && ($role eq 'ca') && - (!$env{"environment.internal.manager./$audom/$auname"}))) { - $output.=&switch($auname,$audom, - $row,$col,$img,$top,$bot,$act,$desc,$cat); - } - } - } elsif ($pro eq 'coauthorenv_manager') { - if ($env{'request.role'}=~ m{^ca\./($match_domain)/($match_username)$}) { - my ($audom,$auname) = ($1,$2); - if ($env{"environment.internal.manager./$audom/$auname"}) { - $output.=&switch($auname,$audom, - $row,$col,$img,$top,$bot,$act,$desc,$cat); - } - } } elsif ($pro eq 'tools') { my @tools = ('aboutme','blog','portfolio'); if (grep(/^\Q$prt\E$/,@tools)) { @@ -2738,328 +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'} .= '<p class="LC_error">'; - 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.').'</span>'; - } else { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit an answer for it.').'</p>'; - } - } - $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 <<END; -<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> - -<div id="LC_done-confirm" title="$lt{'title'}"> - <p>$lt{'preamble'} $lt{$type}</p> - $lt{'miss'} - <p>$lt{'proctor'}</p> - <form name="LCdoneButtonProctor" action=""> - <label>$lt{'key'}<input type="password" name="LC_interval_done_proctorkey" value="" /></label> - <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" /> - </form> - <p>$lt{'cancel'}</p> -</div> - -<script type="text/javascript"> -// <![CDATA[ - \$( "#LC_done-confirm" ).dialog({ autoOpen: false }); - \$( "#LC_done-confirm-opener" ).on("click", function() { - \$( "#LC_done-confirm" ).dialog("open"); - \$( "#LC_done-confirm" ).dialog({ - height: $height, - width: $width, - modal: true, - resizable: false, - buttons: [ - { - text: "$lt{'ok'}", - click: function() { - var proctorkey = \$( '[name="LC_interval_done_proctorkey"]' )[0].value; - if ((proctorkey == '') || (proctorkey == null)) { - alert("$lt{'nokey'}"); - } else { - \$( '[name="LC_interval_done"]' )[0].value = 'true'; - \$( '[name="LC_interval_done_proctorpass"]' )[0].value = proctorkey; - \$( '[name="LCdoneButton"]' )[0].submit(); - } - }, - }, - { - text: "$lt{'exit'}", - click: function() { - \$("#LC_done-confirm").dialog( "close" ); - } - } - ], - close: function() { - \$( '[name="LC_interval_done_proctorkey"]' )[0].value = ''; - } - }); - \$( "#LC_done-confirm" ).find( "form" ).on( "submit", function( event ) { - event.preventDefault(); - \$( '[name="LC_interval_done"]' )[0].value = 'true'; - \$( '[name="LC_interval_done_proctorpass"]' )[0].value = \$( '[name="LC_interval_done_proctorkey"]' )[0].value; - \$( '[name="LCdoneButton"]' )[0].submit(); - }); -}); - -// ]]> -</script> - -END - } else { - if ($height !~ /^\d+$/) { - $height = 320; - if ($missing) { - $height += 60; - } - } - if ($width !~ /^\d+$/) { - $width = 320; - if ($missing) { - $width += 60; - } - } - if ($missing) { - $lt{'miss'} = '</p>'.$lt{'miss'}.'<p>'; - } - return <<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> - -<div id="LC_done-confirm" title="$lt{'title'}"> - <p>$lt{'preamble'} $lt{$type} $lt{'miss'} $lt{'okdone'} $lt{'cancel'}</p> -</div> - -<script type="text/javascript"> -// <![CDATA[ -\$( "#LC_done-confirm" ).dialog({ autoOpen: false }); -\$( "#LC_done-confirm-opener" ).click(function() { - \$( "#LC_done-confirm" ).dialog( "open" ); - \$( "#LC_done-confirm" ).dialog({ - resizable: false, - height: $height, - width: $width, - modal: true, - buttons: [ - { - text: "$lt{'ok'}", - click: function() { - \$( this ).dialog( "close" ); - \$( '[name="LC_interval_done"]' )[0].value = 'true'; - \$( '[name="LCdoneButton"]' )[0].submit(); - }, - }, - { - text: "$lt{'exit'}", - click: function() { - \$( this ).dialog( "close" ); - }, - }, - ], - }); -}); -// ]]> -</script> - -END - } -} - -sub view_as_js { - my ($url,$symb) = @_; - my %lt = &Apache::lonlocal::texthash( - ente => 'Enter a username or a student/employee ID', - info => 'Information you entered does not match a valid course user', - ); - &js_escape(\%lt); - return <<"END"; - -function toggleViewAsUser(change) { - if (document.getElementById('LC_selectuser')) { - var seluserid = document.getElementById('LC_selectuser'); - var currstyle = seluserid.style.display; - if (change == 'off') { - document.userview.elements['LC_viewas'].value = ''; - document.userview.elements['vuname'].value = ''; - document.userview.elements['vid'].value = ''; - document.userview.submit(); - return; - } - if ((document.getElementById('usexpand')) && (document.getElementById('uscollapse'))) { - if (currstyle == 'inline') { - seluserid.style.display = 'none'; - document.getElementById('usexpand').innerHTML='► '; - document.getElementById('uscollapse').innerHTML=''; - } else { - seluserid.style.display = 'inline'; - document.getElementById('usexpand').innerHTML=''; - document.getElementById('uscollapse').innerHTML='◄ '; - toggleIdentifier(document.userview); - } - } - } - return; -} - -function validCourseUser(form,change) { - var possuname = form.elements['vuname'].value; - var possuid = form.elements['vid'].value; - var domelem = form.elements['vudom']; - var possudom = ''; - if ((domelem.tagName === 'INPUT') && ((domelem.type === 'text') || (domelem.type === 'hidden'))) { - possudom = domelem.value; - } else if (domelem.tagName === 'SELECT') { - possudom = domelem.options[domelem.selectedIndex].value; - } - if ((possuname == '') && (possuid == '')) { - if (change == 'off') { - form.elements['LC_viewas'].value = ''; - form.submit(); - } else { - alert("$lt{'ente'}"); - } - return; - } - var http = new XMLHttpRequest(); - var url = "/adm/courseuser"; - var params = "uname="+possuname+"&uid="+possuid+"&udom="+possudom; - http.open("POST", url, true); - http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - http.onreadystatechange = function() { - if (http.readyState == 4 && http.status == 200) { - var data = JSON.parse(http.responseText); - if (Array.isArray(data.match)) { - var len = data.match.length; - if (len == 2) { - if (data.match[0] != '' && data.match[1] != '') { - form.elements['LC_viewas'].value = data.match[0]+':'+data.match[1]; - form.submit(); - } - } else { - alert("$lt{'info'}"); - } - } - } - return; - } - http.send(params); - return false; -} - -function toggleIdentifier(form) { - if ((document.getElementById('LC_vuname')) && (document.getElementById('LC_vid'))) { - var radioelem = form.elements['vuidentifier']; - if (radioelem.length > 0) { - var i; - for (i=0; i<radioelem.length; i++) { - if (radioelem[i].checked == true) { - if (radioelem[i].value == 'uname') { - document.getElementById('LC_vuname').type = 'text'; - document.getElementById('LC_vid').type = 'hidden'; - document.getElementById('LC_vid').value = ''; - } else { - document.getElementById('LC_vuname').type = 'hidden'; - document.getElementById('LC_vuname').value = ''; - document.getElementById('LC_vid').type = 'text'; - } - break; - } - } - } - } - return; -} - -END -} - sub utilityfunctions { my ($httphost) = @_; my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); @@ -3097,37 +2293,9 @@ sub utilityfunctions { my $esc_url=&escape($currenturl); my $esc_symb=&escape($currentsymb); - my $newname = &mt('New Name'); - &js_escape(\$newname); my $countdown = &countdown_toggle_js(); - my $viewuser; - if (($env{'request.course.id'}) && - ($env{'request.symb'} ne '') && - ($env{'request.filename'}=~/$LONCAPA::assess_re/)) { - my $canview; - foreach my $priv ('msg','vgr') { - $canview = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); - if (!$canview && $env{'request.course.sec'} ne '') { - $canview = - &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); - } - last if ($canview); - } - if ($canview) { - $viewuser = &view_as_js($esc_url,$esc_symb); - } - } - - 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'; @@ -3190,22 +2358,6 @@ function gocstr(url,filename) { this.document.cstrdelete.submit(); return; } - if ((url == '/adm/cfile?action=copy') || (url == '/adm/cfile?action=rename')) { - this.document.cstrcopy.filename.value = filename; - var oldname = filename.substring(filename.lastIndexOf("/") + 1); - var newname=prompt('$newname',oldname); - if (newname == "" || !newname || newname == oldname) { - return; - } - if (url == '/adm/cfile?action=rename') { - this.document.cstrcopy.action.value = 'rename'; - } else { - this.document.cstrcopy.action.value = 'copy'; - } - this.document.cstrcopy.newfilename.value = newname; - this.document.cstrcopy.submit(); - return; - } if (url == '/adm/printout') { this.document.cstrprint.postdata.value = filename this.document.cstrprint.curseed.value = 0; @@ -3248,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'); } } @@ -3312,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])); @@ -3339,20 +2474,12 @@ function open_aboutLC() { $countdown -$viewuser - ENDUTILITY } sub serverform { - my $target; - if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) { - $target = ' target="_self"'; - } else { - $target = ' target="_top"'; - } return(<<ENDSERVERFORM); -<form name="server" action="/adm/logout" method="post"$target> +<form name="server" action="/adm/logout" method="post" target="_top"> <input type="hidden" name="postdata" value="none" /> <input type="hidden" name="command" value="none" /> <input type="hidden" name="url" value="none" /> @@ -3362,36 +2489,19 @@ 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(<<ENDCONSTSPACEFORM); -<form name="constspace" action="/adm/logout" method="post"$target> +<form name="constspace" action="/adm/logout" method="post" target="_top"> <input type="hidden" name="filename" value="" /> </form> -<form name="cstrdelete" action="/adm/cfile" method="post"$target> +<form name="cstrdelete" action="/adm/cfile" method="post" target="_top"> <input type="hidden" name="action" value="delete" /> <input type="hidden" name="filename" value="" /> </form> -<form name="cstrprint" action="/adm/printout" method="post"$printtarget> +<form name="cstrprint" action="/adm/printout" target="_parent" method="post"> <input type="hidden" name="postdata" value="" /> <input type="hidden" name="curseed" value="" /> <input type="hidden" name="problemtype" value="" /> </form> -<form name="cstrcopy" action="/adm/cfile" method="post"$target> -<input type="hidden" name="action" value="copy" /> -<input type="hidden" name="filename" value="" /> -<input type="hidden" name="newfilename" value="" /> -</form> ENDCONSTSPACEFORM } @@ -3417,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'; @@ -3523,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 = - '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.'>'."\n". + '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n". ' <input type="hidden" name="destinationurl" value="'. &HTML::Entities::encode($destinationurl).'" />'."\n". ' <input type="hidden" name="gotorole" value="1" />'."\n". @@ -3548,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)]); } @@ -3585,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 { @@ -3764,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.', @@ -3776,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". @@ -3799,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}))) { @@ -3822,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"; @@ -3860,8 +2937,8 @@ function adhocRole(newrole) { if (rolecheck > 0) { for (var i=0; i<disallow.length; i++) { if (disallow[i] == newrole) { - if (confirm("$lt{'role'}\\n$displaymsg")) { - document.rolechooser.destinationurl.value = '$fallback'; + if (confirm("$lt{'role'}\\n$lt{'swit'}")) { + document.rolechooser.destinationurl.value = '/adm/menu'; } else { return; } @@ -3951,26 +3028,16 @@ sub required_privs { sub countdown_timer { if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') && - (($env{'request.filename'}=~/$LONCAPA::assess_re/) || - (($env{'request.symb'} =~ /ext\.tool$/) && - (&Apache::lonnet::EXT('resource.0.gradable',$env{'request.symb'}) =~ /^yes$/i)))) { + ($env{'request.filename'}=~/$LONCAPA::assess_re/)) { my ($type,$hastimeleft,$slothastime); my $now = time; if ($env{'request.filename'} =~ /\.task$/) { $type = 'Task'; - } elsif ($env{'request.symb'} =~ /ext\.tool$/) { - $type = 'tool'; } else { $type = 'problem'; } - my ($status,$accessmsg,$slot_name,$slot); - if ($type eq 'tool') { - ($status,$accessmsg,$slot_name,$slot) = - &Apache::lonhomework::check_slot_access('0',$type,$env{'request.symb'},['0']); - } else { - ($status,$accessmsg,$slot_name,$slot) = - &Apache::lonhomework::check_slot_access('0',$type); - } + my ($status,$accessmsg,$slot_name,$slot) = + &Apache::lonhomework::check_slot_access('0',$type); if ($slot_name ne '') { if (ref($slot) eq 'HASH') { if (($slot->{'starttime'} < $now) && @@ -3984,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; } } @@ -4005,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 = '◄ '; @@ -4025,7 +3077,7 @@ sub countdown_timer { } my $desc = &mt('Countdown to due date/time'); return <<END; -$donebutton + <a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> <span id="ddcountcollapse" class="LC_menubuttons_inline_text"> $collapse @@ -4040,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 <<END; -<form method="post" name="LCexitButton" action="/adm/linkexit"> - <input type="hidden" name="LC_deeplink_exit" value="" /> - <button id="LC_exit-confirm-opener" type="button">$exitbuttontext</button> -</form> - -<div id="LC_exit-confirm" title="$lt{'title'}"> - <p>$lt{'okdone'} $lt{'cancel'}</p> -</div> - -<script type="text/javascript"> -// <![CDATA[ -\$( "#LC_exit-confirm" ).dialog({ autoOpen: false }); -\$( "#LC_exit-confirm-opener" ).click(function() { - \$( "#LC_exit-confirm" ).dialog( "open" ); - \$( "#LC_exit-confirm" ).dialog({ - resizable: false, - height: $height, - width: $width, - modal: true, - buttons: [ - { - text: "$lt{'ok'}", - click: function() { - \$( this ).dialog( "close" ); - \$( '[name="LC_deeplink_exit"]' )[0].value = 'true'; - \$( '[name="LCexitButton"]' )[0].submit(); - }, - }, - { - text: "$lt{'exit'}", - click: function() { - \$( this ).dialog( "close" ); - }, - }, - ], - }); -}); -// ]]> -</script> - -END - } - } - } - } - } - } - return; -} - # ================================================================ Main Program BEGIN { @@ -4144,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];