--- loncom/interface/lonmenu.pm 2022/09/19 19:39:48 1.369.2.83.2.5
+++ loncom/interface/lonmenu.pm 2022/06/30 21:04:14 1.524
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.83.2.5 2022/09/19 19:39:48 raeburn Exp $
+# $Id: lonmenu.pm,v 1.524 2022/06/30 21:04:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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();
@@ -267,7 +247,7 @@ sub prep_menuitem {
# entries from mydesk.tab
sub primary_menu {
my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_;
- my (%menu,%menuopts);
+ my (%menu,%ltiexc,%menuopts);
# each element of @primary contains following array:
# (link url, icon path, alt text, link text, condition, position)
my $public;
@@ -275,6 +255,26 @@ sub primary_menu {
|| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
$public = 1;
}
+ 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;
+ 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';
@@ -282,12 +282,15 @@ sub primary_menu {
}
if ($links_target ne '') {
$target = $links_target;
- } else {
- my $deeplinktarget;
+ } 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 ($deeplinktarget eq '_self') {
+ if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
$target = '_self';
} else {
$target = '_top';
@@ -310,11 +313,23 @@ 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
- next if $$menuitem[4] eq 'courses' ##'Roles' wanted
- && !&Apache::loncommon::show_course(); ##
-
+ && (&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])});
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';
@@ -322,7 +337,7 @@ sub primary_menu {
if ($env{'request.course.id'} && $menucoll) {
if (($menuitem->[6]) && (!$menuopts{$menuitem->[6]})) {
if ($menuitem->[6] eq 'pers') {
- if ($menuopts{'name'} &&
+ if ($menuopts{'name'} && !$ltiexc{'fullname'} &&
$env{'user.name'} && $env{'user.domain'}) {
$menu{$position} .= ' '.
&Apache::loncommon::plainname($env{'user.name'},
@@ -346,9 +361,10 @@ sub primary_menu {
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 ($env{'request.course.id'} && $menucoll) {
@@ -357,7 +373,7 @@ sub primary_menu {
push(@primsub,$item);
}
if ($title eq 'Personal') {
- if ($env{'user.name'} && $env{'user.domain'}) {
+ 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'});
}
@@ -378,6 +394,7 @@ sub primary_menu {
}
}
} 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();
@@ -448,28 +465,29 @@ 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,%menuopts);
- $grouptools = 0;
+ my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,
+ $lti,$ltimapres,%ltiexc,%menuopts);
+ $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'}) ||
@@ -498,6 +516,19 @@ 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};
@@ -509,7 +540,7 @@ sub secondary_menu {
$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)) ||
@@ -522,11 +553,14 @@ sub secondary_menu {
if ($links_target ne '') {
$target = $links_target;
} else {
- my $deeplinktarget;
+ my ($ltitarget,$deeplinktarget);
+ if ($env{'request.lti.login'}) {
+ $ltitarget = $env{'request.lti.target'};
+ }
if ($env{'request.deeplink.login'}) {
$deeplinktarget = $env{'request.deeplink.target'};
}
- if ($deeplinktarget eq '_self') {
+ if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
$target = '_self';
} else {
$target = '_top';
@@ -536,17 +570,14 @@ sub secondary_menu {
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;
+ && ($canvgr || $ltiexc{'grades'});
next if $$menuitem[4] eq 'vgr'
&& !$canvgr;
next if $$menuitem[4] eq 'viewusers'
@@ -561,7 +592,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;
@@ -573,12 +604,18 @@ sub secondary_menu {
&& !$author;
next if $$menuitem[4] eq 'cca'
&& !$canmodifycoauthor;
+ next if $$menuitem[4] eq 'notltimapres'
+ && $ltimapres;
+ next if $$menuitem[4] eq 'notlti'
+ && $lti;
+ next if $$menuitem[4] eq 'lti'
+ && (!$lti || !$noprimary);
+ next if $$menuitem[3] eq 'Logout'
+ && $ltiexc{'logout'};
my $title = $menuitem->[3];
if ($env{'request.course.id'} && $menucoll) {
- if ($$menuitem[5] eq 'main') {
- next if ($menuopts{$$menuitem[5]} eq 'n');
- } elsif ($$menuitem[5] ne 'roles') {
+ unless ($$menuitem[5] eq 'roles') {
next if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]}));
}
}
@@ -603,7 +640,19 @@ sub secondary_menu {
next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara);
next if ($item->[2] eq 'author' && !$author);
next if ($item->[2] eq 'cca' && !$canmodifycoauthor);
- push(@scndsub,$item);
+ next if ($item->[2] eq 'lti' && !$lti);
+ if ($item->[2] =~ /^lti(portfolio|wishlist|blog)$/) {
+ my $tool = $1;
+ next if !$lti;
+ next if (!&Apache::lonnet::usertools_access('','',$tool,
+ undef,'tools'));
+ }
+ push(@scndsub,$item);
+ }
+ }
+ if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'}) {
+ unless ($ltiexc{'fullname'}) {
+ $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
}
}
if (@scndsub > 0) {
@@ -620,14 +669,17 @@ sub secondary_menu {
my ($switcher,$has_opa_priv);
($roleswitcher_js,$roleswitcher_form,$switcher,$has_opa_priv) =
&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,$target,$menucoll,$menuref
);
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];
@@ -677,7 +729,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;
}
@@ -716,7 +768,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, $listclass, $linkattr) = @_;
unless (@{$submenu}) {
return '';
}
@@ -749,11 +801,11 @@ sub build_submenu {
if (ref($href) eq 'ARRAY') {
$menu .= '';
$menu .= '
';
+ . $title . '';
$menu .= '';
$menu .= &build_submenu($target, $href, $translate);
$menu .= ' ';
- $menu .= ' ';
+ $menu .= ' 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";
+ }
+ } elsif (($crstype ne 'Placement') || ($env{'request.role.adv'})) {
+ $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";
+ } else {
+# Suppress display of backward arrow for Placement Tests
+# Suppress display of forward arrow for Placement Tests if this is the last resource.
+ my $showforw = 1;
+ if ($env{'request.symb'}) {
+ my $navmap = Apache::lonnavmaps::navmap->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'}) {
@@ -1138,19 +1216,19 @@ if ($env{'browser.mobile'}) {
($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) &&
($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 $addremote=0;
+ foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
- &Apache::lonhtmlcommon::add_breadcrumb_tool(
- 'navigation', @inlineremote[21,23]);
+ 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();
- 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);
- }
+ &Apache::lonhtmlcommon::add_breadcrumb_tool(
+ 'navigation', @inlineremote[21,23]);
+
+ 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 ($linkprotout) {
+ &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
}
- 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);
+ }
+ if ($linkprotout) {
+ unshift(@tools,$linkprotout);
+ }
+ &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
-
+ 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 '';
}
-}
-
-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 ('
-//
-
-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 '';
+ return &Apache::lonhtmlcommon::scripttag('', 'start')
+ . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
+ . &Apache::lonhtmlcommon::scripttag('', 'end');
}
sub get_editbutton {
@@ -1605,12 +1371,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'}),
@@ -1623,31 +1385,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);
}
@@ -1697,8 +1443,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 {
@@ -1728,8 +1474,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'}))) {
@@ -1747,7 +1492,8 @@ 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/)) {
@@ -1790,7 +1536,7 @@ sub prepare_functions {
&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);
+ 'Send message to specific user');
}
}
my $hideprivileged = 1;
@@ -1807,19 +1553,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');
}
}
}
@@ -1854,7 +1600,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') {
@@ -1867,13 +1613,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');
}
}
}
@@ -1884,25 +1626,26 @@ sub advtools_crumbs {
&Apache::lonhtmlcommon::add_breadcrumb_tool(
'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,92]);
+ if ($env{'request.state'} eq 'construct') {
+ &Apache::lonhtmlcommon::add_breadcrumb_tool(
+ 'advtools', @funcs[61,73,74,71,72]);
+ } else {
+ &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]);
}
+ 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
@@ -1910,7 +1653,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)=@_;
+ 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);
@@ -1919,24 +1662,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 = '
-//
-
-ENDCLOSE
-}
-
sub dc_popup_js {
my %lt = &Apache::lonlocal::texthash(
more => '(More ...)',
@@ -2338,12 +2032,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.
#
@@ -2354,17 +2048,17 @@ 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=();
@@ -2413,7 +2107,7 @@ sub done_button_js {
if ($height !~ /^\d+$/) {
$height = 400;
if ($missing) {
- $height += 60;
+ $height += 60;
}
}
if ($width !~ /^\d+$/) {
@@ -2457,8 +2151,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();
@@ -2565,7 +2259,7 @@ sub utilityfunctions {
}
}
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
-
+
my $dc_popup_cid;
if ($env{'user.adv'} && exists($env{'user.role.dc./'.
$env{'course.'.$env{'request.course.id'}.
@@ -2588,10 +2282,14 @@ sub utilityfunctions {
my $esc_url=&escape($currenturl);
my $esc_symb=&escape($currentsymb);
+ my $newname = &mt('New Name');
my $countdown = &countdown_toggle_js();
- my $deeplinktarget;
+ my ($ltitarget,$deeplinktarget);
+ if ($env{'request.lti.login'}) {
+ $ltitarget = $env{'request.lti.target'};
+ }
if ($env{'request.deeplink.login'}) {
$deeplinktarget = $env{'request.deeplink.target'};
}
@@ -2614,7 +2312,7 @@ function setLCHost() {
' }'."\n".
' }'."\n";
}
-
+
$hostvar .= ' return lcHostname;'."\n".
'}'."\n";
@@ -2658,6 +2356,22 @@ 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;
@@ -2696,8 +2410,9 @@ function golist(url) {
currentURL = null;
currentSymb= null;
var lcHostname = setLCHost();
+ var ltitarget = '$ltitarget';
var deeplinktarget = '$deeplinktarget';
- if (deeplinktarget == '_self') {
+ if ((ltitarget == 'iframe') || (deeplinktarget == '_self')) {
document.location.href=lcHostname+url;
} else {
top.location.href=lcHostname+url;
@@ -2759,6 +2474,18 @@ 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]));
@@ -2780,10 +2507,11 @@ ENDUTILITY
sub serverform {
my $target;
+ unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+ $target = ' target="_top"';
+ }
if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
$target = ' target="_self"';
- } else {
- $target = ' target="_top"';
}
return(<
@@ -2802,7 +2530,8 @@ sub constspaceform {
$target = ' target="_parent"';
$printtarget = ' target="_parent"';
} else {
- unless (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
+ 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"';
}
@@ -2820,20 +2549,15 @@ sub constspaceform {