--- loncom/interface/loncommon.pm 2022/05/30 00:17:38 1.1382
+++ loncom/interface/loncommon.pm 2025/03/25 01:02:59 1.1476
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1382 2022/05/30 00:17:38 raeburn Exp $
+# $Id: loncommon.pm,v 1.1476 2025/03/25 01:02:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,7 @@ use POSIX qw(strftime mktime);
use Apache::lonmenu();
use Apache::lonenc();
use Apache::lonlocal;
-use Apache::lonnet();
+use Apache::lonnavmaps();
use HTML::Entities;
use Apache::lonhtmlcommon();
use Apache::loncoursedata();
@@ -71,7 +71,9 @@ use Apache::lonuserutils();
use Apache::lonuserstate();
use Apache::courseclassifier();
use LONCAPA qw(:DEFAULT :match);
+use LONCAPA::ltiutils;
use LONCAPA::LWPReq;
+use LONCAPA::map();
use HTTP::Request;
use DateTime::TimeZone;
use DateTime::Locale;
@@ -435,7 +437,7 @@ sub studentbrowser_javascript {
<script type="text/javascript" language="Javascript">
// <![CDATA[
var stdeditbrowser;
- function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadv) {
+ function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadv,uident) {
var url = '/adm/pickstudent?';
var filter;
if (!ignorefilter) {
@@ -456,6 +458,7 @@ sub studentbrowser_javascript {
}
}
if ((courseadv == 'only') || (courseadv == 'none')) { url+="&courseadv="+courseadv; }
+ if (uident !== '') { url+="&identelement="+uident; }
var title = 'Student_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';
@@ -487,7 +490,7 @@ ENDRESBRW
}
sub selectstudent_link {
- my ($form,$unameele,$udomele,$courseadv,$clickerid)=@_;
+ my ($form,$unameele,$udomele,$courseadv,$clickerid,$identelem)=@_;
my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
&Apache::lonhtmlcommon::entity_encode($unameele)."','".
&Apache::lonhtmlcommon::entity_encode($udomele)."'";
@@ -504,6 +507,11 @@ sub selectstudent_link {
$callargs .= ",'','','$courseadv'";
} elsif ($courseadv eq 'condition') {
$callargs .= ",'','','$courseadv'";
+ } elsif ($identelem ne '') {
+ $callargs .= ",'','',''";
+ }
+ if ($identelem ne '') {
+ $callargs .= ",'".&Apache::lonhtmlcommon::entity_encode($identelem)."'";
}
return '<span class="LC_nobreak">'.
'<a href="javascript:openstdbrowser('.$callargs.');">'.
@@ -957,8 +965,10 @@ ENDSCRT
}
sub select_timezone {
- my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
- my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
+ my ($name,$selected,$onchange,$includeempty,$id,$disabled)=@_;
+ my $labeltext = &HTML::Entities::encode(&mt('Select Time Zone'));
+ my $output='<select name="'.$name.'" '.$id.$onchange.$disabled.
+ ' aria-label="'.$labeltext.'">'."\n";
if ($includeempty) {
$output .= '<option value=""';
if (($selected eq '') || ($selected eq 'local')) {
@@ -1166,7 +1176,8 @@ sub linked_select_forms {
$menuorder,
$onchangefirst,
$onchangesecond,
- $suffix
+ $suffix,
+ $haslabel
) = @_;
my $second = "document.$formname.$secondselectname";
my $first = "document.$formname.$firstselectname";
@@ -1232,8 +1243,18 @@ END
$result.=">".&mt($hashref->{$value}->{'text'})."</option>\n";
}
$result .= "</select>\n";
- my %select2 = %{$hashref->{$firstdefault}->{'select2'}};
- $result .= $middletext;
+ if ($haslabel) {
+ $result .= '</label>';
+ }
+ my %select2;
+ if (ref($hashref->{$firstdefault}) eq 'HASH') {
+ if (ref($hashref->{$firstdefault}->{'select2'}) eq 'HASH') {
+ %select2 = %{$hashref->{$firstdefault}->{'select2'}};
+ }
+ }
+ if ($middletext ne '') {
+ $result .= '<label>'.$middletext;
+ }
$result .= "<select size=\"1\" name=\"$secondselectname\"";
if ($onchangesecond) {
$result .= ' onchange="'.$onchangesecond.'"';
@@ -1251,6 +1272,9 @@ END
$result.=">".&mt($select2{$value})."</option>\n";
}
$result .= "</select>\n";
+ if ($middletext ne '') {
+ $result .= '</label>';
+ }
# return $debug;
return $result;
} # end of sub linked_select_forms {
@@ -1329,7 +1353,7 @@ sub help_open_topic {
}
$template.=' <a'.$target.' href="'.$link.'" title="'.$title.'">'
.'<img src="'.$helpicon.'" border="0"'
- .' alt="'.&mt('Help: [_1]',$topic).'"'
+ .' alt="'.&mt('Help icon').'"'
.' title="'.$title.'" style="vertical-align:middle;"'.$imgid
.' /></a>';
if ($text ne "") {
@@ -1359,7 +1383,7 @@ sub helpLatexCheatsheet {
$out .= '<span>'
.&help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),$stayOnPage,undef,600)
.'</span> <span>'
- .&help_open_topic('Authoring_Multilingual_Problems',&mt('How to create problems in different languages'),$stayOnPage,undef,600)
+ .&help_open_topic('Authoring_Multilingual_Problems',&mt('Languages'),$stayOnPage,undef,600)
.'</span>';
}
$out .= '</span>'; # End cheatsheet
@@ -1438,7 +1462,7 @@ $banner_link
<a href="$link" title="$title" $linkattr>$text</a>
END
} else {
- return ' '.$text.' ';
+ return ' <h1 class="LC_helpmenu">'.$text.'</h1> ';
}
}
@@ -1450,6 +1474,10 @@ sub help_menu_js {
my $helptopic=&general_help();
my $details_link = $httphost.'/adm/help/'.$helptopic.'.hlp';
my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
+ my $bannertitle = &mt('Help Menu');
+ &js_escape(\$bannertitle);
+ my $bodytitle = &mt('Documentation');
+ &js_escape(\$bodytitle);
my $start_page =
&Apache::loncommon::start_page('Help Menu', undef,
{'frameset' => 1,
@@ -1461,7 +1489,6 @@ sub help_menu_js {
my $end_page =
&Apache::loncommon::end_page({'frameset' => 1,
'js_ready' => 1,});
-
my $template .= <<"ENDTEMPLATE";
<script type="text/javascript">
// <![CDATA[
@@ -1486,8 +1513,8 @@ function helpMenu(target) {
return;
}
function writeHelp(caller) {
- caller.document.writeln('$start_page\\n<frame name="bannerframe" src="'+banner_link+'" marginwidth="0" marginheight="0" frameborder="0">\\n');
- caller.document.writeln('<frame name="bodyframe" src="$details_link" marginwidth="0" marginheight="0" frameborder="0">\\n$end_page');
+ caller.document.writeln('$start_page\\n<frame name="bannerframe" title="$bannertitle" src="'+banner_link+'" marginwidth="0" marginheight="0" frameborder="0">\\n');
+ caller.document.writeln('<frame name="bodyframe" title="$bodytitle" src="$details_link" marginwidth="0" marginheight="0" frameborder="0">\\n$end_page');
caller.document.close();
caller.focus();
}
@@ -1751,8 +1778,6 @@ the id of the element to resize, second
surrounds everything that comes after the textarea, this routine needs
to be attached to the <body> for the onload and onresize events.
-=back
-
=cut
sub resize_textarea_js {
@@ -1815,8 +1840,11 @@ sub colorfuleditor_js {
save => 'Save page to make this permanent',
);
&js_escape(\%js_lt);
+ my $showfile_js = &show_crsfiles_js();
$browse_or_search = <<"END";
+ $showfile_js
+
function toggleChooser(form,element,titleid,only,search) {
var disp = 'none';
if (document.getElementById('chooser_'+element)) {
@@ -1831,22 +1859,64 @@ sub colorfuleditor_js {
toggleResImport(form,element);
}
document.getElementById('chooser_'+element).style.display = disp;
+ var dirsel = '';
+ var filesel = '';
+ if (document.getElementById('chooser_'+element+'_crsres')) {
+ var currcrsres = document.getElementById('chooser_'+element+'_crsres').style.display;
+ if (currcrsres == 'none') {
+ dirsel = 'coursepath_'+element;
+ var filesel = 'coursefile_'+element;
+ var include;
+ if (document.getElementById('crsres_include_'+element)) {
+ include = document.getElementById('crsres_include_'+element).value;
+ }
+ populateCrsSelects(form,dirsel,filesel,1,include,1,0,1,1,0);
+ }
+ }
+ if (document.getElementById('chooser_'+element+'_upload')) {
+ var currcrsupload = document.getElementById('chooser_'+element+'_upload').style.display;
+ if (currcrsupload == 'none') {
+ dirsel = 'crsauthorpath_'+element;
+ filesel = '';
+ populateCrsSelects(form,dirsel,filesel,0,'',1,0,1,0,1);
+ }
+ }
}
}
- function toggleCrsFile(form,element,numdirs) {
+ function toggleCrsFile(form,element) {
if (document.getElementById('chooser_'+element+'_crsres')) {
var curr = document.getElementById('chooser_'+element+'_crsres').style.display;
if (curr == 'none') {
- if (numdirs) {
+ if (document.getElementById('coursepath_'+element)) {
+ var numdirs;
+ if (document.getElementById('coursepath_'+element).length) {
+ numdirs = document.getElementById('coursepath_'+element).length;
+ }
+ if ((document.getElementById('hascrsres_'+element)) &&
+ (document.getElementById('nocrsres_'+element))) {
+ if (numdirs) {
+ document.getElementById('hascrsres_'+element).style.display='inline-block';
+ document.getElementById('nocrsres_'+element).style.display='none';
+ } else {
+ document.getElementById('hascrsres_'+element).style.display='none';
+ document.getElementById('nocrsres_'+element).style.display='inline-block';
+ }
+ }
form.elements['coursepath_'+element].selectedIndex = 0;
if (numdirs > 1) {
- window['select1'+element+'_changed']();
+ var selelem = form.elements['coursefile_'+element];
+ var i, len = selelem.options.length -1;
+ if (len >=0) {
+ for (i = len; i >= 0; i--) {
+ selelem.remove(i);
+ }
+ selelem.options[0] = new Option('','');
+ }
}
}
- }
+ }
document.getElementById('chooser_'+element+'_crsres').style.display = 'block';
-
}
if (document.getElementById('chooser_'+element+'_upload')) {
document.getElementById('chooser_'+element+'_upload').style.display = 'none';
@@ -1857,20 +1927,20 @@ sub colorfuleditor_js {
return;
}
- function toggleCrsUpload(form,element,numcrsdirs) {
+ function toggleCrsUpload(form,element) {
if (document.getElementById('chooser_'+element+'_crsres')) {
document.getElementById('chooser_'+element+'_crsres').style.display = 'none';
}
if (document.getElementById('chooser_'+element+'_upload')) {
var curr = document.getElementById('chooser_'+element+'_upload').style.display;
if (curr == 'none') {
- if (numcrsdirs) {
- form.elements['crsauthorpath_'+element].selectedIndex = 0;
- form.elements['newsubdir_'+element][0].checked = true;
- toggleNewsubdir(form,element);
+ form.elements['newsubdir_'+element][0].checked = true;
+ toggleNewsubdir(form,element);
+ document.getElementById('chooser_'+element+'_upload').style.display = 'block';
+ if (document.getElementById('uploadcrsres_'+element)) {
+ document.getElementById('uploadcrsres_'+element).value = '';
}
}
- document.getElementById('chooser_'+element+'_upload').style.display = 'block';
}
return;
}
@@ -1914,19 +1984,21 @@ sub colorfuleditor_js {
var filename = form.elements['coursefile_'+element];
var path = directory.options[directory.selectedIndex].value;
var file = filename.options[filename.selectedIndex].value;
- form.elements[element].value = '$respath';
- if (path == '/') {
- form.elements[element].value += file;
- } else {
- form.elements[element].value += path+'/'+file;
- }
- unClean();
- if (document.getElementById('previewimg_'+element)) {
- document.getElementById('previewimg_'+element).src = form.elements[element].value;
- var newsrc = document.getElementById('previewimg_'+element).src;
- }
- if (document.getElementById('showimg_'+element)) {
- document.getElementById('showimg_'+element).innerHTML = '($js_lt{save})';
+ if (file != '') {
+ form.elements[element].value = '$respath';
+ if (path == '/') {
+ form.elements[element].value += file;
+ } else {
+ form.elements[element].value += path+'/'+file;
+ }
+ unClean();
+ if (document.getElementById('previewimg_'+element)) {
+ document.getElementById('previewimg_'+element).src = form.elements[element].value;
+ var newsrc = document.getElementById('previewimg_'+element).src;
+ }
+ if (document.getElementById('showimg_'+element)) {
+ document.getElementById('showimg_'+element).innerHTML = '($js_lt{save})';
+ }
}
toggleChooser(form,element);
return;
@@ -2215,111 +2287,330 @@ sub crsauthor_url {
}
sub import_crsauthor_form {
- my ($form,$firstselectname,$secondselectname,$onchangefirst,$only,$suffix,$disabled) = @_;
+ my ($firstselectname,$secondselectname,$onchangefirst,$only,$suffix,$disabled) = @_;
return (0) unless ($env{'request.course.id'});
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'};
return (0) unless (($cnum ne '') && ($cdom ne ''));
- my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my @ids=&Apache::lonnet::current_machine_ids();
- my ($output,$is_home,$relpath,%subdirs,%files,%selimport_menus);
-
+ my ($output,$is_home,$toppath,%subdirs,%files,%selimport_menus,$include,$exclude);
+
if (grep(/^\Q$crshome\E$/,@ids)) {
$is_home = 1;
}
- $relpath = "/priv/$cdom/$cnum";
- &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$relpath,'',\%subdirs,\%files);
+ $toppath = "/priv/$cdom/$cnum";
+ my $nonemptydir = 1;
+ my $js_only;
+ if ($only) {
+ map { $include->{$_} = 1; } split(/\s*,\s*/,$only);
+ $js_only = join(',',map { &js_escape($_); } sort(keys(%{$include})));
+ }
+ $exclude = &Apache::lonnet::priv_exclude();
+ &Apache::lonnet::recursedirs($is_home,1,$include,$exclude,1,0,$toppath,'',\%subdirs,\%files);
+ my $numdirs = scalar(keys(%files));
my %lt = &Apache::lonlocal::texthash (
fnam => 'Filename',
dire => 'Directory',
+ se => 'Select',
);
- my $numdirs = scalar(keys(%files));
- my (%possexts,$singledir,@singledirfiles);
- if ($only) {
- map { $possexts{$_} = 1; } split(/\s*,\s*/,$only);
- }
- my (%nonemptydirs,$possdirs);
- if ($numdirs > 1) {
- my @order;
- foreach my $key (sort { lc($a) cmp lc($b) } (keys(%files))) {
- if (ref($files{$key}) eq 'HASH') {
- my $shown = $key;
- if ($key eq '') {
- $shown = '/';
- }
- my @ordered = ();
- foreach my $file (sort { lc($a) cmp lc($b) } (keys(%{$files{$key}}))) {
- next if ($file =~ /\.rights$/);
- if ($only) {
- my ($ext) = ($file =~ /\.([^.]+)$/);
- unless ($possexts{lc($ext)}) {
- next;
- }
+ $output = '<label>'.$lt{'dire'}.': '.
+ '<select id="'.$firstselectname.'" name="'.$firstselectname.'" '.
+ 'onchange="populateCrsSelects(this.form,'."'$firstselectname','$secondselectname',1,'$js_only',0,1,0,0,0".');">'.
+ '<option value="" selected="selected">'.$lt{'se'}.'</option>';
+ if ($files{'/'}) {
+ $output .= '<option value="/">/</option>'."\n";
+ }
+ foreach my $key (sort { lc($a) cmp lc($b) } (keys(%files))) {
+ next if ($key eq '/');
+ $output .= '<option value="'.$key.'">'.$key.'</option>'."\n";
+ }
+ $output .= '</select></label><br /><label>'."\n".
+ $lt{'fnam'}.': <select id="'.$secondselectname.'" name="'.$secondselectname.'">'."\n".
+ '<option value="" selected="selected"></option>'."\n".
+ '</select></label>'."\n".
+ '<input type="hidden" id="crsres_include_'.$suffix.'" value="'.$only.'" />';
+ return ($numdirs,$output);
+}
+
+sub show_crsfiles_js {
+ my $excluderef = &Apache::lonnet::priv_exclude();
+ my $se = &js_escape(&mt('Select'));
+ my $exclude;
+ if (ref($excluderef) eq 'HASH') {
+ $exclude = join(',', map { &js_escape($_); } sort(keys(%{$excluderef})));
+ }
+ my $js = <<"END";
+
+
+ function populateCrsSelects (form,dirsel,filesel,exc,include,setdir,setfile,recurse,nonemptydir,addtopdir) {
+ var relpath = '';
+ if ((setfile) && (dirsel != null) && (dirsel != 'undefined') && (dirsel != '')) {
+ var currdir = form.elements[dirsel].options[form.elements[dirsel].selectedIndex].value;
+ if (currdir == '') {
+ if ((filesel != null) && (filesel != 'undefined') && (filesel != '')) {
+ selelem = form.elements[filesel];
+ var j, numfiles = selelem.options.length -1;
+ if (numfiles >=0) {
+ for (j = numfiles; j >= 0; j--) {
+ selelem.remove(j);
+ }
+ }
+ if (selelem.options.length == 0) {
+ selelem.options[selelem.options.length] = new Option('','');
+ selelem.selectedIndex = 0;
}
- $selimport_menus{$key}->{'select2'}->{$file} = $file;
- push(@ordered,$file);
- }
- if (@ordered) {
- push(@order,$key);
- $nonemptydirs{$key} = 1;
- $selimport_menus{$key}->{'text'} = $shown;
- $selimport_menus{$key}->{'default'} = '';
- $selimport_menus{$key}->{'select2'}->{''} = '';
- $selimport_menus{$key}->{'order'} = \@ordered;
}
+ return;
+ } else {
+ relpath = encodeURIComponent(form.elements[dirsel].options[form.elements[dirsel].selectedIndex].value);
}
}
- $possdirs = scalar(keys(%nonemptydirs));
- if ($possdirs > 1) {
- my @order = sort { lc($a) cmp lc($b) } (keys(%nonemptydirs));
- $output = $lt{'dire'}.
- &linked_select_forms($form,'<br />'.
- $lt{'fnam'},'',
- $firstselectname,$secondselectname,
- \%selimport_menus,\@order,
- $onchangefirst,'',$suffix).'<br />';
- } elsif ($possdirs == 1) {
- $singledir = (keys(%nonemptydirs))[0];
- if (ref($selimport_menus{$singledir}->{'order'}) eq 'ARRAY') {
- @singledirfiles = @{$selimport_menus{$singledir}->{'order'}};
- }
- delete($selimport_menus{$singledir});
- }
- } elsif ($numdirs == 1) {
- $singledir = (keys(%files))[0];
- foreach my $file (sort { lc($a) cmp lc($b) } (keys(%{$files{$singledir}}))) {
- if ($only) {
- my ($ext) = ($file =~ /\.([^.]+)$/);
- unless ($possexts{lc($ext)}) {
- next;
+ var http = new XMLHttpRequest();
+ var url = "/adm/courseauthor";
+ var crsrole = "$env{'request.role'}";
+ var exclude = '';
+ if (exc) {
+ exclude = '$exclude';
+ }
+ var params = "role=course&files=1&rec="+recurse+"&nonempty="+nonemptydir+"&exc="+exclude+"&inc="+include+"&addtop="+addtopdir+"&path="+relpath;
+ 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);
+ var selelem;
+ if ((setdir) && (dirsel != null) && (dirsel != 'undefined') && (dirsel != '')) {
+ if (Array.isArray(data.dirs)) {
+ selelem = form.elements[dirsel];
+ var i, numdirs = selelem.options.length -1;
+ if (numdirs >=0) {
+ for (i = numdirs; i >= 0; i--) {
+ selelem.remove(i);
+ }
+ }
+ var len = data.dirs.length;
+ if (len) {
+ selelem.options[selelem.options.length] = new Option('$se','');
+ var j;
+ for (j = 0; j < len; j++) {
+ selelem.options[selelem.options.length] = new Option(data.dirs[j],data.dirs[j]);
+ }
+ selelem.selectedIndex = 0;
+ }
+ if (!setfile) {
+ if ((filesel != null) && (filesel != 'undefined') && (filesel != '')) {
+ selelem = form.elements[filesel];
+ var j, numfiles = selelem.options.length -1;
+ if (numfiles >=0) {
+ for (j = numfiles; j >= 0; j--) {
+ selelem.remove(j);
+ }
+ }
+ if (selelem.options.length == 0) {
+ selelem.options[selelem.options.length] = new Option('','');
+ selelem.selectedIndex = 0;
+ }
+ }
+ }
+ }
+ }
+ if ((setfile) && (filesel != null) && (filesel != 'undefined') && (filesel != '')) {
+ selelem = form.elements[filesel];
+ var i, numfiles = selelem.options.length -1;
+ if (numfiles >=0) {
+ for (i = numfiles; i >= 0; i--) {
+ selelem.remove(i);
+ }
+ }
+ var x;
+ for (x in data.files) {
+ if (Array.isArray(data.files[x])) {
+ if (data.files[x].length > 1) {
+ selelem.options[selelem.options.length] = new Option('$se','');
+ }
+ var len = data.files[x].length;
+ if (len) {
+ var k;
+ for (k = 0; k < len; k++) {
+ selelem.options[selelem.options.length] = new Option(data.files[x][k],data.files[x][k]);
+ }
+ selelem.selectedIndex = 0;
+ }
+ }
+ }
+ if (selelem.options.length == 0) {
+ selelem.options[selelem.options.length] = new Option('','');
+ selelem.selectedIndex = 0;
+ }
}
- } else {
- next if ($file =~ /\.rights$/);
}
- push(@singledirfiles,$file);
- }
- if (@singledirfiles) {
- $possdirs = 1;
}
+ http.send(params);
}
- if (($possdirs == 1) && (@singledirfiles)) {
- my $showdir = $singledir;
- if ($singledir eq '') {
- $showdir = '/';
+END
+}
+
+sub crsauthor_rights {
+ my ($rightsfile,$path,$docroot,$cnum,$cdom) = @_;
+ my $sourcerights = "$path/$rightsfile";
+ my $now = time;
+ if (!-e $sourcerights) {
+ my $cid = $cdom.'_'.$cnum;
+ if (!-e "$docroot/priv/$cdom") {
+ mkdir("$docroot/priv/$cdom",0755);
+ }
+ if (!-e "$docroot/priv/$cdom/$cnum") {
+ mkdir("$docroot/priv/$cdom/$cnum",0755);
+ }
+ if (open(my $fh,">$sourcerights")) {
+ print $fh <<END;
+<accessrule effect="deny" realm="" type="course" role="" />
+<accessrule effect="allow" realm="$cid" type="course" role="" />
+END
+ close($fh);
}
- $output = $lt{'dire'}.
- '<select name="'.$firstselectname.'">'.
- '<option value="'.$singledir.'">'.$showdir.'</option>'."\n".
- '</select><br />'.
- $lt{'fnam'}.'<select name="'.$secondselectname.'">'."\n".
- '<option value="" selected="selected">'.$lt{'se'}.'</option>'."\n";
- foreach my $file (@singledirfiles) {
- $output .= '<option value="'.$file.'">'.$file.'</option>'."\n";
+ }
+ if (!-e "$sourcerights.meta") {
+ if (open(my $fh,">$sourcerights.meta")) {
+ my $author=$env{'environment.firstname'}.' '.
+ $env{'environment.middlename'}.' '.
+ $env{'environment.lastname'}.' '.
+ $env{'environment.generation'};
+ $author =~ s/\s+$//;
+ print $fh <<"END";
+
+<abstract></abstract>
+<author>$author</author>
+<authorspace>$cnum:$cdom</authorspace>
+<copyright>private</copyright>
+<creationdate>$now</creationdate>
+<customdistributionfile></customdistributionfile>
+<dependencies></dependencies>
+<domain>$cdom</domain>
+<highestgradelevel>0</highestgradelevel>
+<keywords></keywords>
+<language>notset</language>
+<lastrevisiondate>$now</lastrevisiondate>
+<lowestgradelevel>0</lowestgradelevel>
+<mime>rights</mime>
+<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>
+<notes></notes>
+<obsolete></obsolete>
+<obsoletereplacement></obsoletereplacement>
+<owner>$cnum:$cdom</owner>
+<rule>deny:::course,allow:$cid::course</rule>
+<sourceavail></sourceavail>
+<standards></standards>
+<subject></subject>
+<title>Course Authoring Rights</title>
+END
+ close($fh);
}
- $output .= '</select><br />'."\n";
}
- return ($possdirs,$output);
+ return;
+}
+
+=pod
+
+=item * &iframe_wrapper_headjs()
+
+emits javascript containing two global vars to facilitate handling of resizing
+by code in iframe_wrapper_resizejs() used when an iframe is present in a page
+with standard LON-CAPA menus.
+
+=cut
+
+#
+# Where iframe is in use, if window.onload() executes before the custom resize function
+# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
+# are used to ensure document.ready() triggers a call to resize, so the iframe contents
+# do not obscure the Functions menu.
+#
+
+sub iframe_wrapper_headjs {
+ return <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+var LCnotready = 0;
+var LCresizedef = 0;
+// ]]>
+</script>
+
+ENDJS
+
+}
+
+=pod
+
+=item * &iframe_wrapper_resizejs()
+
+emits javascript used to handle resizing for a page containing
+an iframe, to ensure that the iframe does not obscure any
+standard LON-CAPA menu items.
+
+=back
+
+=cut
+
+#
+# jQuery to use when iframe is in use and a page resize occurs.
+# This script will ensure that the iframe does not obscure any
+# standard LON-CAPA inline menus (primary, secondary, and/or
+# breadcrumbs and Functions menus. Expects javascript from
+# &iframe_wrapper_headjs() to be in head portion of the web page,
+# e.g., by inclusion in second arg passed to &start_page().
+#
+
+sub iframe_wrapper_resizejs {
+ my $offset = 5;
+ &get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
+ if (($env{'form.inhibitmenu'} eq 'yes') || ($env{'form.only_body'})) {
+ $offset = 0;
+ }
+ return &Apache::lonhtmlcommon::scripttag(<<SCRIPT);
+ \$(document).ready( function() {
+ \$(window).unbind('resize').resize(function(){
+ var header = null;
+ var offset = $offset;
+ var height = 0;
+ var hdrtop = 0;
+ if (\$('div.LC_menus_content:first').length) {
+ if (\$('div.LC_menus_content:first').hasClass ("shown")) {
+ header = \$('div.LC_menus_content:first');
+ offset = 12;
+ }
+ } else if (\$('div.LC_head_subbox:first').length) {
+ header = \$('div.LC_head_subbox:first');
+ offset = 9;
+ } else {
+ if (\$('#LC_breadcrumbs').length) {
+ header = \$('#LC_breadcrumbs');
+ }
+ }
+ if (header != null && header.length) {
+ height = header.height();
+ hdrtop = header.position().top;
+ }
+ var pos = height + hdrtop + offset;
+ \$('.LC_iframecontainer').css('top', pos);
+ });
+ LCresizedef = 1;
+ if (LCnotready == 1) {
+ LCnotready = 0;
+ \$(window).trigger('resize');
+ }
+ });
+ window.onload = function(){
+ if (LCresizedef) {
+ LCnotready = 0;
+ \$(window).trigger('resize');
+ } else {
+ LCnotready = 1;
+ }
+ };
+SCRIPT
+
}
=pod
@@ -2509,7 +2800,7 @@ sub create_text_file {
# ------------------------------------------
sub domain_select {
- my ($name,$value,$multiple,$incdoms,$excdoms)=@_;
+ my ($name,$value,$multiple,$incdoms,$excdoms,$id)=@_;
my @possdoms;
if (ref($incdoms) eq 'ARRAY') {
@possdoms = @{$incdoms};
@@ -2530,10 +2821,10 @@ sub domain_select {
if ($multiple) {
$domains{''}=&mt('Any domain');
$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
- return &multiple_select_form($name,$value,4,\%domains);
+ return &multiple_select_form($name,$value,4,\%domains,undef,$id);
} else {
$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
- return &select_form($name,$value,\%domains);
+ return &select_form($name,$value,\%domains,'','',$id);
}
}
@@ -2545,7 +2836,7 @@ sub domain_select {
=over 4
-=item * &multiple_select_form($name,$value,$size,$hash,$order)
+=item * &multiple_select_form($name,$value,$size,$hash,$order,$id)
Returns a string containing a <select> element int multiple mode
@@ -2557,12 +2848,13 @@ Args:
$hash - the elements should be 'option' => 'shown text'
(shown text should already have been &mt())
$order - (optional) array ref of the order to show the elements in
+ $id = (optional) id for <select> element
=cut
#-------------------------------------------
sub multiple_select_form {
- my ($name,$value,$size,$hash,$order)=@_;
+ my ($name,$value,$size,$hash,$order,$id)=@_;
my %selected = map { $_ => 1 } ref($value)?@{$value}:($value);
my $output='';
if (! defined($size)) {
@@ -2571,7 +2863,10 @@ sub multiple_select_form {
$size = scalar(keys(%$hash));
}
}
- $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
+ if ($id ne '') {
+ $id = ' id="'.$id.'"';
+ }
+ $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple"'.$id.'>';
my @order;
if (ref($order) eq 'ARRAY') {
@order = @{$order};
@@ -2595,7 +2890,7 @@ sub multiple_select_form {
=pod
-=item * &select_form($defdom,$name,$hashref,$onchange,$readonly)
+=item * &select_form($defdom,$name,$hashref,$onchange,$readonly,$id,$aria_labelledby)
Returns a string containing a <select name='$name' size='1'> form to
allow a user to select options from a ref to a hash containing:
@@ -2603,7 +2898,10 @@ option_name => displayed text. An option
a javascript onchange item, e.g., onchange="this.form.submit();".
An optional arg -- $readonly -- if true will cause the select form
to be disabled, e.g., for the case where an instructor has a section-
-specific role, and is viewing/modifying parameters.
+specific role, and is viewing/modifying parameters. An optional arg
+-- $id -- will be used as the id attribute of the select element. An
+optional arg -- $aria_labelledby -- will be included as the aria-labelledby
+attribute of the select element.
See lonrights.pm for an example invocation and use.
@@ -2611,7 +2909,7 @@ See lonrights.pm for an example invocati
#-------------------------------------------
sub select_form {
- my ($def,$name,$hashref,$onchange,$readonly) = @_;
+ my ($def,$name,$hashref,$onchange,$readonly,$id,$aria_labelledby) = @_;
return unless (ref($hashref) eq 'HASH');
if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';
@@ -2620,7 +2918,13 @@ sub select_form {
if ($readonly) {
$disabled = ' disabled="disabled"';
}
- my $selectform = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n";
+ if ($id ne '') {
+ $id = ' id="'.$id.'"';
+ }
+ if ($aria_labelledby ne '') {
+ $aria_labelledby = ' aria-labelledby="'.$aria_labelledby.'"';
+ }
+ my $selectform = "<select name=\"$name\" size=\"1\"$onchange$disabled$id$aria_labelledby>\n";
my @keys;
if (exists($hashref->{'select_form_order'})) {
@keys=@{$hashref->{'select_form_order'}};
@@ -2671,7 +2975,7 @@ sub display_filter {
my $onchange = "javascript:toggleHistoryOptions(this,'containingphrase','$context',
'$secondid','$thirdid')";
return '<span class="LC_nobreak"><label>'.&mt('Records: [_1]',
- &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
+ &Apache::lonmeta::selectbox('show',$env{'form.show'},'','',undef,
(&mt('all'),10,20,50,100,1000,10000))).
'</label></span> <span class="LC_nobreak">'.
&mt('Filter: [_1]',
@@ -2773,9 +3077,12 @@ sub gradeleveldescription {
}
sub select_level_form {
- my ($deflevel,$name)=@_;
+ my ($deflevel,$name,$id)=@_;
+ if ($id ne '') {
+ $id = ' id="'.$id.'"';
+ }
unless ($deflevel) { $deflevel=0; }
- my $selectform = "<select name=\"$name\" size=\"1\">\n";
+ my $selectform = "<select name=\"$name\" size=\"1\"$id>\n";
for (my $i=0; $i<=18; $i++) {
$selectform.="<option value=\"$i\" ".
($i==$deflevel ? 'selected="selected" ' : '').
@@ -2789,7 +3096,7 @@ sub select_level_form {
=pod
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled,$id)
Returns a string containing a <select name='$name' size='1'> form to
allow a user to select the domain to preform an operation in.
@@ -2808,17 +3115,22 @@ The optional $excdoms is a reference to
The optional $disabled argument, if true, adds the disabled attribute to the select tag.
+The option $id argument is the value (if any) to set as the (unique) id attribute for the select tag.
+
=cut
#-------------------------------------------
sub select_dom_form {
- my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled) = @_;
+ my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled,$id) = @_;
if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';
}
if ($disabled) {
$disabled = ' disabled="disabled"';
}
+ if ($id ne '') {
+ $id = ' id="'.$id.'"';
+ }
my (@domains,%exclude);
if (ref($incdoms) eq 'ARRAY') {
@domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
@@ -2829,7 +3141,7 @@ sub select_dom_form {
if (ref($excdoms) eq 'ARRAY') {
map { $exclude{$_} = 1; } @{$excdoms};
}
- my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n";
+ my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange$disabled$id>\n";
foreach my $dom (@domains) {
next if ($exclude{$dom});
$selectdomain.="<option value=\"$dom\" ".
@@ -3673,6 +3985,21 @@ sub passwd_validation_js {
} else {
$alertmsg = &mt('A secret did not satisfy requirement(s):').'\n\n';
}
+ } elsif ($context eq 'ltitools') {
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['toolsec'],$domain);
+ if (ref($domconfig{'toolsec'}) eq 'HASH') {
+ if (ref($domconfig{'toolsec'}{'rules'}) eq 'HASH') {
+ %passwdconf = %{$domconfig{'toolsec'}{'rules'}};
+ }
+ }
+ if ($id eq 'add') {
+ $alertmsg = &mt('Secret for added external tool did not satisfy requirement(s):').'\n\n';
+ } elsif ($id =~ /^\d+$/) {
+ my $pos = $id+1;
+ $alertmsg = &mt('Secret for external tool [_1] did not satisfy requirement(s):','#'.$pos).'\n\n';
+ } else {
+ $alertmsg = &mt('A secret did not satisfy requirement(s):').'\n\n';
+ }
} else {
%passwdconf = &Apache::lonnet::get_passwdconf($domain);
$alertmsg = &mt('Initial password did not satisfy requirement(s):').'\n\n';
@@ -4284,6 +4611,30 @@ sub syllabuswrapper {
# -----------------------------------------------------------------------------
+sub aboutme_on {
+ my ($uname,$udom)=@_;
+ unless ($uname) { $uname=$env{'user.name'}; }
+ unless ($udom) { $udom=$env{'user.domain'}; }
+ return if ($udom eq 'public' && $uname eq 'public');
+ my $hashkey=$uname.':'.$udom;
+ my ($aboutme,$cached)=&Apache::lonnet::is_cached_new('aboutme',$hashkey);
+ if ($cached) {
+ return $aboutme;
+ }
+ $aboutme = &Apache::lonnet::usertools_access($uname,$udom,'aboutme');
+ &Apache::lonnet::do_cache_new('aboutme',$hashkey,$aboutme,3600);
+ return $aboutme;
+}
+
+sub devalidate_aboutme_cache {
+ my ($uname,$udom)=@_;
+ if (!$udom) { $udom =$env{'user.domain'}; }
+ if (!$uname) { $uname=$env{'user.name'}; }
+ return if ($udom eq 'public' && $uname eq 'public');
+ my $id=$uname.':'.$udom;
+ &Apache::lonnet::devalidate_cache_new('aboutme',$id);
+}
+
sub track_student_link {
my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
my $link ="/adm/trackstudent?";
@@ -4526,9 +4877,10 @@ sub filemimetype {
sub filecategoryselect {
- my ($name,$value)=@_;
+ my ($name,$value,$id)=@_;
return &select_form($value,$name,
- {'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))});
+ {'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))},
+ '','',$id);
}
=pod
@@ -5012,6 +5364,7 @@ sub get_student_view {
$userview=~s/\<\/html\>//gi;
$userview=~s/\<head\>//gi;
$userview=~s/\<\/head\>//gi;
+ $userview=~s/\Q<div class="LC_landmark" role="main"\E/<div class="LC_landmark"/;
$userview=~s/action\s*\=/would_be_action\=/gi;
$userview=&relative_to_absolute($feedurl,$userview);
if (wantarray) {
@@ -5375,7 +5728,8 @@ sub blockcheck {
}
unless ($has_evb) {
if (($activity eq 'printout') || ($activity eq 'grades') || ($activity eq 'search') ||
- ($activity eq 'boards') || ($activity eq 'groups') || ($activity eq 'chat')) {
+ ($activity eq 'index') || ($activity eq 'boards') || ($activity eq 'groups') ||
+ ($activity eq 'chat')) {
if ($udom eq $cdom) {
$check_ipaccess = 1;
}
@@ -5466,8 +5820,8 @@ sub blockcheck {
if (($activity eq 'boards' || $activity eq 'chat' ||
$activity eq 'groups' || $activity eq 'printout' ||
- $activity eq 'search' || $activity eq 'reinit' ||
- $activity eq 'alert') &&
+ $activity eq 'search' || $activity eq 'index' ||
+ $activity eq 'reinit' || $activity eq 'alert') &&
($env{'request.course.id'})) {
foreach my $key (keys(%live_courses)) {
if ($key ne $env{'request.course.id'}) {
@@ -5802,6 +6156,8 @@ END_MYBLOCK
$text = &mt('Gradebook Blocked');
} elsif ($activity eq 'search') {
$text = &mt('Search Blocked');
+ } elsif ($activity eq 'index') {
+ $text = &mt('Content Index Blocked');
} elsif ($activity eq 'alert') {
$text = &mt('Checking Critical Messages Blocked');
} elsif ($activity eq 'reinit') {
@@ -5998,7 +6354,7 @@ sub get_domainconf {
foreach my $host (keys(%{$domconfig{'login'}{$key}})) {
if (ref($domconfig{'login'}{$key}{$host}) eq 'HASH') {
$designhash{$udom.'.login.'.$key.'_'.$host} = 1;
- foreach my $item ('text','img','alt','url','title','notsso') {
+ foreach my $item ('text','img','alt','url','title','window','notsso') {
$designhash{$udom.'.login.'.$key.'_'.$item.'_'.$host} = $domconfig{'login'}{$key}{$host}{$item};
}
}
@@ -6235,6 +6591,8 @@ Input: (optional) filename from which br
If page header is being requested for use in a frameset, then
the second (option) argument -- frameset will be true, and
the target attribute set for links should be target="_parent".
+ If $title is supplied as the third arg, that will be used to
+ the left of the breadcrumbs tail for the current path.
Returns: HTML div with CSTR path and recent box
To be included on Authoring Space pages
@@ -6242,7 +6600,7 @@ Returns: HTML div with CSTR path and rec
=cut
sub CSTR_pageheader {
- my ($trailfile,$frameset) = @_;
+ my ($trailfile,$frameset,$title) = @_;
if ($trailfile eq '') {
$trailfile = $env{'request.filename'};
}
@@ -6265,13 +6623,15 @@ sub CSTR_pageheader {
$lastitem = $thisdisfn;
}
- my ($crsauthor,$title);
+ my $crsauthor;
if (($env{'request.course.id'}) &&
($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) {
$crsauthor = 1;
- $title = &mt('Course Authoring Space');
- } else {
+ if ($title eq '') {
+ $title = &mt('Course Authoring Space');
+ }
+ } elsif ($title eq '') {
$title = &mt('Authoring Space');
}
@@ -6316,6 +6676,147 @@ sub CSTR_pageheader {
return $output;
}
+##############################################
+=pod
+
+=item * &nocodemirror()
+
+Input: None
+
+Returns: 1 if CodeMirror is deactivated based on
+ user's preference, or domain default,
+ if user indicated use of default.
+
+=cut
+
+sub nocodemirror {
+ my $nocodem = $env{'environment.nocodemirror'};
+ unless ($nocodem) {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+ if ($domdefs{'nocodemirror'}) {
+ $nocodem = 'yes';
+ }
+ }
+ if ($nocodem eq 'yes') {
+ return 1;
+ }
+ return;
+}
+
+##############################################
+=pod
+
+=item * &permitted_editors()
+
+Input: $uri (optional)
+
+Returns: %editors hash in which keys are editors
+ permitted in current Authoring Space,
+ or in current course for web pages
+ created in a course.
+
+ Value for each key is 1. Possible keys
+ are: edit, xml, and daxe.
+
+ For a regular Authoring Space, if no specific
+ set of editors has been set for the Author
+ who owns the Authoring Space, then the
+ domain default will be used. If no domain
+ default has been set, then the keys will be
+ edit and xml.
+
+ For a course author, or for web pages created
+ in a course, if no specific set of editors has
+ been set for the course, then the domain
+ course default will be used. If no domain
+ course default has been set, then the keys
+ will be edit and xml.
+
+=cut
+
+sub permitted_editors {
+ my ($uri) = @_;
+ my ($is_author,$is_coauthor,$is_course,$auname,$audom,%editors);
+ if ($env{'request.role'} =~ m{^au\./}) {
+ $is_author = 1;
+ } elsif ($env{'request.role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)}) {
+ ($audom,$auname) = ($1,$2);
+ if (($audom ne '') && ($auname ne '')) {
+ if (($env{'user.domain'} eq $audom) &&
+ ($env{'user.name'} eq $auname)) {
+ $is_author = 1;
+ } else {
+ $is_coauthor = 1;
+ }
+ }
+ } elsif ($env{'request.course.id'}) {
+ my ($cdom,$cnum);
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if (($env{'request.editurl'} =~ m{^/priv/\Q$cdom/$cnum\E/}) ||
+ ($env{'request.editurl'} =~ m{^/uploaded/\Q$cdom/$cnum\E/(docs|supplemental)/}) ||
+ ($uri =~ m{^/uploaded/\Q$cdom/$cnum\E/(docs|supplemental)/})) {
+ $is_course = 1;
+ } elsif ($env{'request.editurl'} =~ m{^/priv/($match_domain)/($match_username)/}) {
+ ($audom,$auname) = ($1,$2);
+ } elsif ($env{'request.uri'} =~ m{^/priv/($match_domain)/($match_username)/}) {
+ ($audom,$auname) = ($1,$2);
+ } elsif (($uri eq '/daxesave') &&
+ (($env{'form.path'} =~ m{^/daxeopen/priv/\Q$cdom/$cnum\E/}) ||
+ ($env{'form.path'} =~ m{^/daxeopen/uploaded/\Q$cdom/$cnum\E/(docs|supplemental)/}))) {
+ $is_course = 1;
+ } elsif (($uri eq '/daxesave') &&
+ ($env{'form.path'} =~ m{^/daxeopen/priv/($match_domain)/($match_username)/})) {
+ ($audom,$auname) = ($1,$2);
+ }
+ unless ($is_course) {
+ if (($audom ne '') && ($auname ne '')) {
+ if (($env{'user.domain'} eq $audom) &&
+ ($env{'user.name'} eq $auname)) {
+ $is_author = 1;
+ } else {
+ $is_coauthor = 1;
+ }
+ }
+ }
+ }
+ if ($is_author) {
+ if (exists($env{'environment.editors'})) {
+ map { $editors{$_} = 1; } split(/,/,$env{'environment.editors'});
+ } else {
+ %editors = ( edit => 1,
+ xml => 1,
+ );
+ }
+ } elsif ($is_coauthor) {
+ if (exists($env{"environment.internal.editors./$audom/$auname"})) {
+ map { $editors{$_} = 1; } split(/,/,$env{"environment.internal.editors./$audom/$auname"});
+ } else {
+ %editors = ( edit => 1,
+ xml => 1,
+ );
+ }
+ } elsif ($is_course) {
+ if (exists($env{'course.'.$env{'request.course.id'}.'.internal.crseditors'})) {
+ map { $editors{$_} = 1; } split(/,/,$env{'course.'.$env{'request.course.id'}.'.internal.crseditors'});
+ } else {
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+ if (exists($domdefaults{'crseditors'})) {
+ map { $editors{$_} = 1; } split(/,/,$domdefaults{'crseditors'});
+ } else {
+ %editors = ( edit => 1,
+ xml => 1,
+ );
+ }
+ }
+ } else {
+ %editors = ( edit => 1,
+ xml => 1,
+ );
+ }
+ return %editors;
+}
+
###############################################
###############################################
@@ -6377,6 +6878,21 @@ Inputs:
context, this will contain a reference to hash of items
to be included in the page header and/or inline menu.
+=item * $menucoll, optional argument, if specific menu collection is in
+ effect, either set as the default for the course, or set for
+ the deeplink paramater for $env{'request.deeplink.login'}
+ then $menucoll will be the number of that collection.
+
+=item * $menuref, optional argument, reference to a hash, containing the
+ menu options included for the menu in effect, based on the
+ configuration for the numbered menu collection in use.
+
+=item * $showncrumbsref, reference to a scalar. Calls to lonmenu::innerregister
+ within &bodytag() can result in calls to lonhtmlcommon::breadcrumbs(),
+ if so, $showncrumbsref is set there to 1, and will propagate back
+ via &bodytag() to &start_page(), to prevent lonhtmlcommon::breadcrumbs()
+ being called a second time.
+
=back
Returns: A uniform header for LON-CAPA web pages.
@@ -6389,7 +6905,7 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
$no_nav_bar,$bgcolor,$args,$advtoolsref,$ltiscope,$ltiuri,
- $ltimenu,$menucoll,$menuref)=@_;
+ $ltimenu,$menucoll,$menuref,$showncrumbsref)=@_;
my $public;
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -6401,7 +6917,6 @@ sub bodytag {
my $hostname = $args->{'hostname'};
$function = &get_users_function() if (!$function);
- my $img = &designparm($function.'.img',$domain);
my $font = &designparm($function.'.font',$domain);
my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain);
@@ -6455,8 +6970,6 @@ sub bodytag {
$role = &Apache::lonnet::plaintext($role);
}
- if (!$realm) { $realm=' '; }
-
my $extra_body_attr = &make_attr_string($forcereg,\%design);
# construct main body tag
@@ -6480,7 +6993,6 @@ sub bodytag {
undef($role);
}
unless ($ltimenu->{'coursetitle'}) {
- $realm=' ';
$showcrstitle = 0;
}
}
@@ -6490,7 +7002,6 @@ sub bodytag {
undef($role);
}
unless ($menuref->{'crs'}) {
- $realm=' ';
$showcrstitle = 0;
}
}
@@ -6524,72 +7035,121 @@ sub bodytag {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }
- $bodytag .= Apache::lonhtmlcommon::scripttag(
- Apache::lonmenu::utilityfunctions($httphost), 'start');
+ my $need_endlcint;
+ unless ($args->{'switchserver'}) {
+ $bodytag .= Apache::lonhtmlcommon::scripttag(
+ Apache::lonmenu::utilityfunctions($httphost), 'start');
+ $need_endlcint = 1;
+ }
+ my $collapsible;
+ if ($args->{'collapsible_header'} ne '') {
+ $collapsible = 1;
+ my ($menustate,$tiptext,$divclass);
+ if ($args->{'start_collapsed'}) {
+ $menustate = 'collapsed';
+ $tiptext = 'display';
+ $divclass = 'hidden';
+ } else {
+ $menustate = 'expanded';
+ $tiptext = 'hide';
+ $divclass = 'shown';
+ }
+ my $alttext = &mt('menu state: '.$menustate);
+ my $tooltip = &mt($tiptext.' standard menus');
+ $bodytag .= <<"END";
+<div id="LC_expandingContainer" style="display:inline;" role="navigation">
+<div id="LC_collapsible" class="LC_collapse_trigger" style="position: absolute;top: -5px;left: 0px; z-index:101; display:inline;">
+<a href="#" style="text-decoration:none;"><img class="LC_collapsible_indicator" alt="$alttext" title="$tooltip" src="/res/adm/pages/$menustate.png" style="border:0;margin:0;padding:0;max-width:100%;height:auto" /></a></div>
+<div class="LC_menus_content $divclass">
+END
+ }
unless ($args->{'no_primary_menu'}) {
my ($left,$right) = Apache::lonmenu::primary_menu($crstype,$ltimenu,$menucoll,$menuref,
$args->{'links_disabled'},
- $args->{'links_target'});
-
+ $args->{'links_target'},
+ $collapsible);
+ my $labeltext = &HTML::Entities::encode(&mt('Primary links'));
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {
$dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
}
- $bodytag .= qq|<div id="LC_nav_bar">$left $role<br />
- <em>$realm</em> $dc_info</div>|;
+ $bodytag .= qq|<div id="LC_nav_bar" role="navigation" aria-label="$labeltext">$left $role</div>|;
+ unless (($realm eq '') && ($dc_info eq '')) {
+ $bodytag .= qq|<div id="LC_realm" role="complementary"><em>$realm</em> $dc_info</div>|;
+ }
+ if ($need_endlcint) {
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ }
return $bodytag;
}
+ $bodytag .= '<div class="LC_landmark" style="margin: 3px 0 0 0;" role="navigation" aria-label="'.$labeltext.'">';
unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
$bodytag .= qq|<div id="LC_nav_bar">$left $role</div>|;
}
- $bodytag .= $right;
+ $bodytag .= $right.'</div>';
if ($dc_info) {
$dc_info = &dc_courseid_toggle($dc_info);
}
- $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
+ unless (($realm eq '') && ($dc_info eq '')) {
+ $bodytag .= qq|<div id="LC_realm" role="complementary">$realm $dc_info</div>|;
+ }
+ $bodytag .= qq|<div style="clear: both; margin: 5px 0 0 0;"></div>|;
}
#if directed to not display the secondary menu, don't.
if ($args->{'no_secondary_menu'}) {
+ if ($need_endlcint) {
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ }
return $bodytag;
}
#don't show menus for public users
if (!$public){
unless ($args->{'no_inline_menu'}) {
- $bodytag .= Apache::lonmenu::secondary_menu($httphost,$ltiscope,$ltimenu,
+ $bodytag .= '<div class="LC_landmark" role="navigation" aria-label="Secondary Links">'.
+ Apache::lonmenu::secondary_menu($httphost,$ltiscope,$ltimenu,
$args->{'no_primary_menu'},
$menucoll,$menuref,
$args->{'links_disabled'},
- $args->{'links_target'});
+ $args->{'links_target'}).
+ '</div>';
}
$bodytag .= Apache::lonmenu::serverform();
- $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ if ($need_endlcint) {
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ }
if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,
- $args->{'bread_crumbs'},'','',$hostname,$ltiscope,$ltiuri);
+ $args->{'bread_crumbs'},'','',$hostname,
+ $ltiscope,$ltiuri,$showncrumbsref);
} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
- $args->{'group'},
- $args->{'hide_buttons'},
- $hostname,$ltiscope,$ltiuri);
+ $args->{'group'},$args->{'hide_buttons'},
+ $hostname,$ltiscope,$ltiuri,$showncrumbsref);
} else {
- $bodytag .=
+ $bodytag .=
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
$forcereg,$args->{'group'},
$args->{'bread_crumbs'},
$advtoolsref,'',$hostname);
}
- }else{
- # this is to seperate menu from content when there's no secondary
- # menu. Especially needed for public accessible ressources.
- $bodytag .= '<hr style="clear:both" />';
- $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ } else {
+ # this is to separate menu from content when there's no secondary
+ # menu. Especially needed for publicly accessible resources.
+ $bodytag .= '<hr style="clear:both" role="complementary" />';
+ if ($need_endlcint) {
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ }
+ }
+ if ($args->{'collapsible_header'} ne '') {
+ $bodytag .= $args->{'collapsible_header'}.
+ '<div id="LC_collapsible_separator"></div>'.
+ '</div></div>';
}
-
return $bodytag;
}
@@ -6659,12 +7219,45 @@ sub endbodytag {
}
if ( exists( $env{'internal.head.redirect'} ) ) {
if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
+ my ($endbodyjs,$idattr);
+ if ($env{'internal.head.to_opener'}) {
+ my $linkid = 'LC_continue_link';
+ $idattr = ' id="'.$linkid.'"';
+ my $redirect_for_js = &js_escape($env{'internal.head.redirect'});
+ $endbodyjs=<<ENDJS;
+<script type="text/javascript">
+// <![CDATA[
+function ebFunction(evt) {
+ evt.preventDefault();
+ var dest = '$redirect_for_js';
+ if (window.opener != null && !window.opener.closed) {
+ window.opener.location.href=dest;
+ window.close();
+ } else {
+ window.location.href=dest;
+ }
+ return false;
+}
+
+\$(document).ready(function () {
+ if (document.getElementById('$linkid')) {
+ var clickelem = document.getElementById('$linkid');
+ clickelem.addEventListener('click',ebFunction,false);
+ }
+});
+// ]]>
+</script>
+ENDJS
+ }
$endbodytag=
- "<br /><a href=\"$env{'internal.head.redirect'}\">".
+ "$endbodyjs<br /><a href=\"$env{'internal.head.redirect'}\"$idattr>".
&mt('Continue').'</a>'.
$endbodytag;
}
}
+ if ((ref($args) eq 'HASH') && ($args->{'dashjs'})) {
+ $endbodytag = &Apache::lonhtmlcommon::dash_to_minus_js().$endbodytag;
+ }
return $endbodytag;
}
@@ -6685,7 +7278,6 @@ Inputs: (all optional)
sub standard_css {
my ($function,$domain,$bgcolor) = @_;
$function = &get_users_function() if (!$function);
- my $img = &designparm($function.'.img', $domain);
my $tabbg = &designparm($function.'.tabbg', $domain);
my $font = &designparm($function.'.font', $domain);
my $fontmenu = &designparm($function.'.fontmenu', $domain);
@@ -6738,6 +7330,7 @@ body {
line-height:130%;
font-size:0.83em;
color:$font;
+ background-color: $pgbg_or_bgcolor;
}
a:focus,
@@ -6749,14 +7342,63 @@ form, .inline {
display: inline;
}
+.LC_landmark {
+ margin: 0;
+ padding: 0;
+ border: none;
+}
+
+.LC_visually_hidden:not(:focus):not(:active) {
+ clip-path: inset(50%);
+ height: 1px;
+ overflow: hidden;
+ position: absolute;
+ white-space: nowrap;
+ width: 1px;
+ display: inline;
+}
+
+.LC_heading_2 {
+ font-size: 1.17em;
+}
+
+.LC_heading_3 {
+ font-size: 1.0em;
+}
+
+h1.LC_search_results {
+ font-size: 1.0em;
+ font-weight: normal;
+}
+
+.LC_menus_content.shown{
+ display: block;
+}
+
+.LC_menus_content.hidden {
+ display: none;
+}
+
.LC_right {
text-align:right;
}
+.LC_left {
+ text-align:left;
+}
+
+.LC_center {
+ text-align:center;
+}
+
.LC_middle {
vertical-align:middle;
}
+.LC_bottom {
+ vertical-align:bottom;
+}
+
.LC_floatleft {
float: left;
}
@@ -6769,6 +7411,12 @@ form, .inline {
width:400px;
}
+#LC_collapsible_separator {
+ border: 1px solid black;
+ width: 99.9%;
+ height: 0px;
+}
+
.LC_iframecontainer {
width: 98%;
margin: 0;
@@ -6836,6 +7484,14 @@ div.LC_confirm_box .LC_success img {
height: auto;
}
+div.LC_minheight {
+ min-height: 24px;
+ border: 0;
+ margin: 4px 0 0 0;
+ padding: 0;
+ vertical-align: middle;
+}
+
.LC_textsize_mobile {
\@media only screen and (max-device-width: 480px) {
-webkit-text-size-adjust:100%; -moz-text-size-adjust:100%; -ms-text-size-adjust:100%;
@@ -6890,9 +7546,10 @@ div.LC_confirm_box .LC_success img {
padding: 4px;
}
-table.LC_pastsubmission {
+.LC_pastsubmission {
border: 1px solid black;
margin: 2px;
+ padding: 2px;
}
table#LC_menubuttons {
@@ -7028,6 +7685,10 @@ li.LC_menubuttons_inline_text img {
text-decoration: none;
}
+.LC_menubuttons_link img {
+ vertical-align: middle;
+}
+
.LC_menubuttons_category {
color: $font;
background: $pgbg;
@@ -7035,7 +7696,9 @@ li.LC_menubuttons_inline_text img {
font-weight: bold;
}
-td.LC_menubuttons_text {
+.LC_menu_text {
+ clear: left;
+ text-align: left;
color: $font;
}
@@ -7127,11 +7790,13 @@ table.LC_data_table tr td.LC_leftcol_hea
}
table.LC_data_table tr.LC_empty_row td,
-table.LC_nested tr.LC_empty_row td {
+table.LC_nested tr.LC_empty_row td,
+table.LC_nested tr.LC_empty_row th {
font-weight: bold;
font-style: italic;
text-align: center;
padding: 8px;
+ border: 0;
}
table.LC_data_table tr.LC_empty_row td,
@@ -7139,15 +7804,19 @@ table.LC_data_table tr.LC_footer_row td
background-color: $sidebg;
}
+table.LC_nested tr.LC_empty_row th,
table.LC_nested tr.LC_empty_row td {
+ padding: 4ex;
background-color: #FFFFFF;
}
table.LC_caption {
}
-table.LC_nested tr.LC_empty_row td {
- padding: 4ex
+caption.LC_caption_prefs {
+ font-weight: normal;
+ text-align: left;
+ padding-bottom: 0.8em;
}
table.LC_nested_outer tr th {
@@ -7166,14 +7835,17 @@ table.LC_nested_outer tr td.LC_subheader
text-align: right;
}
-table.LC_nested tr.LC_info_row td {
+table.LC_nested tr.LC_info_row td,
+table.LC_nested tr.LC_info_row th {
background-color: #CCCCCC;
font-weight: bold;
font-size: small;
text-align: center;
+ border: 0;
}
table.LC_nested tr.LC_info_row td.LC_left_item,
+table.LC_nested tr.LC_info_row th.LC_left_item,
table.LC_nested_outer tr th.LC_left_item {
text-align: left;
}
@@ -7316,6 +7988,10 @@ table.LC_data_table tr > td.LC_roles_sel
border-right: 8px solid #11CC55;
}
+table.LC_data_table tr.LC_prefs_row {
+ line-height: 250%;
+}
+
span.LC_current_location {
font-size:larger;
background: $pgbg;
@@ -7389,39 +8065,68 @@ table.LC_parm_overview_restrictions th {
border-color: $pgbg;
}
-table#LC_helpmenu {
- border: none;
- height: 55px;
- border-spacing: 0;
+h1.LC_helpmenu {
+ display: inline;
+ font-size: 100%;
+ font-weight: normal;
+ line-height: 1em;
+ margin: 0;
+ padding: 0;
+ border: 0;
}
-table#LC_helpmenu fieldset legend {
- font-size: larger;
+.LC_helpdesk_headbox {
+ border: 2px groove threedface;
+ padding: 1em;
}
-table#LC_helpmenu_links {
- width: 100%;
- border: 1px solid black;
+h1.LC_helpdesk_legend {
+ float: left;
+ margin: -1.7em 0 0;
+ padding: 0 .5em;
background: $pgbg;
+ font-size: 1em;
+ font-weight: bold;
+}
+
+h1.LC_helpdesk_title {
+ display: inline;
+ font-size: 1em;
+ line-height: 2.5em;
+ margin: 0;
padding: 0;
- border-spacing: 1px;
+ vertical-align: bottom;
}
-table#LC_helpmenu_links tr td {
- padding: 1px;
+.LC_helpdesk_links {
+ border: 1px solid black;
+ padding: 3px;
background: $tabbg;
text-align: center;
font-weight: bold;
+ display: inline;
+ margin-right: -6px;
}
-table#LC_helpmenu_links a:link,
-table#LC_helpmenu_links a:visited,
-table#LC_helpmenu_links a:active {
+.LC_helpdesk_img,
+.LC_helpdesk_text {
+ padding: 0;
+ margin: 0;
+ border: 0;
+ display: inline;
+}
+
+.LC_helpdesk_img a:link,
+.LC_helpdesk_img a:visited,
+.LC_helpdesk_img a:active,
+.LC_helpdesk_text a:link,
+.LC_helpdesk_text a:visited,
+.LC_helpdesk_text a:active {
text-decoration: none;
color: $font;
}
-table#LC_helpmenu_links a:hover {
+div.LC_helpdesk_text a:hover {
text-decoration: underline;
color: $vlink;
}
@@ -7448,7 +8153,7 @@ table.LC_pick_box {
border-spacing: 1px;
}
-table.LC_pick_box td.LC_pick_box_title {
+table.LC_pick_box th.LC_pick_box_title {
background: $sidebg;
font-weight: bold;
text-align: left;
@@ -7489,6 +8194,13 @@ table.LC_pick_box td.LC_oddrow_value {
background-color: $data_table_light;
}
+td.LC_log_filter,
+th.LC_log_filter {
+ vertical-align: top;
+ text-align: left;
+ padding: 0 4px;
+}
+
span.LC_helpform_receipt_cat {
font-weight: bold;
}
@@ -7651,6 +8363,44 @@ table.LC_prior_tries td {
padding: 6px;
}
+span.LC_prob_status {
+ margin: 5px 0 0 0;
+ padding: 0 5px 0 0;
+ vertical-align: middle;
+}
+
+div.LC_prob_status_outer {
+ display: inline-block;
+ margin: -5px 0 0 0;
+ padding: 0;
+}
+
+div.LC_prob_status_inner {
+ display: inline-block;
+ margin: 0 5px 0 0;
+ padding: 5px;
+}
+
+caption.LC_filesub_status {
+ text-align: left;
+ font-weight: bold;
+}
+
+.LC_mail_actions {
+ float: left;
+ padding: 0;
+ margin: 6px;
+}
+
+.LC_vertical_line {
+ width: 1px;
+ background-color: black;
+ height: 4em;
+ float: left;
+ margin: 0;
+ padding: 0;
+}
+
span.LC_prior_numerical,
span.LC_prior_string,
span.LC_prior_custom,
@@ -7804,6 +8554,10 @@ div.LC_grade_show_user div.LC_Box {
margin-right: 50px;
}
+div.LC_grade_show_user div.LC_Box table tr th {
+ font-weight: normal;
+}
+
div.LC_grade_submissions,
div.LC_grade_message_center,
div.LC_grade_info_links {
@@ -7834,6 +8588,12 @@ table.LC_scantron_action tr th {
font-style:normal;
}
+div.LC_edit_problem_daxe_header {
+ padding: 3px;
+ background: $tabbg;
+ z-index: 100;
+}
+
.LC_edit_problem_header,
div.LC_edit_problem_footer {
font-weight: normal;
@@ -7899,8 +8659,9 @@ img.stift {
vertical-align: middle;
}
-table td.LC_mainmenu_col_fieldset {
- vertical-align: top;
+div.LC_mainmenu {
+ margin: 3px 2px 2px 1px;
+ float: left;
}
div.LC_createcourse {
@@ -7948,6 +8709,7 @@ h6 {
border-bottom:solid 1px $lg_border_color;
}
+.LC_MainMenu_Box > .LC_hcell,
.LC_Box > .LC_hcell {
margin: 0 -10px 10px -10px;
}
@@ -7981,6 +8743,26 @@ fieldset {
/* overflow: hidden; */
}
+fieldset#LC_selectuser {
+ margin: -1px 0 0 0;
+ padding: 0;
+ border: 0;
+}
+
+fieldset.LC_delete_slot {
+ display:inline;
+ margin: 0 4px 4px;
+ padding: 4px;
+}
+
+fieldset.LC_delete_slot > legend {
+ font-weight: normal;
+}
+
+p.LC_medium_line {
+ line-height: 0.85em;
+}
+
article.geogebraweb div {
margin: 0;
}
@@ -8380,6 +9162,11 @@ ol#LC_PathBreadcrumbs li a {
padding: 0 0 10px 10px;
}
+.LC_MainMenu_Box {
+ border: solid 1px $lg_border_color;
+ padding: 0 10px 0 10px;
+}
+
.LC_AboutMe_Image {
float:left;
margin-right:10px;
@@ -8401,6 +9188,7 @@ dl.LC_ListStyleClean dd {
.LC_ListStyleClean,
.LC_ListStyleSimple,
.LC_ListStyleNormal,
+.LC_ListStyleMainMenu,
.LC_ListStyleSpecial {
/* display:block; */
list-style-position: inside;
@@ -8438,6 +9226,12 @@ dl.LC_ListStyleClean dd {
margin-bottom: 4px;
}
+.LC_ListStyleMainMenu li {
+ margin: 0;
+ padding: 2px 5px 2px 10px;
+ clear: both;
+}
+
table.LC_SimpleTable {
margin:5px;
border:solid 1px $lg_border_color;
@@ -8524,6 +9318,10 @@ a#LC_content_toolbar_edittoplevel {
background-image:url(/res/adm/pages/edittoplevel.gif);
}
+a#LC_content_toolbar_printout {
+ background-image:url(/res/adm/pages/printout.gif);
+}
+
ul#LC_toolbar li a:hover {
background-position: bottom center;
}
@@ -8532,7 +9330,7 @@ ul#LC_toolbar {
padding: 0;
margin: 2px;
list-style:none;
- position:relative;
+ display:inline;
background-color:white;
overflow: auto;
}
@@ -8560,6 +9358,13 @@ a.LC_toolbarItem {
background-color:transparent;
}
+.LC_navtools {
+ display: inline-block;
+ padding: 0;
+ margin: 2px;
+ vertical-align: middle;
+}
+
ul.LC_funclist {
margin: 0;
padding: 0.5em 1em 0.5em 0;
@@ -8664,13 +9469,39 @@ pre.LC_wordwrap {
/*
styles used for response display
*/
-div.LC_radiofoil, div.LC_rankfoil {
+div.LC_radiofoil, div.LC_rankfoil, div.LC_optionfoil, div.LC_matchfoil, div.LC_login_links {
margin: .5em 0em .5em 0em;
}
table.LC_itemgroup {
margin-top: 1em;
}
+table.LC_itemgroup tr th {
+ font-weight: normal;
+}
+
+fieldset.LC_webbubbles {
+ margin: 2px 0 0 0;
+ padding: 0;
+ border: 0;
+}
+
+ul.LC_webbubbles {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ text-align: left;
+ float: left;
+}
+
+ul.LC_webbubbles li {
+ line-height: 1.8em;
+ border: 1px solid black;
+ padding: 0 2px 0 5px;
+ margin: 0 0 0 -1px;
+ float: left;
+}
+
/*
styles used by TTH when "Default set of options to pass to tth/m
when converting TeX" in course settings has been set
@@ -8826,7 +9657,13 @@ Inputs: $title - optional title for the
3- whether the side effect should occur
(side effect of setting
$env{'internal.head.redirect'} to the url
- redirected too)
+ redirected to)
+ 4- whether the redirect target should be
+ the opener of the current (pop-up)
+ window (side effect of setting
+ $env{'internal.head.to_opener'} to
+ 1, if true.
+ 5- whether encrypt check should be skipped
domain -> force to color decorate a page for a specific
domain
function -> force usage of a specific rolish color scheme
@@ -8860,7 +9697,7 @@ sub headtag {
$inhibitprint = &print_suppression();
}
- if (!$args->{'frameset'}) {
+ if (!$args->{'frameset'} && !$args->{'switchserver'}) {
$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}
if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
@@ -8868,7 +9705,8 @@ sub headtag {
}
if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}
- && !$args->{'frameset'}) {
+ && !$args->{'frameset'}
+ && !$args->{'switchserver'}) {
$result .= &help_menu_js($httphost);
$result.=&modal_window();
$result.=&togglebox_script();
@@ -8889,15 +9727,45 @@ sub headtag {
}
}
if (ref($args->{'redirect'})) {
- my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
- $url = &Apache::lonenc::check_encrypt($url);
+ my ($time,$url,$inhibit_continue,$to_opener,$skip_enc_check) = @{$args->{'redirect'}};
+ if (!$skip_enc_check) {
+ $url = &Apache::lonenc::check_encrypt($url);
+ }
if (!$inhibit_continue) {
$env{'internal.head.redirect'} = $url;
}
- $result.=<<ADDMETA
+ $result.=<<"ADDMETA";
<meta http-equiv="pragma" content="no-cache" />
+ADDMETA
+ if ($to_opener) {
+ $env{'internal.head.to_opener'} = 1;
+ my $dest = &js_escape($url);
+ my $timeout = int($time * 1000);
+ $result .=<<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+function LC_To_Opener() {
+ var dest = '$dest';
+ if (dest != '') {
+ if (window.opener != null && !window.opener.closed) {
+ window.opener.location.href=dest;
+ window.close();
+ } else {
+ window.location.href=dest;
+ }
+ }
+}
+\$(document).ready(function () {
+ setTimeout('LC_To_Opener()',$timeout);
+});
+// ]]>
+</script>
+ENDJS
+ } else {
+ $result.=<<"ADDMETA";
<meta http-equiv="Refresh" content="$time; url=$url" />
ADDMETA
+ }
} else {
unless (($args->{'frameset'}) || ($args->{'js_ready'}) || ($args->{'only_body'}) || ($args->{'no_nav_bar'})) {
my $requrl = $env{'request.uri'};
@@ -9034,8 +9902,12 @@ OFFLOAD
$title = 'The LearningOnline Network with CAPA';
}
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
- $result .= '<title> LON-CAPA '.$title.'</title>'
- .'<link rel="stylesheet" type="text/css" href="'.$url.'"';
+ if ($title =~ /^LON-CAPA\s+/) {
+ $result .= '<title> '.$title.'</title>';
+ } else {
+ $result .= '<title> LON-CAPA '.$title.'</title>';
+ }
+ $result .= "\n".'<link rel="stylesheet" type="text/css" href="'.$url.'"';
if (!$args->{'frameset'}) {
$result .= ' /';
}
@@ -9050,10 +9922,14 @@ OFFLOAD
}
if ($clientmobile) {
$result .= '
-<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes" />';
}
- $result .= '<meta name="google" content="notranslate" />'."\n";
+ $result .= '<meta name="google" content="notranslate"';
+ if (!$args->{'frameset'}) {
+ $result .= ' /';
+ }
+ $result .= '>'."\n";
return $result.'</head>';
}
@@ -9184,7 +10060,7 @@ sub xml_begin {
.'xmlns="http://www.w3.org/1999/xhtml">';
} elsif ($is_frameset) {
$output='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'."\n".
- '<html>'."\n";
+ '<html lang="en">'."\n";
} else {
$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n".
'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n";
@@ -9234,6 +10110,11 @@ $args - additional optional args support
no_auto_mt_title -> prevent &mt()ing the title arg
bread_crumbs -> Array containing breadcrumbs
bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs
+ bread_crumbs_style -> breadcrumbs are contained within <div id="LC_breadcrumbs">,
+ and &standard_css() contains CSS for #LC_breadcrumbs, if you want
+ to override those values, or add to them, specify the value to
+ include in the style attribute to include in the div tag by using
+ bread_crumbs_style (e.g., overflow: visible)
bread_crumbs_nomenu -> if true will pass false as the value of $menulink
to lonhtmlcommon::breadcrumbs
group -> includes the current group, if page is for a
@@ -9334,6 +10215,7 @@ sub start_page {
}
}
+ my $showncrumbs;
if (! exists($args->{'skip_phases'}{'body'}) ) {
if ($args->{'frameset'}) {
my $attr_string = &make_attr_string($args->{'force_register'},
@@ -9346,7 +10228,8 @@ sub start_page {
$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'no_nav_bar'},
$args->{'bgcolor'}, $args,
- \@advtools,$ltiscope,$ltiuri,\%ltimenu,$menucoll,\%menu);
+ \@advtools,$ltiscope,$ltiuri,\%ltimenu,$menucoll,
+ \%menu,\$showncrumbs);
}
}
@@ -9368,6 +10251,7 @@ sub start_page {
#Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+ unless ($showncrumbs) {
&Apache::lonhtmlcommon::clear_breadcrumbs();
#if any br links exists, add them to the breadcrumbs
if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
@@ -9390,12 +10274,23 @@ sub start_page {
} else {
undef($menulink);
}
+ my $linkprotout;
+ if ($env{'request.deeplink.login'}) {
+ my $linkprotout = &Apache::lonmenu::linkprot_exit();
+ if ($linkprotout) {
+ &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
+ }
+ }
#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
if(exists($args->{'bread_crumbs_component'})){
- $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'},'',$menulink);
+ $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'},
+ '',$menulink,'',
+ $args->{'bread_crumbs_style'});
} else {
- $result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink);
+ $result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink,'',
+ $args->{'bread_crumbs_style'});
}
+ }
}
return $result;
}
@@ -9529,6 +10424,50 @@ sub symb_from_tinyurl {
}
}
+sub usable_exttools {
+ my %tooltypes;
+ if ($env{'request.course.id'}) {
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'}) {
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'both') {
+ %tooltypes = (
+ crs => 1,
+ dom => 1,
+ );
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'crs') {
+ $tooltypes{'crs'} = 1;
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'dom') {
+ $tooltypes{'dom'} = 1;
+ }
+ } else {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $crstype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+ if ($crstype eq '') {
+ $crstype = 'course';
+ }
+ if ($crstype eq 'course') {
+ if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'}) {
+ $crstype = 'official';
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.textbook'}) {
+ $crstype = 'textbook';
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.lti'}) {
+ $crstype = 'lti';
+ } else {
+ $crstype = 'unofficial';
+ }
+ }
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ if ($domdefaults{$crstype.'domexttool'}) {
+ $tooltypes{'dom'} = 1;
+ }
+ if ($domdefaults{$crstype.'exttool'}) {
+ $tooltypes{'crs'} = 1;
+ }
+ }
+ }
+ return %tooltypes;
+}
+
sub wishlist_window {
return(<<'ENDWISHLIST');
<script type="text/javascript">
@@ -10034,8 +10973,10 @@ sub simple_error_page {
}
my $page =
- &Apache::loncommon::start_page($title,'',\%displayargs).
+ &Apache::loncommon::start_page($title,'',\%displayargs)."\n".
+ '<div class="LC_landmark" style="clear:both" role="main">'.
'<p class="LC_error">'.$msg.'</p>'.
+ '</div>'.
&Apache::loncommon::end_page();
if (ref($r)) {
$r->print($page);
@@ -10057,6 +10998,11 @@ sub simple_error_page {
return;
}
+ sub set_data_table_count {
+ my ($count) = @_;
+ unshift(@row_count,$count);
+ }
+
sub start_data_table {
my ($add_class,$id) = @_;
my $css_class = (join(' ','LC_data_table',$add_class));
@@ -10104,7 +11050,11 @@ sub simple_error_page {
}
sub start_data_table_header_row {
- return '<tr class="LC_header_row">'."\n";;
+ my ($add_class,$id) = @_;
+ my $css_class = 'LC_header_row';
+ $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
+ $id = (' id="'.$id.'"') unless ($id eq '');
+ return '<tr class="'.$css_class.'"'.$id.'>'."\n";
}
sub end_data_table_header_row {
@@ -10112,8 +11062,8 @@ sub simple_error_page {
}
sub data_table_caption {
- my $caption = shift;
- return "<caption class=\"LC_caption\">$caption</caption>";
+ my ($caption,$css_class) = @_;
+ return "<caption class=\"LC_caption $css_class\">$caption</caption>";
}
}
@@ -10217,6 +11167,16 @@ Scalar: 1 if 'Course' to be used, 0 othe
###############################################
sub show_course {
+ my ($udom,$uname) = @_;
+ if (($udom ne '') && ($uname ne '')) {
+ if (($udom ne $env{'user.domain'}) || ($uname ne $env{'user.name'})) {
+ if (&Apache::lonnet::is_advanced_user($udom,$uname)) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+ }
my $course = !$env{'user.adv'};
if (!$env{'user.adv'}) {
foreach my $env (keys(%env)) {
@@ -14191,7 +15151,9 @@ sub process_extracted_files {
my $url = '/uploaded/'.$docudom.'/'.$docuname.'/'.
$docstype.'/'.$mapinner{$outer}.'/'.$newidx.'/'.
$title;
- if (($outer !~ /\D/) && ($mapinner{$outer} !~ /\D/) && ($newidx !~ /\D/)) {
+ if (($outer !~ /\D/) &&
+ (($mapinner{$outer} eq 'default') || ($mapinner{$outer} !~ /\D/)) &&
+ ($newidx !~ /\D/)) {
if (!-e "$prefix$dir/$docstype/$mapinner{$outer}") {
mkdir("$prefix$dir/$docstype/$mapinner{$outer}",0755);
}
@@ -14771,12 +15733,12 @@ sub upfile_select_html {
tab => &mt('Tabulator separated'),
# xml => &mt('HTML/XML'),
);
- my $Str = '<input type="file" name="upfile" size="50" />'.
- '<br />'.&mt('Type').': <select name="upfiletype">';
+ my $Str = '<input type="file" name="upfile" id="upfile" size="50" />'.
+ '<br /><label>'.&mt('Type').': <select name="upfiletype">';
foreach my $type (sort(keys(%Types))) {
$Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
}
- $Str .= "</select>\n";
+ $Str .= "</select></label>\n";
return $Str;
}
@@ -14860,9 +15822,9 @@ sub csv_print_select_table {
&end_data_table_header_row()."\n");
foreach my $array_ref (@$d) {
my ($value,$display,$defaultcol)=@{ $array_ref };
- $r->print(&start_data_table_row().'<td>'.$display.'</td>');
+ $r->print(&start_data_table_row().'<td><label for="f'.$i.'">'.$display.'</label></td>');
- $r->print('<td><select name="f'.$i.'"'.
+ $r->print('<td><select name="f'.$i.'" id="f'.$i.'"'.
' onchange="javascript:flip(this.form,'.$i.');">');
$r->print('<option value="none"></option>');
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
@@ -14907,8 +15869,10 @@ sub csv_samples_select_table {
&end_data_table_header_row());
foreach my $key (sort(keys(%{ $samples->[0] }))) {
+ my $num = $i+1;
+ my $labeltext = &HTML::Entities::encode(&mt('Field for data in column [_1]',$num));
$r->print(&start_data_table_row().'<td><select name="f'.$i.'"'.
- ' onchange="javascript:flip(this.form,'.$i.');">');
+ ' onchange="javascript:flip(this.form,'.$i.');" aria-label="'.$labeltext.'">');
foreach my $option (@$d) {
my ($value,$display,$defaultcol)=@{ $option };
$r->print('<option value="'.$value.'"'.
@@ -16246,27 +17210,33 @@ sub assign_category_rows {
sub commit_customrole {
- my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
+ my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context,$othdomby,$requester) = @_;
+ my $result = &Apache::lonnet::assigncustomrole(
+ $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,
+ $context,$othdomby,$requester);
my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').
- ($end?', ending '.localtime($end):'').': <b>'.
- &Apache::lonnet::assigncustomrole(
- $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context).
- '</b><br />';
- return $output;
+ ($end?', ending '.localtime($end):'').': <b>'.$result.'</b><br />';
+ if (wantarray) {
+ return ($output,$result);
+ } else {
+ return $output;
+ }
}
sub commit_standardrole {
- my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits) = @_;
- my ($output,$logmsg,$linefeed);
+ my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits,
+ $othdomby,$requester) = @_;
+ my ($output,$logmsg,$linefeed,$result);
if ($context eq 'auto') {
$linefeed = "\n";
} else {
$linefeed = "<br />\n";
}
if ($three eq 'st') {
- my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
- $one,$two,$sec,$context,$credits);
+ $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
+ $one,$two,$sec,$context,$credits,$othdomby,
+ $requester);
if (($result =~ /^error/) || ($result eq 'not_in_class') ||
($result eq 'unknown_course') || ($result eq 'refused')) {
$output = $logmsg.' '.&mt('Error: ').$result."\n";
@@ -16286,19 +17256,24 @@ sub commit_standardrole {
$output = &mt('Assigning').' '.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').
($end?', '.&mt('ending').' '.localtime($end):'').': ';
- my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start,'','',$context);
+ $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start,
+ '','',$context,$othdomby,$requester);
if ($context eq 'auto') {
$output .= $result.$linefeed;
} else {
$output .= '<b>'.$result.'</b>'.$linefeed;
}
}
- return $output;
+ if (wantarray) {
+ return ($output,$result);
+ } else {
+ return $output;
+ }
}
sub commit_studentrole {
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,
- $credits) = @_;
+ $credits,$othdomby,$requester) = @_;
my ($result,$linefeed,$oldsecurl,$newsecurl);
if ($context eq 'auto') {
$linefeed = "\n";
@@ -16322,8 +17297,9 @@ sub commit_studentrole {
}
$oldsecurl = $uurl;
$expire_role_result =
- &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,'','',$context);
- if ($env{'request.course.sec'} ne '') {
+ &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,
+ '','','',$context,$othdomby,$requester);
+ if ($env{'request.course.sec'} ne '') {
if ($expire_role_result eq 'refused') {
my @roles = ('st');
my @statuses = ('previous');
@@ -16349,7 +17325,8 @@ sub commit_studentrole {
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,
undef,undef,undef,$sec,
$end,$start,'','',$cid,
- '',$context,$credits);
+ '',$context,$credits,'',
+ $othdomby,$requester);
if ($modify_section_result =~ /^ok/) {
if ($secchange == 1) {
if ($sec eq '') {
@@ -16742,6 +17719,7 @@ sub construct_course {
$cenv{'internal.defaultcredits'} = $args->{'defaultcredits'};
}
my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
+ my @oklcsecs = (); # Used to accumulate LON-CAPA sections for validated institutional sections.
if ($args->{'crssections'}) {
$cenv{'internal.sectionnums'} = '';
if ($args->{'crssections'} =~ m/,/) {
@@ -16755,7 +17733,11 @@ sub construct_course {
my $class = $args->{'crscode'}.$sec;
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
$cenv{'internal.sectionnums'} .= $item.',';
- unless ($addcheck eq 'ok') {
+ if ($addcheck eq 'ok') {
+ unless (grep(/^\Q$gp\E$/,@oklcsecs)) {
+ push(@oklcsecs,$gp);
+ }
+ } else {
push(@badclasses,$class);
}
}
@@ -16783,7 +17765,11 @@ sub construct_course {
my ($xl,$gp) = split/:/,$item;
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
$cenv{'internal.crosslistings'} .= $item.',';
- unless ($addcheck eq 'ok') {
+ if ($addcheck eq 'ok') {
+ unless (grep(/^\Q$gp\E$/,@oklcsecs)) {
+ push(@oklcsecs,$gp);
+ }
+ } else {
push(@badclasses,$xl);
}
}
@@ -16846,6 +17832,36 @@ sub construct_course {
if ($args->{'no_end_date'}) {
$args->{'endaccess'} = 0;
}
+# If an official course with institutional sections is created by cloning
+# an existing course, section-specific hiding of course totals in student's
+# view of grades as copied from cloned course, will be checked for valid
+# sections.
+ if (($can_clone && $cloneid) &&
+ ($cenv{'internal.coursecode'} ne '') &&
+ ($cenv{'grading'} eq 'standard') &&
+ ($cenv{'hidetotals'} ne '') &&
+ ($cenv{'hidetotals'} ne 'all')) {
+ my @hidesecs;
+ my $deletehidetotals;
+ if (@oklcsecs) {
+ foreach my $sec (split(/,/,$cenv{'hidetotals'})) {
+ if (grep(/^\Q$sec$/,@oklcsecs)) {
+ push(@hidesecs,$sec);
+ }
+ }
+ if (@hidesecs) {
+ $cenv{'hidetotals'} = join(',',@hidesecs);
+ } else {
+ $deletehidetotals = 1;
+ }
+ } else {
+ $deletehidetotals = 1;
+ }
+ if ($deletehidetotals) {
+ delete($cenv{'hidetotals'});
+ &Apache::lonnet::del('environment',['hidetotals'],$$crsudom,$$crsunum);
+ }
+ }
$cenv{'internal.autostart'}=$args->{'enrollstart'};
$cenv{'internal.autoend'}=$args->{'enrollend'};
$cenv{'default_enrollment_start_date'}=$args->{'startaccess'};
@@ -16964,7 +17980,6 @@ sub construct_course {
#
unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
|| ($cloneid)) {
- use LONCAPA::map;
$outcome .= &mt('Setting first resource').': ';
my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence';
@@ -17207,7 +18222,8 @@ sub init_user_environment {
my $public=($username eq 'public' && $domain eq 'public');
- my ($filename,$cookie,$userroles,$firstaccenv,$timerintenv);
+ my ($filename,$cookie,$userroles,$firstaccenv,$timerintenv,
+ $coauthorenv);
my $now=time;
if ($public) {
@@ -17273,7 +18289,7 @@ sub init_user_environment {
# Initialize roles
- ($userroles,$firstaccenv,$timerintenv) =
+ ($userroles,$firstaccenv,$timerintenv,$coauthorenv) =
&Apache::lonnet::rolesinit($domain,$username,$authhost);
}
# ------------------------------------ Check browser type and MathML capability
@@ -17351,8 +18367,8 @@ sub init_user_environment {
my %is_adv = ( is_adv => $env{'user.adv'} );
my %domdef = &Apache::lonnet::get_domain_defaults($domain);
- foreach my $tool ('aboutme','blog','webdav','portfolio') {
- $userenv{'availabletools.'.$tool} =
+ foreach my $tool ('aboutme','blog','webdav','portfolio','portaccess','timezone') {
+ $userenv{'availabletools.'.$tool} =
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
undef,\%userenv,\%domdef,\%is_adv);
}
@@ -17364,6 +18380,23 @@ sub init_user_environment {
\%userenv,\%domdef,\%is_adv);
}
+ if ((ref($userroles) eq 'HASH') && ($userroles->{'user.author'}) &&
+ (exists($userroles->{"user.role.au./$domain/"}))) {
+ if ($userenv{'authoreditors'}) {
+ $userenv{'editors'} = $userenv{'authoreditors'};
+ } elsif ($domdef{'editors'} ne '') {
+ $userenv{'editors'} = $domdef{'editors'};
+ } else {
+ $userenv{'editors'} = 'edit,xml';
+ }
+ if ($userenv{'authorarchive'}) {
+ $userenv{'canarchive'} = 1;
+ } elsif (($userenv{'authorarchive'} eq '') &&
+ ($domdef{'archive'})) {
+ $userenv{'canarchive'} = 1;
+ }
+ }
+
$userenv{'canrequest.author'} =
&Apache::lonnet::usertools_access($username,$domain,'requestauthor',
'reload','requestauthor',
@@ -17420,6 +18453,11 @@ sub init_user_environment {
if (ref($timerintenv) eq 'HASH') {
&_add_to_env(\%disk_env,$timerintenv);
}
+ if (ref($coauthorenv) eq 'HASH') {
+ if (keys(%{$coauthorenv})) {
+ &_add_to_env(\%disk_env,$coauthorenv);
+ }
+ }
if (ref($args->{'extra_env'})) {
&_add_to_env(\%disk_env,$args->{'extra_env'});
}
@@ -18145,7 +19183,7 @@ Returns: HTML to display with informatio
sub check_release_result {
my ($switchwarning,$switchserver) = @_;
my $output = &start_page('Selected course unavailable on this server').
- '<p class="LC_warning">';
+ '<div class="LC_landmark" role="main"><p class="LC_warning">';
if ($switchwarning) {
$output .= $switchwarning.'<br /><a href="/adm/roles">';
if (&show_course()) {
@@ -18161,7 +19199,7 @@ sub check_release_result {
&mt('Switch Server').
'</a>';
}
- $output .= '</p>'.&end_page();
+ $output .= '</p></div>'.&end_page();
return $output;
}
@@ -18224,30 +19262,54 @@ sub needs_coursereinit {
if ($blocked) {
return ();
}
- my $lastchange = &Apache::lonnet::get_coursechange($cdom,$cnum);
- if ($lastchange > $env{'request.course.tied'}) {
- my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
- if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
- my $required = $env{'course.'.$cdom.'_'.$cnum.'.internal.releaserequired'};
- if ($curr_reqd_hash{'internal.releaserequired'} ne $required) {
- &Apache::lonnet::appenv({'course.'.$cdom.'_'.$cnum.'.internal.releaserequired' =>
- $curr_reqd_hash{'internal.releaserequired'}});
- my ($switchserver,$switchwarning) =
- &check_release_required($loncaparev,$cdom.'_'.$cnum,$env{'request.role'},
- $curr_reqd_hash{'internal.releaserequired'});
- if ($switchwarning ne '' || $switchserver ne '') {
- return ('switch',$switchwarning,$switchserver);
- }
+ my $update;
+ my $lastmainchange = &Apache::lonnet::get_coursechange($cdom,$cnum);
+ my $lastsuppchange = &Apache::lonnet::get_suppchange($cdom,$cnum);
+ if ($lastmainchange > $env{'request.course.tied'}) {
+ my ($needswitch,$switchwarning,$switchserver) = &switch_for_update($loncaparev,$cdom,$cnum);
+ if ($needswitch) {
+ return ('switch',$switchwarning,$switchserver);
+ }
+ $update = 'main';
+ }
+ if ($lastsuppchange > $env{'request.course.suppupdated'}) {
+ if ($update) {
+ $update = 'both';
+ } else {
+ my ($needswitch,$switchwarning,$switchserver) = &switch_for_update($loncaparev,$cdom,$cnum);
+ if ($needswitch) {
+ return ('switch',$switchwarning,$switchserver);
+ } else {
+ $update = 'supp';
}
}
- return ('update');
+ }
+ return ($update);
+ }
+ return ();
+}
+
+sub switch_for_update {
+ my ($loncaparev,$cdom,$cnum) = @_;
+ my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+ if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
+ my $required = $env{'course.'.$cdom.'_'.$cnum.'.internal.releaserequired'};
+ if ($curr_reqd_hash{'internal.releaserequired'} ne $required) {
+ &Apache::lonnet::appenv({'course.'.$cdom.'_'.$cnum.'.internal.releaserequired' =>
+ $curr_reqd_hash{'internal.releaserequired'}});
+ my ($switchserver,$switchwarning) =
+ &check_release_required($loncaparev,$cdom.'_'.$cnum,$env{'request.role'},
+ $curr_reqd_hash{'internal.releaserequired'});
+ if ($switchwarning ne '' || $switchserver ne '') {
+ return ('switch',$switchwarning,$switchserver);
+ }
}
}
return ();
}
sub update_content_constraints {
- my ($cdom,$cnum,$chome,$cid,$keeporder) = @_;
+ my ($cdom,$cnum,$chome,$cid) = @_;
my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});
my (%checkresponsetypes,%checkcrsrestypes);
@@ -18295,25 +19357,7 @@ sub update_content_constraints {
}
undef($navmap);
}
- my (@resources,@order,@resparms,@zombies);
- if ($keeporder) {
- use LONCAPA::map;
- @resources = @LONCAPA::map::resources;
- @order = @LONCAPA::map::order;
- @resparms = @LONCAPA::map::resparms;
- @zombies = @LONCAPA::map::zombies;
- }
- my $suppmap = 'supplemental.sequence';
- my ($suppcount,$supptools,$errors) = (0,0,0);
- ($suppcount,$supptools,$errors) = &recurse_supplemental($cnum,$cdom,$suppmap,
- $suppcount,$supptools,$errors);
- if ($keeporder) {
- @LONCAPA::map::resources = @resources;
- @LONCAPA::map::order = @order;
- @LONCAPA::map::resparms = @resparms;
- @LONCAPA::map::zombies = @zombies;
- }
- if ($supptools) {
+ if (&Apache::lonnet::count_supptools($cnum,$cdom,1)) {
my ($major,$minor) = split(/\./,$checkcrsrestypes{'exttool'});
if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) {
($reqdmajor,$reqdminor) = ($major,$minor);
@@ -18339,7 +19383,7 @@ sub allmaps_incourse {
if ($lastchange > $env{'request.course.tied'}) {
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
unless ($ferr) {
- &update_content_constraints($cdom,$cnum,$chome,$cid,1);
+ &update_content_constraints($cdom,$cnum,$chome,$cid);
}
}
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -18365,8 +19409,10 @@ sub parse_supplemental_title {
my $name = &plainname($uname,$udom);
$name = &HTML::Entities::encode($name,'"<>&\'');
$renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
- $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
- $name.': <br />'.$foldertitle;
+ $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.$name;
+ if ($foldertitle ne '') {
+ $title .= ': <br />'.$foldertitle;
+ }
}
if (wantarray) {
return ($title,$foldertitle,$renametitle);
@@ -18374,32 +19420,147 @@ sub parse_supplemental_title {
return $title;
}
+sub get_supplemental {
+ my ($cnum,$cdom,$ignorecache,$possdel)=@_;
+ my $hashid=$cnum.':'.$cdom;
+ my ($supplemental,$cached,$set_httprefs);
+ unless ($ignorecache) {
+ ($supplemental,$cached) = &Apache::lonnet::is_cached_new('supplemental',$hashid);
+ }
+ unless (defined($cached)) {
+ my $chome=&Apache::lonnet::homeserver($cnum,$cdom);
+ unless ($chome eq 'no_host') {
+ my @order = @LONCAPA::map::order;
+ my @resources = @LONCAPA::map::resources;
+ my @resparms = @LONCAPA::map::resparms;
+ my @zombies = @LONCAPA::map::zombies;
+ my ($errors,%ids,%hidden);
+ $errors =
+ &recurse_supplemental($cnum,$cdom,'supplemental.sequence',
+ $errors,$possdel,\%ids,\%hidden);
+ @LONCAPA::map::order = @order;
+ @LONCAPA::map::resources = @resources;
+ @LONCAPA::map::resparms = @resparms;
+ @LONCAPA::map::zombies = @zombies;
+ $set_httprefs = 1;
+ if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+ &Apache::lonnet::appenv({'request.course.suppupdated' => time});
+ }
+ $supplemental = {
+ ids => \%ids,
+ hidden => \%hidden,
+ };
+ &Apache::lonnet::do_cache_new('supplemental',$hashid,$supplemental,600);
+ }
+ }
+ return ($supplemental,$set_httprefs);
+}
+
sub recurse_supplemental {
- my ($cnum,$cdom,$suppmap,$numfiles,$numexttools,$errors) = @_;
- if ($suppmap) {
+ my ($cnum,$cdom,$suppmap,$errors,$possdel,$suppids,$hiddensupp,$hidden) = @_;
+ if (($suppmap) && (ref($suppids) eq 'HASH') && (ref($hiddensupp) eq 'HASH')) {
+ my $mapnum;
+ if ($suppmap eq 'supplemental.sequence') {
+ $mapnum = 0;
+ } else {
+ ($mapnum) = ($suppmap =~ /^supplemental_(\d+)\.sequence$/);
+ }
my ($errtext,$fatal) = &LONCAPA::map::mapread('/uploaded/'.$cdom.'/'.$cnum.'/'.$suppmap);
if ($fatal) {
$errors ++;
} else {
- if ($#LONCAPA::map::resources > 0) {
- foreach my $res (@LONCAPA::map::resources) {
- my ($title,$src,$ext,$type,$status)=split(/\:/,$res);
+ my @order = @LONCAPA::map::order;
+ if (@order > 0) {
+ my @resources = @LONCAPA::map::resources;
+ my @resparms = @LONCAPA::map::resparms;
+ foreach my $idx (@order) {
+ my ($title,$src,$ext,$type,$status)=split(/\:/,$resources[$idx]);
if (($src ne '') && ($status eq 'res')) {
+ my $id = $mapnum.':'.$idx;
+ push(@{$suppids->{$src}},$id);
+ if (($hidden) || (&get_supp_parameter($resparms[$idx],'parameter_hiddenresource') =~ /^yes/i)) {
+ $hiddensupp->{$id} = 1;
+ }
if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
- ($numfiles,$numexttools,$errors) = &recurse_supplemental($cnum,$cdom,$1,
- $numfiles,$numexttools,$errors);
+ $errors = &recurse_supplemental($cnum,$cdom,$1,$errors,$possdel,$suppids,
+ $hiddensupp,$hiddensupp->{$id});
} else {
- if ($src =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
- $numexttools ++;
+ my $allowed;
+ if (($env{'request.role.adv'}) || (!$hiddensupp->{$id})) {
+ $allowed = 1;
+ } elsif ($possdel) {
+ foreach my $item (@{$suppids->{$src}}) {
+ next if ($item eq $id);
+ unless ($hiddensupp->{$item}) {
+ $allowed = 1;
+ last;
+ }
+ }
+ if ((!$allowed) && (exists($env{'httpref.'.$src}))) {
+ &Apache::lonnet::delenv('httpref.'.$src);
+ }
+ }
+ if ($allowed && (!exists($env{'httpref.'.$src}))) {
+ &Apache::lonnet::allowuploaded('/adm/coursedoc',$src);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return $errors;
+}
+
+sub set_supp_httprefs {
+ my ($cnum,$cdom,$supplemental,$possdel) = @_;
+ if (ref($supplemental) eq 'HASH') {
+ if ((ref($supplemental->{'ids'}) eq 'HASH') && (ref($supplemental->{'hidden'}) eq 'HASH')) {
+ foreach my $src (keys(%{$supplemental->{'ids'}})) {
+ next if ($src =~ /\.sequence$/);
+ if (ref($supplemental->{'ids'}->{$src}) eq 'ARRAY') {
+ my $allowed;
+ if ($env{'request.role.adv'}) {
+ $allowed = 1;
+ } else {
+ foreach my $id (@{$supplemental->{'ids'}->{$src}}) {
+ unless ($supplemental->{'hidden'}->{$id}) {
+ $allowed = 1;
+ last;
}
- $numfiles ++;
}
}
+ if (exists($env{'httpref.'.$src})) {
+ if ($possdel) {
+ unless ($allowed) {
+ &Apache::lonnet::delenv('httpref.'.$src);
+ }
+ }
+ } elsif ($allowed) {
+ &Apache::lonnet::allowuploaded('/adm/coursedoc',$src);
+ }
}
}
+ if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+ &Apache::lonnet::appenv({'request.course.suppupdated' => time});
+ }
}
}
- return ($numfiles,$numexttools,$errors);
+}
+
+sub get_supp_parameter {
+ my ($resparm,$name)=@_;
+ return if ($resparm eq '');
+ my $value=undef;
+ my $ptype=undef;
+ foreach (split('&&&',$resparm)) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname eq $name) {
+ $value=$thisvalue;
+ $ptype=$thistype;
+ }
+ }
+ return $value;
}
sub symb_to_docspath {
@@ -18472,6 +19633,67 @@ sub symb_to_docspath {
return $path;
}
+sub validate_folderpath {
+ my ($supplementalflag,$allowed,$coursenum,$coursedom) = @_;
+ if ($env{'form.folderpath'} ne '') {
+ my @items = split(/\&/,$env{'form.folderpath'});
+ my ($badpath,$changed,$got_supp,$supppath,%supphidden,%suppids);
+ for (my $i=0; $i<@items; $i++) {
+ my $odd = $i%2;
+ if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) {
+ $badpath = 1;
+ } elsif ($odd && $supplementalflag) {
+ my $idx = $i-1;
+ if ($items[$i] =~ /^([^:]*)::(|1):::$/) {
+ my $esc_name = $1;
+ if ((!$allowed) || ($items[$idx] eq 'supplemental')) {
+ $supppath .= '&'.$esc_name;
+ $changed = 1;
+ } else {
+ $supppath .= '&'.$items[$i];
+ }
+ } elsif (($allowed) && ($items[$idx] ne 'supplemental')) {
+ $changed = 1;
+ my $is_hidden;
+ unless ($got_supp) {
+ my ($supplemental) = &get_supplemental($coursenum,$coursedom);
+ if (ref($supplemental) eq 'HASH') {
+ if (ref($supplemental->{'hidden'}) eq 'HASH') {
+ %supphidden = %{$supplemental->{'hidden'}};
+ }
+ if (ref($supplemental->{'ids'}) eq 'HASH') {
+ %suppids = %{$supplemental->{'ids'}};
+ }
+ }
+ $got_supp = 1;
+ }
+ if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') {
+ my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0];
+ if ($supphidden{$mapid}) {
+ $is_hidden = 1;
+ }
+ }
+ $supppath .= '&'.$items[$i].'::'.$is_hidden.':::';
+ } else {
+ $supppath .= '&'.$items[$i];
+ }
+ } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) {
+ $badpath = 1;
+ } elsif ($supplementalflag) {
+ $supppath .= '&'.$items[$i];
+ }
+ last if ($badpath);
+ }
+ if ($badpath) {
+ delete($env{'form.folderpath'});
+ } elsif ($changed && $supplementalflag) {
+ $supppath =~ s/^\&//;
+ $env{'form.folderpath'} = $supppath;
+ }
+ }
+ return;
+}
+
sub captcha_display {
my ($context,$lonhost,$defdom) = @_;
my ($output,$error);
@@ -18593,9 +19815,9 @@ sub create_captcha {
if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') {
$output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n".
'<span class="LC_nobreak">'.
- &mt('Type in the letters/numbers shown below').' '.
- '<input type="text" size="5" name="code" value="" autocomplete="off" />'.
- '</span><br />'.
+ '<label>'.&mt('Type in the letters/numbers shown below').' '.
+ '<input type="text" size="5" name="code" value="" autocomplete="new-password" aria-required="true" />'.
+ '</label></span><br />'.
'<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" alt="captcha" />';
last;
}