--- loncom/interface/lonmenu.pm 2023/12/29 19:53:25 1.369.2.83.2.13 +++ loncom/interface/lonmenu.pm 2018/12/30 19:47:02 1.495 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.83.2.13 2023/12/29 19:53:25 raeburn Exp $ +# $Id: lonmenu.pm,v 1.495 2018/12/30 19:47:02 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,$ltitarget) This routine wraps a menuitem in proper HTML. It is used by primary_menu() and secondary_menu(). @@ -118,72 +118,51 @@ Same as primary_menu() but operates on @ =item create_submenu() -Creates XHTML for unordered list of sub-menu items which belong to a +Creates XHTML for unordered list of sub-menu items which belong to a particular top-level menu item. Uses hover pseudo class in css to display -dropdown list when mouse hovers over top-level item. Support for IE6 +dropdown list when mouse hovers over top-level item. Support for IE6 (no hover psuedo class) via LC_hoverable class for
  • tag for top- level item, which employs jQuery to handle behavior on mouseover. Inputs: 6 - (a) link and (b) target for anchor href in top level item, - (c) title for text wrapped by anchor tag in top level item. - (d) reference to array of arrays of sub-menu items. - (e) boolean to indicate whether to call &mt() to translate + (c) title for text wrapped by anchor tag in top level item, + (d) reference to array of arrays of sub-menu items, + (e) boolean to indicate whether to call &mt() to translate name of menu item, (f) optional class for
  • element in primary menu, for which sub menu is being generated. -The underlying datastructure used in (d) contains data from mydesk.tab. -It consists of an array which has an array for each item appearing in -the menu (e.g. [["link", "title", "condition"]] for a single-item menu). -create_submenu() supports also the creation of XHTML for nested dropdown -menus represented by unordered lists. This is done by replacing the -scalar used for the link with an arrayreference containing the menuitems -for the nested menu. This can be done recursively so that the next menu -may also contain nested submenus. + The underlying datastructure used in (d) contains data from mydesk.tab. + It consists of an array which has an array for each item appearing in + the menu (e.g. [["link", "title", "condition"]] for a single-item menu). + create_submenu() supports also the creation of XHTML for nested dropdown + menus represented by unordered lists. This is done by replacing the + scalar used for the link with an arrayreference containing the menuitems + for the nested menu. This can be done recursively so that the next menu + may also contain nested submenus. Example: - [ # begin of datastructure - ["/home/", "Home", "condition1"], # 1st item of the 1st layer menu - [ # 2nd item of the 1st layer menu - [ # anon. array for nested menu - ["/path1", "Path1", undef], # 1st item of the 2nd layer menu - ["/path2", "Path2", undef], # 2nd item of the 2nd layer menu - [ # 3rd item of the 2nd layer menu - [[...], [...], ..., [...]], # containing another menu layer - "Sub-Sub-Menu", # title for this container - undef - ] - ], # end of array/nested menu - "Sub-Menu", # title for the container item - undef - ] # end of 2nd item of the 1st layer menu + [ # begin of datastructure + ["/home/", "Home", "condition1"], # 1st item of the 1st layer menu + [ # 2nd item of the 1st layer menu + [ # anon. array for nested menu + ["/path1", "Path1", undef], # 1st item of the 2nd layer menu + ["/path2", "Path2", undef], # 2nd item of the 2nd layer menu + [ # 3rd item of the 2nd layer menu + [[...], [...], ..., [...]], # containing another menu layer + "Sub-Sub-Menu", # title for this container + undef + ] + ], # end of array/nested menu + "Sub-Menu", # title for the container item + undef + ] # end of 2nd item of the 1st layer menu ] - =item innerregister() This gets called in order to register a URL in the body of the document -=item loadevents() - -=item unloadevents() - -=item startupremote() - -=item setflags() - -=item maincall() - -=item load_remote_msg() - -=item get_menu_name() - -=item reopenmenu() - -=item open() - -Open the menu - =item clear() =item switch() @@ -231,6 +210,7 @@ use Apache::lonenc(); use Apache::lonlocal; use Apache::lonmsg(); use LONCAPA qw(:DEFAULT :match); +use LONCAPA::ltiutils; use HTML::Entities(); use Apache::lonwishlist(); @@ -240,9 +220,9 @@ use vars qw(@desklines %category_names % my @inlineremote; sub prep_menuitem { - my ($menuitem,$target,$listclass,$linkattr) = @_; + my ($menuitem,$ltitarget) = @_; return '' unless(ref($menuitem) eq 'ARRAY'); - my ($link,$targetattr); + my $link; if ($$menuitem[1]) { # graphical Link $link = "':'
  • ').'$link
    • |; + . qq| href="$$menuitem[0]"$target>$link|; } # primary_menu() evaluates @primary_menu and returns a two item array, @@ -266,8 +247,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 ($crstype,$ltimenu) = @_; + my (%menu,%ltiexc); # each element of @primary contains following array: # (link url, icon path, alt text, link text, condition, position) my $public; @@ -275,9 +256,19 @@ sub primary_menu { || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { $public = 1; } - my $lti; + my $rolecount; + if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { + my $update=$env{'user.update.time'}; + if (!$update) { + $update = $env{'user.login.time'}; + } + my %roles_in_env; + $rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update); + } + my ($lti,$ltitarget); if ($env{'request.lti.login'}) { $lti = 1; + $ltitarget = $env{'request.lti.target'}; if (ref($ltimenu) eq 'HASH') { foreach my $item ('fullname','logout') { unless ($ltimenu->{$item}) { @@ -286,30 +277,6 @@ sub primary_menu { } } } - 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,92 +291,63 @@ 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 + && (&Apache::loncommon::show_course() ##term 'Courses' or + || $env{'request.lti.login'}); ##'Roles' wanted next if $$menuitem[4] eq 'courses' ##and not LTI access && (!&Apache::loncommon::show_course() - || $lti); + || !$env{'request.lti.login'}); next if $$menuitem[4] eq 'notlti' && $lti; next if $$menuitem[4] eq 'ltiexc' && exists($ltiexc{lc($menuitem->[3])}); my $title = $menuitem->[3]; + if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { + if ($menuitem->[4] eq 'courses') { + next unless ($rolecount>1); + } else { + next unless (($title eq 'Personal') || ($title eq 'Logout')); + } + } 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; - } - } - } if (defined($primary_submenu{$title})) { - my $link; + my ($link,$target); if ($menuitem->[0] ne '') { $link = $menuitem->[0]; + unless ($ltitarget eq 'iframe') { + $target = '_top'; + } } else { $link = '#'; } my @primsub; if (ref($primary_submenu{$title}) eq 'ARRAY') { foreach my $item (@{$primary_submenu{$title}}) { - next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); - next if ((($item->[2] eq 'portfolio') || - ($item->[2] eq 'blog')) && + next if (($crstype eq 'Placement') && (!$env{'request.role.adv'})); + next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); + next if ((($item->[2] eq 'portfolio') || + ($item->[2] eq 'blog')) && (!&Apache::lonnet::usertools_access('','',$item->[2], undef,'tools'))); - if ($item->[2] eq 'browsepub') { - if ($env{'request.role'} =~ /^au\./) { - $item->[0] = '/res/'.$env{'request.role.domain'}.'/?launch=1'; - } elsif ($env{'request.role'} =~ /^ca\./($match_domain)/($match_user)$/) { - $item->[0] = '/res/'.$1.'/'.$2.'/?launch=1'; - } elsif (&Apache::lonnet::allowed('bre',$env{'user.domain'})) { - $item->[0] = '/res/'.$env{'user.domain'}.'/?launch=1'; - } elsif (&Apache::lonnet::allowed('bro','/res/')) { - $item->[0] = '/res/?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') { - $title = &mt($title); + if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) { + unless ($ltiexc{'fullname'}) { + $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); } } else { $title = &mt($title); } if (@primsub > 0) { - $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1,undef,$listclass,$linkattr); + $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1); } elsif ($link) { - $menu{$position} .= ($listclass?'
  • ':'
  • '). - ''.$title.'
    • '; + $menu{$position} .= '
  • '.$title.'
    • '; } } } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink + next if ($crstype eq 'Placement'); if ($public) { my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $defdom = &Apache::lonnet::default_login_domain(); @@ -417,22 +355,13 @@ sub primary_menu { 'helpdeskmail', $defdom,$origmail); if ($to ne '') { - $menu{$position} .= &prep_menuitem($menuitem,$target,$listclass,$linkattr); + $menu{$position} .= &prep_menuitem($menuitem,$ltitarget); } } else { - $menu{$position} .= ($listclass?'
  • ':'
  • '). - &Apache::loncommon::top_nav_help('Help',$linkattr). - '
    • '; - } - } elsif ($$menuitem[3] eq 'Log In') { - if ($public) { - if (&Apache::lonnet::get_saml_landing()) { - $$menuitem[0] = '/adm/login'; - } + $menu{$position} .= '
  • '.&Apache::loncommon::top_nav_help('Help').'
    • '; } - $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr); } else { - $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$ltitarget); } } my @output = ('',''); @@ -471,8 +400,7 @@ sub getauthor{ } sub secondary_menu { - my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref, - $links_disabled,$links_target) = @_; + my ($httphost,$ltiscope,$ltimenu,$noprimary) = @_; my $menu; my $crstype = &Apache::loncommon::course_type(); @@ -480,29 +408,28 @@ sub secondary_menu { ? "/$env{'request.course.sec'}" : ''); my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'}); - my $canvieweditor = &Apache::lonnet::allowed('cev', $env{'request.course.id'}); + my $canvieweditor = &Apache::lonnet::allowed('cev', $env{'request.course.id'}); my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'}; if ($canviewroster eq 'disabled') { undef($canviewroster); } - my $canviewgrps = &Apache::lonnet::allowed('vcg', $crs_sec); + my $canviewgrps = &Apache::lonnet::allowed('vcg', $crs_sec); my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec); - my $canviewusers = &Apache::lonnet::allowed('vcl', $crs_sec); - my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec); + my $canviewusers = &Apache::lonnet::allowed('vcl', $crs_sec); + my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec); my $canviewpara = &Apache::lonnet::allowed('vpa', $crs_sec); 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 $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); - $grouptools = 0; + my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,$lti,$ltimapres,%ltiexc); + $grouptools = 0; if ($env{'request.course.id'}) { $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - unless ($canedit || $canvieweditor) { + unless ($canedit || $canvieweditor) { unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) { if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) || ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) || @@ -521,9 +448,10 @@ sub secondary_menu { $showresv = 1; } } - if ($env{'request.course.groups'} ne '') { - foreach my $group (split(/:/,$env{'request.course.groups'})) { - next unless ($group =~ /^\w+$/); + my %groups = &Apache::lonnet::get_active_groups( + $env{'user.domain'}, $env{'user.name'},$cdom,$cnum); + if (%groups) { + foreach my $group (keys(%groups)) { my @privs = split(/:/,$env{"user.priv.$env{'request.role'}./$cdom/$cnum/$group"}); shift(@privs); if (@privs) { @@ -545,17 +473,8 @@ sub secondary_menu { } } } - if (($menucoll) && (ref($menuref) eq 'HASH')) { - %menuopts = %{$menuref}; - } - - my ($listclass,$linkattr,$target); - if ($links_disabled) { - $listclass = 'LCisDisabled'; - $linkattr = 'aria-disabled="true"'; - } - my ($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)) || @@ -564,36 +483,20 @@ 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'; - } + my ($roleswitcher_js,$roleswitcher_form,$ltitarget); + if ($env{'request.lti.login'}) { + $ltitarget = $env{'request.lti.target'}; } foreach my $menuitem (@secondary_menu) { # evaluate conditions next if ref($menuitem) ne 'ARRAY'; + next if (($crstype eq 'Placement') && ($$menuitem[3] ne 'Roles') && (!$env{'request.role.adv'})); next if $$menuitem[4] ne 'always' - && ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') + && ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') && !$env{'request.course.id'}; next if $$menuitem[4] =~ /^crsedit/ && (!$canedit && !$canvieweditor); - next if $$menuitem[4] eq 'crseditCourse' - && ($crstype eq 'Community'); - next if $$menuitem[4] eq 'crseditCommunity' - && ($crstype eq 'Course'); next if $$menuitem[4] eq 'nvgr' && ($canvgr || $ltiexc{'grades'}); next if $$menuitem[4] eq 'vgr' @@ -610,7 +513,7 @@ sub secondary_menu { && !$canviewwnew; next if $$menuitem[4] eq 'params' && (!$canmodpara && !$canviewpara); - next if $$menuitem[4] eq 'nvcg' + next if $$menuitem[4] eq 'showgroups' && ($canviewgrps || !$grouptools); next if $$menuitem[4] eq 'showsyllabus' && !$showsyllabus; @@ -632,17 +535,13 @@ sub secondary_menu { && $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]; + unless ($ltitarget eq 'iframe') { + $target = '_top'; + } } else { $link = '#'; } @@ -667,36 +566,32 @@ sub secondary_menu { next if (!&Apache::lonnet::usertools_access('','',$tool, undef,'tools')); } - push(@scndsub,$item); + push(@scndsub,$item); } } - if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'}) { + 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); + $menu .= &create_submenu($link,$target,$title,\@scndsub,1); } elsif ($link ne '#') { - $menu .= ($listclass?'
  • ':'
  • '). - ''. - &mt($title).'
    • '; + $menu .= '
  • '.&mt($title).'
    • '; } } } 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 + $env{'course.' . $env{'request.course.id'} . '.domain'}, + $env{'course.' . $env{'request.course.id'} . '.num'}, + $httphost,$ltitarget ); - if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) { - next unless ($has_opa_priv); - } $menu .= $switcher; + } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink + next if ($crstype eq 'Placement'); + $menu .= '
  • '.&Apache::loncommon::top_nav_help('Help').'
    • '; } else { if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) { my $url = $$menuitem[0]; @@ -710,7 +605,7 @@ sub secondary_menu { } if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) { if (($ENV{'SERVER_PORT'} == 443) || ($env{'request.use_absolute'} =~ m{^https://})) { - unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl())) { + unless (&Apache::lonnet::uses_sts()) { unless ($$menuitem[0] =~ m{^https?://}) { $$menuitem[0] = 'http://'.$ENV{'SERVER_NAME'}.$$menuitem[0]; } @@ -722,7 +617,7 @@ sub secondary_menu { } $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"'); } - $menu .= &prep_menuitem(\@$menuitem,$target,$listclass,$linkattr); + $menu .= &prep_menuitem(\@$menuitem,$ltitarget); } } if ($menu =~ /\[url\].*\[symb\]/) { @@ -746,7 +641,7 @@ 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'}) { + if ($env{'request.course.id'}) { $menu =~ s/\[cnum\]/$cnum/g; $menu =~ s/\[cdom\]/$cdom/g; } @@ -760,14 +655,14 @@ sub secondary_menu { } sub create_submenu { - my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_; + my ($link,$target,$title,$submenu,$translate,$addclass) = @_; 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. ''. ' ▼'. @@ -775,7 +670,7 @@ sub create_submenu { # $link and $title are only used in the initial string written in $menu # as seen above, not needed for nested submenus - $menu .= &build_submenu($target, $submenu, $translate, '1', $listclass, $linkattr); + $menu .= &build_submenu($target, $submenu, $translate, '1'); $menu .= '
    • '; return $menu; @@ -785,7 +680,7 @@ sub create_submenu { # build the dropdown (and nested submenus) recursively # see perldoc create_submenu documentation for further information sub build_submenu { - my ($target, $submenu, $translate, $first_level, $listclass, $linkattr) = @_; + my ($target, $submenu, $translate, $first_level) = @_; unless (@{$submenu}) { return ''; } @@ -818,11 +713,11 @@ sub build_submenu { if (ref($href) eq 'ARRAY') { $menu .= '
  • '; $menu .= '

    ' - . $title . '▶

    '; + . $title . '▶

    '; $menu .= ''; - $menu .= '
    • '; + $menu .= ''; } else { # href is the actual hyperlink and does not represent another submenu # for the current menu title if ($href =~ /(aboutme|rss\.html)$/) { @@ -844,17 +739,14 @@ sub build_submenu { } $href =~ s/\[returnurl\]/$returnurl/; } - my $targetattr; unless (($href eq '') || ($href =~ /^\#/)) { - if ($target ne '') { - $targetattr = ' target="'.$target.'"'; + if ($target eq '_top') { + $target = ' target="_top"'; } } - $menu .= '
  • '; - $menu .= '' . $title . ''; + $menu .= '
  • '; + $menu .= '' . $title . ''; $menu .= '
    • '; } } @@ -862,37 +754,8 @@ sub build_submenu { return $menu; } -sub registerurl { - my ($forcereg) = @_; - my $result = ''; - if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - my $force_title=''; - if ($env{'request.state'} eq 'construct') { - $force_title=&Apache::lonxml::display_title(); - } - if (($env{'environment.remote'} ne 'on') || - ((($env{'request.publicaccess'}) || - (!&Apache::lonnet::is_on_map( - &unescape($env{'request.noversionuri'})))) && - (!$forcereg))) { - return - $result - .'' - .$force_title; - } -# Graphical display after login only - if ($env{'request.registered'} && !$forcereg) { return ''; } - $result.=&innerregister($forcereg); - return $result.$force_title; -} - sub innerregister { - my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname, - $ltiscope,$ltiuri,$showncrumbsref) = @_; + my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,$ltiscope,$ltiuri) = @_; my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; @@ -900,24 +763,13 @@ sub innerregister { $env{'request.registered'} = 1; - my $noremote = ($env{'environment.remote'} ne 'on'); - undef(@inlineremote); - my $reopen=&Apache::lonmenu::reopenmenu(); - - my $newmail=''; - - if (&Apache::lonmsg::newmail() && !$noremote) { - # We have new mail and remote is up - $newmail= 'swmenu.setstatus("you have","messages");'; - } - my ($mapurl,$resurl,$crstype,$navmap); if ($env{'request.course.id'}) { # -#course_type: Course or Community +#course_type: Course, Community, or Placement # $crstype = &Apache::loncommon::course_type(); if ($env{'request.symb'}) { @@ -931,9 +783,9 @@ sub innerregister { my $maptitle = &Apache::lonnet::gettitle($mapurl); my $restitle = &Apache::lonnet::gettitle($symb); - my (@crumbs,@mapcrumbs); - if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '')) { + if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') && + (!(($crstype eq 'Placement') && !$env{'request.role.adv'}))) { unless ($ltiscope eq 'resource') { if (($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) && !(($ltiscope eq 'map') && (&Apache::lonnet::clutter($resurl) eq $ltiuri))) { @@ -944,23 +796,29 @@ sub innerregister { } } } - unless (($ltiscope eq 'map') || ($ltiscope eq 'resource')) { + unless (($forcereg) && + ($env{'request.noversionuri'} eq '/adm/navmaps') && + ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) || + (($crstype eq 'Placement') && (!$env{'request.role.adv'})) || + ($ltiscope eq 'map') || ($ltiscope eq 'resource')) { @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')) { + } elsif (!(($crstype eq 'Placement') && (!$env{'request.role.adv'})) && + ($ltiscope ne 'map') && ($ltiscope ne 'resource')) { push(@crumbs, {text => '...', no_mt => 1}); } } - unless ((@mapcrumbs) || (!$maptitle) || ($maptitle eq 'default.sequence') || + unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) || (@mapcrumbs) || + (!$maptitle) || ($maptitle eq 'default.sequence') || ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) || - ($ltiscope eq 'resource')) { - push @crumbs, {text => $maptitle, no_mt => 1, + ($ltiscope eq 'resource')) { + push @crumbs, {text => $maptitle, no_mt => 1, href => &Apache::lonnet::clutter($mapurl).'?navmap=1'}; } if ($restitle && !@mapcrumbs) { @@ -988,51 +846,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'),'\'"<>&'); - ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); - } - if (ref($showncrumbsref)) { - $$showncrumbsref = 1; + $title = &mt('View Resource'); + ($trail) = + &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') { @@ -1048,201 +882,90 @@ sub innerregister { &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'}); } } - my $timesync = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' ); # ============================================================================= # ============================ This is for URLs that actually can be registered - if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) - || ($forcereg)) { - - my %swtext; - if ($noremote) { - %swtext = &get_inline_text(); - } else { - %swtext = &get_rc_text(); - } - my $hwkadd=''; - - my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit, - $forceview,$editbutton); - if (($resurl =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) || - ($env{'request.role'} !~/^(aa|ca|au)/)) { - if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - } - $editbutton = &prepare_functions($resurl,$forcereg,$group,'','','',$hostname); - } - if ($editbutton eq '') { - $editbutton = &clear(6,1); - } + return '' unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) + || $forcereg ); + my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit, + $forceview,$editbutton); + if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) || + ($env{'request.role'} !~/^(aa|ca|au)/)) { + $editbutton = &prepare_functions($resurl,$forcereg,$group,'','','',$hostname); + } + if ($editbutton eq '') { + $editbutton = &clear(6,1); + } # # This applies in course context # - if ($env{'request.course.id'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - $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/) { - push(@privs,('mgr','vgr')); - } - push(@privs,('opa','vpa')); - } - foreach my $priv (@privs) { - $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); - if (!$perms{$priv} && $env{'request.course.sec'} ne '') { - $perms{$priv} = - &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); - } + if ($env{'request.course.id'}) { + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $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/) { + push(@privs,('mgr','vgr')); + } + push(@privs,('opa','vpa')); + } + foreach my $priv (@privs) { + $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); + if (!$perms{$priv} && $env{'request.course.sec'} ne '') { + $perms{$priv} = + &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); } + } # # Determine whether or not to show Grades and Submissions buttons # - if (($env{'request.symb'} ne '') && - (($env{'request.filename'}=~/$LONCAPA::assess_re/) || ($gradable_exttool))) { - if ($perms{'mgr'}) { - $hwkadd.= &switch('','',7,2,'pgrd.png','Content Grades', - 'grades[_4]', - "gocmd('/adm/grades','gradingmenu')", - 'Content Grades'); - } elsif ($perms{'vgr'}) { - $hwkadd .= &switch('','',7,2,'subm.png','Content Submissions', - 'missions[_1]', - "gocmd('/adm/grades','submission')", - 'Content Submissions'); - } - } - if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) { - $hwkadd .= &switch('','',7,3,'pparm.png','Content Settings', - 'parms[_2]',"gocmd('/adm/parmset','set')", - 'Content Settings'); - } + if (($env{'request.symb'} ne '') && + (($env{'request.filename'}=~/$LONCAPA::assess_re/) || ($gradable_exttool))) { + if ($perms{'mgr'}) { + &switch('','',7,2,'pgrd.png','Content Grades','grades[_4]', + "gocmd('/adm/grades','gradingmenu')", + 'Content Grades'); + } elsif ($perms{'vgr'}) { + &switch('','',7,2,'subm.png','Content Submissions','missions[_1]', + "gocmd('/adm/grades','submission')", + 'Content Submissions'); + } + } + if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) { + &switch('','',7,3,'pparm.png','Content Settings','parms[_2]', + "gocmd('/adm/parmset','set')", + 'Content Settings'); + } # End grades/submissions check # # This applies to items inside a folder/page modifiable in the course. # - if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($perms{'cev'}))) { - my $text = 'Edit Folder'; - if (($mapurl =~ /\.page$/) || - ($env{'request.symb'}=~ - m{uploaded/$cdom/$cnum/default_\d+\.page$})) { - $text = 'Edit Page'; - } - $hwkadd .= &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]', - "gocmd('/adm/coursedocs','direct')", - '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 = ( - '', - '' - ); - 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 .= '', - ''; - my $chooser = < -►  - -
    -
    - -$input -$sellink - -  -
    -
    - -$righticon - -END - &switch('','',7,5,'viewuser.png','View As','user[_1]', - 'toggleViewAsUser('."'$change'".')', - 'View As','','','',$chooser); - } -# End view as user check - + if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($perms{'cev'}))) { + my $text = 'Edit Folder'; + if (($mapurl =~ /\.page$/) || + ($env{'request.symb'}=~ + m{uploaded/$cdom/$cnum/default_\d+\.page$})) { + $text = 'Edit Page'; + } + &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]', + "gocmd('/adm/coursedocs','direct')", + 'Folder/Page Content'); } +# End modifiable folder/page container check + } # End course context # Prepare the rest of the buttons - my ($menuitems,$got_prt,$got_wishlist,$cstritems); + my ($menuitems,$got_prt,$got_wishlist); if ($const_space) { # # We are in construction space @@ -1255,7 +978,11 @@ END if ($currdir =~ m-/$-) { $is_const_dir = 1; if ($thisdisfn eq '') { - $is_const_dir = 2; + unless (($env{'request.course.id'}) && + ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) && + ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) { + $is_const_dir = 2; + } } } else { $currdir =~ s|[^/]+$||; @@ -1269,27 +996,15 @@ 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)) { + if (&Apache::lonplacementtest::is_lastres($env{'request.symb'},$navmap)) { + $showforw = 0; + } + } + } + if ($showforw) { + $menuitems.=" +s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3"; + } } - $menuitems .= (< 0){ }else{ $menuitems.="anot.png"; } -$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&"; +$menuitems.="&Notes&&annotate()&"; $menuitems.="Make notes and annotations about this resource&&1\n"; my $is_mobile; if ($env{'browser.mobile'}) { @@ -1363,23 +1099,21 @@ 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$})) { + if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/}) && ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) { $menuitems.=(<[0]; - } - $buttonshide = $pagebuttonshide; - } else { - $countdown = &countdown_timer(); - $buttonshide = &hidden_button_check(); - } - - &Apache::lonhtmlcommon::clear_breadcrumb_tools(); + my $showprogress; + if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { + $showprogress = &placement_progress(); + } + + my $addremote=0; + foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } + + if ($addremote) { + my ($countdown,$buttonshide); + if ($env{'request.filename'} =~ /\.page$/) { + my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); + if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') { + $countdown = $breadcrumb_tools{'tools'}->[0]; + } + $buttonshide = $pagebuttonshide; + } else { + $countdown = &countdown_timer(); + $buttonshide = &hidden_button_check(); + } + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'navigation', @inlineremote[21,23]); + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'navigation', @inlineremote[21,23]); - if ($buttonshide eq 'yes') { - 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); - - #publish button in construction space - if ($env{'request.state'} eq 'construct'){ - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', $inlineremote[63]); - } else { - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'tools', $inlineremote[63]); - } - &advtools_crumbs(@inlineremote); - } - } else { - if ($linkprotout) { - &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout); - } + if ($buttonshide eq 'yes') { + if ($countdown) { + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); } - my ($topic_help,$topic_help_text); - 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'))) { - $topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'. - 'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos'; - $topic_help_text = 'About WebDAV access'; - } - } - if (ref($showncrumbsref)) { - $$showncrumbsref = 1; + if ($showprogress) { + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress); } - return &Apache::lonhtmlcommon::scripttag('', 'start') - . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) - . &Apache::lonhtmlcommon::scripttag('', 'end'); - } else { - my $cstrcrumbs; - if ($const_space) { - foreach (split(/\n/,$cstritems)) { - my ($command,@rest)=split(/\&/,$_); - my $idx=10*$rest[0]+$rest[1]; - &switch('','',@rest); - } - &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools', - @inlineremote[63,61,71,72]); - - $cstrcrumbs = &Apache::lonhtmlcommon::scripttag('', 'start') - .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) - .&Apache::lonhtmlcommon::scripttag('', 'end'); - } - my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); - $requri=&Apache::lonenc::check_encrypt(&unescape($requri)); - my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); - my $navstatus=&get_nav_status(); - my $clearcstr; - - if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; } - return < -// - + my @tools = @inlineremote[93,91,81,82,83]; + if ($countdown) { + unshift(@tools,$countdown); + } + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'tools',@tools); -$cstrcrumbs -ENDREGTHIS + #publish button in construction space + if ($env{'request.state'} eq 'construct'){ + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'advtools', $inlineremote[63]); + } else { + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'tools', $inlineremote[63]); + } + &advtools_crumbs(@inlineremote); } } else { - unless ($noremote) { -# Not registered, graphical - return (< -// - -ENDDONOTREGTHIS - + if ($showprogress) { + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress); } - return ''; } -} - -sub get_inline_text { - my %text = ( - pgrd => 'Content Grades', - subm => 'Content Submissions', - pparm => 'Content Settings', - docs => 'Folder/Page Content', - pcstr => 'Edit', - prt => 'Print', - alnk => 'Stored Links', - anot => 'Notes', - catalog => 'Info', - eval => 'Evaluate', - fdbk => 'Feedback', - ); - return %text; -} - -sub get_rc_text { - my %text = ( - pgrd => 'problem[_1]', - subm => 'view sub-[_1]', - pparm => 'problem[_2]', - pcstr => 'edit[_1]', - prt => 'prepare[_1]', - back => 'backward[_1]', - forw => 'forward[_1]', - alnk => 'add to[_1]', - anot => 'anno-[_1]', - catalog => 'catalog[_2]', - eval => 'evaluate[_1]', - fdbk => 'feedback[_1]', - ); - return %text; -} - -sub loadevents() { - if ($env{'request.state'} eq 'construct' || - $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - return 'LONCAPAreg();'; -} - -sub unloadevents() { - if ($env{'request.state'} eq 'construct' || - $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - return 'LONCAPAstale();'; -} - -sub startupremote { - my ($lowerurl)=@_; - unless ($env{'environment.remote'} eq 'on') { - return (''); - } -# -# The Remote actually gets launched! -# - my $configmenu=&rawconfig(); - my $esclowerurl=&escape($lowerurl); - my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); - return(< -// - -ENDREMOTESTARTUP -} - -sub setflags() { - return(< -// - -ENDSETFLAGS -} - -sub maincall() { - unless ($env{'environment.remote'} eq 'on') { return ''; } - return(< -// - -ENDMAINCALL -} - -sub load_remote_msg { - my ($lowerurl)=@_; - - unless ($env{'environment.remote'} eq 'on') { return ''; } - - my $esclowerurl=&escape($lowerurl); - my $link=&mt('[_1]Continue[_2] on in Inline Menu mode' - ,'' - ,''); - return(< -
    - -
    -

    -

    $link

    -ENDREMOTEFORM -} - -sub get_menu_name { - my $hostid = $Apache::lonnet::perlvar{'lonHostID'}; - $hostid =~ s/\W//g; - return 'LCmenu'.$hostid; -} - - -sub reopenmenu { - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $menuname = &get_menu_name(); - my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); - return('window.open('.$nothing.',"'.$menuname.'","",false);'); -} - - -sub open { - my $returnval=''; - unless ($env{'environment.remote'} eq 'on') { - return - ''; - } - my $menuname = &get_menu_name(); - -# unless (shift eq 'unix') { -# resizing does not work on linux because of virtual desktop sizes -# $returnval.=(< -ENDOPEN - return ''; + my ($topic_help,$topic_help_text); + 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'))) { + $topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'. + 'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos'; + $topic_help_text = 'About WebDAV access'; + } + } + return &Apache::lonhtmlcommon::scripttag('', 'start') + . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) + . &Apache::lonhtmlcommon::scripttag('', 'end'); } sub get_editbutton { @@ -1834,12 +1241,8 @@ sub get_editbutton { if ($env{'form.folderpath'}) { $suppanchor = $env{'form.anchor'}; } - my $shownsymb; - if ($env{'request.symb'}) { - $shownsymb = &Apache::lonenc::check_encrypt($env{'request.symb'}); - } $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, - $forceedit,$forcereg,$env{'request.symb'},$shownsymb, + $forceedit,$forcereg,$env{'request.symb'}, &escape($env{'form.folderpath'}), &escape($env{'form.title'}),$hostname, $env{'form.idx'},&escape($env{'form.suppurl'}), @@ -1852,31 +1255,15 @@ sub get_editbutton { $icon = 'tolastloc.png'; $label = 'Exit Editing'; } - my $infunc = 1; - my $clearbutton; - if ($env{'environment.remote'} eq 'on') { - if ($cfile =~ m{^/priv/}) { - undef($infunc); - $label = 'edit'; - } else { - $clearbutton = 1; - } - } - my $editor = &switch('','',6,1,$icon,$label,'resource[_2]', - $jscall,"Edit this resource",'','',$infunc); - if ($infunc) { - return 1; - } elsif ($clearbutton) { - return &clear(6,1); - } else { - return $editor; - } + &switch('','',6,1,$icon,$label,'resource[_2]', + $jscall,"Edit this resource"); + return 1; } return; } sub prepare_functions { - my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$hostname,$forbodytag) = @_; + my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$hostname) = @_; unless ($env{'request.registered'}) { undef(@inlineremote); } @@ -1891,17 +1278,15 @@ sub prepare_functions { my $editbutton = ''; my $viewsrcbutton = ''; - my $clientip = &Apache::lonnet::get_requestor_ip(); # # Determine whether or not to display 'Edit' or 'View Source' icon/button # if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) { - my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$2,$1); 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') && (!$blocked)) { + if (($cfile) && ($home ne '') && ($home ne 'no_host')) { $editbutton = &get_editbutton($cfile,$home,$switchserver, $forceedit,$forceview,$forcereg); } @@ -1926,8 +1311,8 @@ sub prepare_functions { # if (($perms{'mdc'}) && (($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) || - ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) || - (($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) { + ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) || + (($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) { if ($resurl =~ m{^/}) { $cfile = $resurl; } else { @@ -1957,8 +1342,7 @@ sub prepare_functions { $env{'form.symb'}); if ($cfile ne '') { $editbutton = &get_editbutton($cfile,$home,$switchserver, - $forceedit,$forceview,$forcereg, - $env{'form.title'},$env{'form.suppurl'}); + $forceedit,$forceview,$forcereg); } } elsif (($resurl =~ m{^/?adm/viewclasslist$}) && (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) { @@ -1976,25 +1360,23 @@ sub prepare_functions { &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group); if ($cfile ne '') { $editbutton = &get_editbutton($cfile,$home,$switchserver, - $forceedit,$forceview,$forcereg); + $forceedit,$forceview,$forcereg, + $hostname); } if ((($cfile eq '') || (!$editbutton)) && ($resurl =~ /$LONCAPA::assess_re/)) { my $showurl = &Apache::lonnet::clutter($resurl); - my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '') - ? "/$env{'request.course.sec'}" - : ''); if ((&Apache::lonnet::allowed('cre','/')) && (&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) { $viewsrcbutton = 1; - } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) { + } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) { if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) { my $auname = $1; if (($env{'request.course.adhocsrcaccess'} ne '') && (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { $viewsrcbutton = 1; } elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') && - (&Apache::lonnet::allowed('bre',$crs_sec))) { + (&Apache::lonnet::allowed('bre','/'))) { $viewsrcbutton = 1; } } @@ -2014,13 +1396,10 @@ sub prepare_functions { if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) { my ($sdom,$sname) = ($1,$2); unless (&Apache::lonnet::is_course($sdom,$sname)) { - my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$sname,$sdom); - unless ($blocked) { - &switch('','',6,4,'mail-message-new-22x22.png','Message to user', - '', - "go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')", - 'Send message to specific user','','',1); - } + &switch('','',6,4,'mail-message-new-22x22.png','Message to user', + '', + "go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')", + 'Send message to specific user'); } my $hideprivileged = 1; if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef, @@ -2036,19 +1415,19 @@ sub prepare_functions { &switch('','',6,5,'trck-22x22.png','Activity', '', "go('/adm/trackstudent?selected_student=$sname:$sdom')", - 'View recent activity by this person','','',1); + 'View recent activity by this person'); } if ($perms{'vgr'}) { &switch('','',6,6,'rsrv-22x22.png','Reservations', '', "go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')", - 'Slot reservation history','','',1); + 'Slot reservation history'); } if ($perms{'srm'}) { &switch('','',6,7,'contact-new-22x22.png','Records', '', "go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')", - 'Add records','','',1); + 'Add records'); } } } @@ -2083,7 +1462,7 @@ sub prepare_functions { &Apache::lonhtmlcommon::clear_breadcrumb_tools(); &advtools_crumbs(@inlineremote); return $editbutton; - } elsif (($env{'request.registered'}) && (!ref($forbodytag))) { + } elsif ($env{'request.registered'}) { return $editbutton || $viewsrcbutton; } else { if (ref($bread_crumbs) eq 'ARRAY') { @@ -2096,13 +1475,9 @@ sub prepare_functions { } elsif (@inlineremote > 0) { &Apache::lonhtmlcommon::clear_breadcrumb_tools(); &advtools_crumbs(@inlineremote); - if (ref($forbodytag)) { - $$forbodytag = - &Apache::lonhtmlcommon::scripttag('', 'start') - .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) - .&Apache::lonhtmlcommon::scripttag('', 'end'); - } - return; + return &Apache::lonhtmlcommon::scripttag('', 'start') + . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) + . &Apache::lonhtmlcommon::scripttag('', 'end'); } } } @@ -2114,24 +1489,20 @@ sub advtools_crumbs { 'advtools', @funcs[61,64,65,66,67,74]); } elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', @funcs[61,71,72,73,74,75,92]); + 'advtools', @funcs[61,71,72,73,74,92]); } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') { &Apache::lonhtmlcommon::add_breadcrumb_tool( 'advtools', $funcs[61]); } + return; } # ================================================================== Raw Config sub clear { my ($row,$col)=@_; - if ($env{'environment.remote'} eq 'on') { - if (($row<1) || ($row>13)) { return ''; } - return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); - } else { - $inlineremote[10*$row+$col]=''; - return ''; - } + $inlineremote[10*$row+$col]=''; + return ''; } # ============================================ Switch a button or create a link @@ -2139,7 +1510,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)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; $top=&mt($top); @@ -2148,24 +1519,6 @@ sub switch { my $idx=10*$row+$col; $category_members{$cat}.=':'.$idx; - if (($env{'environment.remote'} eq 'on') && (!$infunc)) { - if (($row<1) || ($row>13)) { return ''; } - if ($env{'request.state'} eq 'construct') { - my $text = $top.' '.$bot; - $text=~s/\s*\-\s*//gs; - my $pic = ''.$text.''; - $inlineremote[$idx] = - ''. - $pic.''.$top.' '.$form; - } -# Remote - $img=~s/\.png$/\.gif/; - return "\n". - qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc");); - } - # Inline Menu if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; @@ -2228,13 +1581,6 @@ sub secondlevel { return $output; } -sub openmenu { - my $menuname = &get_menu_name(); - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); - return "window.open(".$nothing.",'".$menuname."');"; -} - sub inlinemenu { undef(@inlineremote); undef(%category_members); @@ -2277,13 +1623,7 @@ sub rawconfig { # my $textualoverride=shift; my $output=''; - if ($env{'environment.remote'} eq 'on') { - $output.= - "window.status='Opening Remote Control';var swmenu=".&openmenu(). -"\nwindow.status='Configuring Remote Control ';"; - } else { - unless ($textualoverride) { return ''; } - } + return '' unless $textualoverride; my $uname=$env{'user.name'}; my $udom=$env{'user.domain'}; my $adv=$env{'user.adv'}; @@ -2468,18 +1808,12 @@ sub rawconfig { $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); } } - if ($env{'environment.remote'} eq 'on') { - $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';"; - if (&Apache::lonmsg::newmail()) { - $output.='swmenu.setstatus("you have","messages");'; - } - } return $output; } sub check_for_rcrs { my $showreqcrs = 0; - my @reqtypes = ('official','unofficial','community','textbook'); + my @reqtypes = ('official','unofficial','community','textbook','placement'); foreach my $type (@reqtypes) { if (&Apache::lonnet::usertools_access($env{'user.name'}, $env{'user.domain'}, @@ -2499,28 +1833,6 @@ sub check_for_rcrs { return $showreqcrs; } -# ======================================================================= Close - -sub close { - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $menuname = &get_menu_name(); - return(< -// - -ENDCLOSE -} - sub dc_popup_js { my %lt = &Apache::lonlocal::texthash( more => '(More ...)', @@ -2568,12 +1880,12 @@ 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, +# 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. # @@ -2584,27 +1896,22 @@ sub done_button_js { 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).', + 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', + 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 $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() }); - } + @resources=$navmap->retrieveResources($mapurl,sub { $_[0]->is_problem() }); } else { my $res = $navmap->getBySymb($env{'request.symb'}); if (ref($res)) { @@ -2643,7 +1950,7 @@ sub done_button_js { if ($height !~ /^\d+$/) { $height = 400; if ($missing) { - $height += 60; + $height += 60; } } if ($width !~ /^\d+$/) { @@ -2656,7 +1963,6 @@ sub done_button_js {
    -
    @@ -2687,8 +1993,8 @@ sub done_button_js { click: function() { var proctorkey = \$( '[name="LC_interval_done_proctorkey"]' )[0].value; if ((proctorkey == '') || (proctorkey == null)) { - alert("$lt{'nokey'}"); - } else { + alert("$lt{'nokey'}"); + } else { \$( '[name="LC_interval_done"]' )[0].value = 'true'; \$( '[name="LC_interval_done_proctorpass"]' )[0].value = proctorkey; \$( '[name="LCdoneButton"]' )[0].submit(); @@ -2738,7 +2044,6 @@ END
    -
    @@ -2781,114 +2086,6 @@ 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 @@ -3198,16 +2364,6 @@ sub constspaceform { ENDCONSTSPACEFORM } -sub get_nav_status { - my $navstatus="swmenu.w_loncapanav_flag="; - if ($env{'environment.remotenavmap'} eq 'on') { - $navstatus.="1"; - } else { - $navstatus.="-1"; - } - return $navstatus; -} - sub hidden_button_check { if ( $env{'request.course.id'} eq '' || $env{'request.role.adv'} ) { @@ -3219,12 +2375,12 @@ sub hidden_button_check { } sub roles_selector { - my ($cdom,$cnum,$httphost,$target,$menucoll,$menuref) = @_; + my ($cdom,$cnum,$httphost,$ltitarget) = @_; 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'; @@ -3254,7 +2410,7 @@ sub roles_selector { if (exists($reqprivs->{$destination})) { if ($reqprivs->{$destination} =~ /,/) { @{$privref} = split(/,/,$reqprivs->{$destination}); - } else { + } else { $privref = [$reqprivs->{$destination}]; } } @@ -3325,23 +2481,18 @@ 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". ' '."\n". ' '."\n"; if ($destsymb ne '') { - $form .= ' '."\n"; + $form .= ' '."\n"; } $form .= '
    '."\n"; foreach my $role (@roles_order) { @@ -3350,19 +2501,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)]); } @@ -3375,7 +2519,7 @@ sub roles_selector { $include = 1; } } else { - $include = 1; + $include = 1; } if ($include) { my $rolename; @@ -3387,19 +2531,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,'','',$ltitarget); } } - return ($js,$form,$switcher,$has_opa_priv); + return ($js,$form,$switcher); } sub get_all_courseroles { @@ -3462,7 +2603,7 @@ sub get_all_courseroles { push(@{$courseroles->{'st'}},keys(%sections_count)); $seccount->{'st'} = scalar(keys(%sections_count)); } - $seccount->{'st'} ++; # Increment for a section-less student role. + $seccount->{'st'} ++; # Increment for a section-less student role. my $rolehash = { 'roles' => $courseroles, 'seccount' => $seccount, @@ -3519,7 +2660,7 @@ sub get_customadhoc_roles { foreach my $role (keys(%{$domdefaults{'adhocroles'}})) { next if (($role eq '') || ($role =~ /\W/)); $seccount->{"$prefix/$role"} = $numsec; - $roledesc->{"$prefix/$role"} = $description->{$role}; + $roledesc->{"$prefix/$role"} = $description->{$role}; if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) { if (exists($env{"user.priv.$prefix/$role./$cdom/$cnum./"})) { $courseprivs->{"$prefix/$role./$cdom/$cnum./"} = @@ -3566,8 +2707,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.', @@ -3578,7 +2718,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". @@ -3601,8 +2740,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}))) { @@ -3624,22 +2761,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"; @@ -3662,8 +2785,8 @@ function adhocRole(newrole) { if (rolecheck > 0) { for (var i=0; i @@ -3842,92 +2965,11 @@ 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; +sub placement_progress { + my ($totalpoints,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1); + my $complete = 100 - $incomplete; + return ''. + &mt('Test is [_1]% complete',$complete).''; } # ================================================================ Main Program @@ -3946,13 +2988,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];