--- loncom/interface/lonextresedit.pm 2023/07/11 23:17:40 1.8.2.4.4.3 +++ loncom/interface/lonextresedit.pm 2022/09/09 14:24:30 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: lonextresedit.pm,v 1.8.2.4.4.3 2023/07/11 23:17:40 raeburn Exp $ +# $Id: lonextresedit.pm,v 1.30 2022/09/09 14:24:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -98,18 +98,7 @@ sub handler { } my %ltitools; if ($type eq 'tool') { - my (%domtools,%crstools); - my %tooltypes = &Apache::loncommon::usable_exttools(); - if ($tooltypes{'dom'}) { - %domtools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); - } - if ($tooltypes{'crs'}) { - %crstools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); - } - %ltitools = ( - dom => \%domtools, - crs => \%crstools, - ); + %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); } my $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript()); my $pathitem = ''; } $formname = 'edit'.$type.'_'.$residx; - $fieldsetid = 'upload'.$type.$residx; + $fieldsetid = 'external'.$type.$residx; $urlid = $type.'url_'.$residx; map { $toolattr{$_} .= '_'.$residx; } (keys(%toolattr)); $srcclass = ' class="LC_nobreak"'; @@ -474,7 +458,7 @@ sub extedit_form { if ($type eq 'tool') { $link = $lt{'et'}; } - $link = ''.$link.''.$helpitem; + $link = ''.$link.''.$helpitem; if ($type eq 'tool') { $legend = $lt{'te'}; } else { @@ -506,157 +490,95 @@ sub extedit_form { if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) { my $marker = $1; my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum); - my ($tooltype,$tool,$ltihash); - if ($toolhash{'id'} =~/^c(\d+)$/) { - $tool = $1; - $tooltype = 'crs'; - if (ref($ltitools) eq 'HASH') { - if (ref($ltitools->{'crs'}) eq 'HASH') { - $ltihash = $ltitools->{'crs'}->{$tool}; - } - } - } elsif ($toolhash{'id'} =~/^\d+$/) { - $tooltype = 'dom'; - $tool = $toolhash{'id'}; + if ($toolhash{'id'}) { if (ref($ltitools) eq 'HASH') { - if (ref($ltitools->{'dom'}) eq 'HASH') { - $ltihash = $ltitools->{'dom'}->{$tool}; - } - } - } - if (($tool ne '') && (ref($ltihash) eq 'HASH')) { - my $tooltitle = $ltihash->{'title'}; - my $icon = $ltihash->{'image'}; - my $image; - if ($icon) { - $image = ''.$tooltitle.''; - } - if ($ltihash->{'url'} =~ m{://}) { - (my $prot,my $host,$providerurl) = ($ltihash->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$}); - } else { - $providerurl = $ltihash->{'url'}; - } - $tooltarget = $toolhash{'target'}; - if ($tooltarget eq 'window') { - $dimendivstyle = 'display:block'; - $windivstyle = 'display:block'; - $chkstate{'window'} = 'checked="checked" '; - } elsif ($tooltarget eq 'tab') { - $windivstyle = 'display:block'; - $chkstate{'tab'} = 'checked="checked" '; - } else { - $chkstate{'iframe'} = 'checked="checked" '; - } - $width = $toolhash{'width'}; - $height = $toolhash{'height'}; - $linktext = $toolhash{'linktext'}; - $explanation = $toolhash{'explanation'}; - if ($toolhash{'gradable'}) { - $chkgrd = ' checked="checked"'; - } else { - $chknogrd = ' checked="checked"'; - } - if (ref($ltihash->{'crsconf'}) eq 'HASH') { - if ($ltihash->{'crsconf'}->{'title'}) { - $crstitle = $toolhash{'crstitle'}; - $titlestyle = 'display:inline'; - } - if ($ltihash->{'crsconf'}->{'label'}) { - $crslabel = $toolhash{'crslabel'}; - $labelstyle = 'display:inline'; - } - if ($ltihash->{'crsconf'}->{'append'}) { - $crsappend = $toolhash{'crsappend'}; - $appendstyle = 'display:inline'; - } - if ($ltihash->{'crsconf'}->{'target'}) { - $dispdivstyle = 'display:block'; - } - if ($ltihash->{'crsconf'}->{'linktext'}) { - $linktextstyle = 'padding:0;display:inline'; - } - if ($ltihash->{'crsconf'}->{'explanation'}) { - $explanationstyle = 'padding:0;display:inline'; + if (keys(%{$ltitools})) { + if (ref($ltitools->{$toolhash{'id'}}) eq 'HASH') { + my $tooltitle = $ltitools->{$toolhash{'id'}}->{'title'}; + my $icon = $ltitools->{$toolhash{'id'}}->{'image'}; + my $image; + if ($icon) { + $image = ''.$tooltitle.''; + } + if ($ltitools->{$toolhash{'id'}}->{'url'} =~ m{://}) { + (my $prot,my $host,$providerurl) = ($ltitools->{$toolhash{'id'}}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$}); + } else { + $providerurl = $ltitools->{$toolhash{'id'}}->{'url'}; + } + $tooltarget = $toolhash{'target'}; + if ($tooltarget eq 'window') { + $dimendivstyle = 'display:block'; + $windivstyle = 'display:block'; + $chkstate{'window'} = 'checked="checked" '; + } elsif ($tooltarget eq 'tab') { + $windivstyle = 'display:block'; + $chkstate{'tab'} = 'checked="checked" '; + } else { + $chkstate{'iframe'} = 'checked="checked" '; + } + $width = $toolhash{'width'}; + $height = $toolhash{'height'}; + $linktext = $toolhash{'linktext'}; + $explanation = $toolhash{'explanation'}; + if ($toolhash{'gradable'}) { + $chkgrd = ' checked="checked"'; + } else { + $chknogrd = ' checked="checked"'; + } + if (ref($ltitools->{$toolhash{'id'}}->{'crsconf'}) eq 'HASH') { + if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'title'}) { + $crstitle = $toolhash{'crstitle'}; + $titlestyle = 'display:inline'; + } + if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'label'}) { + $crslabel = $toolhash{'crslabel'}; + $labelstyle = 'display:inline'; + } + if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'append'}) { + $crsappend = $toolhash{'crsappend'}; + $appendstyle = 'display:inline'; + } + if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'target'}) { + $dispdivstyle = 'display:block'; + } + if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'linktext'}) { + $linktextstyle = 'padding:0;display:inline'; + } + if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'explanation'}) { + $explanationstyle = 'padding:0;display:inline'; + } + } + $toolelem = ''.$image.' '.$tooltitle.'
'; + $gradablestyle = 'display:inline'; + } } } - $toolelem = ''.$image.' '.$tooltitle.'
'; - $gradablestyle = 'display:inline'; } } } else { - $subdivstyle = 'display:none'; - my $toolradio = 'exttooltype'; - my $exttypeon = 'LC_exttoolon'; - my $exttypeoff = 'LC_exttooloff'; - my $exttypeonsty = 'display:none'; - my $exttypeoffsty = 'display:none'; - my $exttypeofftext; - if ($supplementalflag) { - $toolradio = 'suppexttooltype'; - $exttypeon = 'LC_exttoolonsupp'; - $exttypeoff = 'LC_exttooloffsupp'; - } - my ($numcrstools,$numdomtools,$typeclick,%defcheck,%typedesc); - %typedesc = ( - crs => 'Defined in course', - dom => 'Defined in domain', - ); -#FIXME need crstype - my $seloptions; - $subdivid = 'LC_addtool'; - if ($supplementalflag) { - $subdivid = 'LC_addtoolsupp'; - } + $toolelem = ''."\n". + ''.$typedesc{$type}.' '."\n"; - } - $toolelem .= '
'. - '
'."\n". - '
'. - $exttypeofftext. - '
'."\n"; + $toolelem .= '
'; $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'}; $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'}; $crsappend = ''; @@ -718,17 +640,13 @@ $preview "; } - my $idattr; - unless ($subdivid eq '') { - $idattr = 'id="'.$subdivid.'"'; - } $form = <
$legend $active $chooser -
+
$title @@ -748,35 +666,6 @@ ENDFORM } } -sub ordered_tooloptions { - my ($toolsref) = @_; - my ($seloptions,@ids,@titles); - if (ref($toolsref) eq 'HASH') { - my %bynum; - foreach my $id (keys(%{$toolsref})) { - if (ref($toolsref->{$id}) eq 'HASH') { - my $order = $toolsref->{$id}->{'order'}; - $bynum{$order} = [$id,$toolsref->{$id}]; - } - } - foreach my $item (sort { $a <=> $b } keys(%bynum)) { - if (ref($bynum{$item}) eq 'ARRAY') { - if (ref($bynum{$item}->[1]) eq 'HASH') { - my $tooltitle = $bynum{$item}->[1]->{'title'}; - push(@titles,$tooltitle); - push(@ids,$bynum{$item}->[0]); - $seloptions .= ''."\n"; - } - } - } - } - if (wantarray) { - return (\@ids,\@titles); - } else { - return $seloptions; - } -} - sub display_editor { my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum,$hostname) = @_; my ($residx,$supplementalflag,$title,$pathitem,$output,$js,$navmap); @@ -792,20 +681,9 @@ sub display_editor { my $path = &Apache::loncommon::symb_to_docspath($symb,\$navmap); $pathitem = ''; } - my (%ltitools,%tooltypes); + my %ltitools; if ($type eq 'tool') { - my (%domtools,%crstools); - %tooltypes = &Apache::loncommon::usable_exttools(); - if ($tooltypes{'dom'}) { - %domtools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); - } - if ($tooltypes{'crs'}) { - %crstools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); - } - %ltitools = ( - dom => \%domtools, - crs => \%crstools, - ); + %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); } $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript()); my $args = { 'force_register' => $env{'form.register'} }; @@ -826,99 +704,63 @@ sub display_editor { sub extedit_javascript { my ($toolsref) = @_; - my ($toolsjs,$exttoolnums,$exttooloptions); + my $toolsjs; if (ref($toolsref) eq 'HASH') { - $toolsjs = " var ltitools = new Array();\n". - " var ltitoolsUrl = new Array();\n". - " var ltitoolsTarget = new Array();\n". - " var ltitoolsWidth = new Array();\n". - " var ltitoolsHeight = new Array();\n". - " var ltitoolsLinkDef = new Array();\n". - " var ltitoolsExplainDef = new Array();\n". - " var ltitoolsDisplay = new Array();\n". - " var ltitoolsLink = new Array();\n". - " var ltitoolsExplain = new Array();\n". - " var ltitoolsLabel = new Array();\n". - " var ltitoolsTitle = new Array();\n". - " var ltitoolsAppend = new Array();\n"; - $exttoolnums = " var ltitoolsnum = new Array();\n". - " var tooloptval = new Array();\n". - " var toolopttxt = new Array();\n"; - my $idx = 0; - foreach my $type ('crs','dom') { - if (ref($toolsref->{$type}) eq 'HASH') { - my $num = scalar(keys(%{$toolsref->{$type}})); - $toolsjs .= " ltitools[$idx] = new Array($num);\n". - " ltitoolsUrl[$idx] = new Array($num);\n". - " ltitoolsTarget[$idx] = new Array($num);\n". - " ltitoolsWidth[$idx] = new Array($num);\n". - " ltitoolsHeight[$idx] = new Array($num);\n". - " ltitoolsLinkDef[$idx] = new Array($num);\n". - " ltitoolsExplainDef[$idx] = new Array($num);\n". - " ltitoolsDisplay[$idx] = new Array($num);\n". - " ltitoolsLink[$idx] = new Array($num);\n". - " ltitoolsExplain[$idx] = new Array($num);\n". - " ltitoolsLabel[$idx] = new Array($num);\n". - " ltitoolsTitle[$idx] = new Array($num);\n". - " ltitoolsAppend[$idx] = new Array($num);\n"; - my $i=0; - foreach my $key (sort { $a <=> $b } keys(%{$toolsref->{$type}})) { - if (ref($toolsref->{$type}->{$key}) eq 'HASH') { - if (ref($toolsref->{$type}->{$key}->{'display'}) eq 'HASH') { - my $target = $toolsref->{$type}->{$key}->{'display'}->{'target'}; - my $width = $toolsref->{$type}->{$key}->{'display'}->{'width'}; - my $height = $toolsref->{$type}->{$key}->{'display'}->{'height'}; - my $linkdef = $toolsref->{$type}->{$key}->{'display'}->{'linktext'}; - my $explaindef = $toolsref->{$type}->{$key}->{'display'}->{'explanation'}; - my $providerurl; - if ($toolsref->{$type}->{$key}->{'url'} =~ m{://}) { - (my $prot,my $host,$providerurl) = - ($toolsref->{$type}->{$key}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$}); - } else { - $providerurl = $toolsref->{$type}->{$key}->{'url'}; - } - $providerurl = &LONCAPA::map::qtunescape($providerurl); - $toolsjs .= " ltitools[$idx][$i] = '$key';\n". - " ltitoolsTarget[$idx][$i] = '$target';\n". - " ltitoolsWidth[$idx][$i] = '$width';\n". - " ltitoolsHeight[$idx][$i] = '$height';\n". - " ltitoolsLinkDef[$idx][$i] = '$linkdef';\n". - " ltitoolsExplainDef[$idx][$i] = '$explaindef';\n". - " ltitoolsUrl[$idx][$i] = '$providerurl';\n"; - } - if (ref($toolsref->{$type}->{$key}->{'crsconf'}) eq 'HASH') { - my $display = $toolsref->{$type}->{$key}->{'crsconf'}->{'target'}; - $toolsjs .= " ltitoolsDisplay[$idx][$i] = '$display';\n"; - my $linktext = $toolsref->{$type}->{$key}->{'crsconf'}->{'linktext'}; - $toolsjs .= " ltitoolsLink[$idx][$i] = '$linktext';\n"; - my $explanation = $toolsref->{$type}->{$key}->{'crsconf'}->{'explanation'}; - $toolsjs .= " ltitoolsExplain[$idx][$i] = '$explanation';\n"; - my $label = $toolsref->{$type}->{$key}->{'crsconf'}->{'label'}; - $toolsjs .= " ltitoolsLabel[$idx][$i] = '$label';\n"; - my $title = $toolsref->{$type}->{$key}->{'crsconf'}->{'title'}; - $toolsjs .= " ltitoolsTitle[$idx][$i] = '$title';\n"; - my $append = $toolsref->{$type}->{$key}->{'crsconf'}->{'append'}; - $toolsjs .= " ltitoolsAppend[$idx][$i] = '$append';\n"; - } - } - $i++; - } - my $firstoption = ''; - my ($idsref,$titlesref) = &ordered_tooloptions($toolsref->{$type}); - if ((ref($idsref) eq 'ARRAY') && (ref($titlesref) eq 'ARRAY')) { - my $count = scalar(@{$idsref}); - $exttooloptions .= " tooloptval[$idx] = new Array($count);\n". - " toolopttxt[$idx] = new Array($count);\n"; - for (my $n=0; $n<@{$idsref}; $n++) { - my $id = $idsref->[$n]; - my $text = $titlesref->[$n]; - $exttooloptions .= " tooloptval[$idx][$n] = '$id';\n". - " toolopttxt[$idx][$n] = '$text';\n"; + my $num = scalar(keys(%{$toolsref})); + $toolsjs = " var ltitools = new Array($num);\n". + " var ltitoolsUrl = new Array($num);\n". + " var ltitoolsTarget = new Array($num);\n". + " var ltitoolsWidth = new Array($num);\n". + " var ltitoolsHeight = new Array($num);\n". + " var ltitoolsLinkDef = new Array($num);\n". + " var ltitoolsExplainDef = new Array($num);\n". + " var ltitoolsDisplay = new Array($num);\n". + " var ltitoolsLink = new Array($num);\n". + " var ltitoolsExplain = new Array($num);\n". + " var ltitoolsLabel = new Array($num);\n". + " var ltitoolsTitle = new Array($num);\n". + " var ltitoolsAppend = new Array($num);\n"; + my $i = 0; + foreach my $key (sort { $a <=> $b } keys(%{$toolsref})) { + if (ref($toolsref->{$key}) eq 'HASH') { + if (ref($toolsref->{$key}->{'display'}) eq 'HASH') { + my $target = $toolsref->{$key}->{'display'}->{'target'}; + my $width = $toolsref->{$key}->{'display'}->{'width'}; + my $height = $toolsref->{$key}->{'display'}->{'height'}; + my $linkdef = $toolsref->{$key}->{'display'}->{'linktext'}; + my $explaindef = $toolsref->{$key}->{'display'}->{'explanation'}; + my $providerurl; + if ($toolsref->{$key}->{'url'} =~ m{://}) { + (my $prot,my $host,$providerurl) = ($toolsref->{$key}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$}); + } else { + $providerurl = $toolsref->{$key}->{'url'}; } + $providerurl = &LONCAPA::map::qtunescape($providerurl); + $toolsjs .= ' ltitools['.$i.'] = '."'$key';\n". + ' ltitoolsTarget['.$i.'] = '."'$target';\n". + ' ltitoolsWidth['.$i.'] = '."'$width';\n". + ' ltitoolsHeight['.$i.'] = '."'$height';\n". + ' ltitoolsLinkDef['.$i.'] = '."'$linkdef';\n". + ' ltitoolsExplainDef['.$i.'] = '."'$explaindef';\n". + ' ltitoolsUrl['.$i.'] = '."'$providerurl';\n"; + } + if (ref($toolsref->{$key}->{'crsconf'}) eq 'HASH') { + my $display = $toolsref->{$key}->{'crsconf'}->{'target'}; + $toolsjs .= ' ltitoolsDisplay['.$i.'] = '."'$display';\n"; + my $linktext = $toolsref->{$key}->{'crsconf'}->{'linktext'}; + $toolsjs .= ' ltitoolsLink['.$i.'] = '."'$linktext';\n"; + my $explanation = $toolsref->{$key}->{'crsconf'}->{'explanation'}; + $toolsjs .= ' ltitoolsExplain['.$i.'] = '."'$explanation';\n"; + my $label = $toolsref->{$key}->{'crsconf'}->{'label'}; + $toolsjs .= ' ltitoolsLabel['.$i.'] = '."'$label';\n"; + my $title = $toolsref->{$key}->{'crsconf'}->{'title'}; + $toolsjs .= ' ltitoolsTitle['.$i.'] = '."'$title';\n"; + my $append = $toolsref->{$key}->{'crsconf'}->{'append'}; + $toolsjs .= ' ltitoolsAppend['.$i.'] = '."'$append';\n"; } - $exttoolnums .= " ltitoolsnum[$idx] = $i;\n"; + + $i++; } - $idx ++; } } my %js_lt = &Apache::lonlocal::texthash( @@ -931,7 +773,6 @@ sub extedit_javascript { nopopup => 'Pop-up blocked', nopriv => 'Insufficient privileges to use preview', badurl => 'URL is not: http://hostname/path or https://hostname/path', - sele => 'Select', ); &js_escape(\%js_lt); @@ -970,29 +811,17 @@ function setExternal(extform,residx,type } else { title = escape(title); var info = exttoolurl; - var prefix = ''; - if (supplementalflag == 1) { - prefix = 'supp'; - } if (residx == 0) { var toolid = parseInt(extform.exttoolid.options[extform.exttoolid.selectedIndex].value); if (isNaN(toolid)) { alert("$js_lt{'invtool'}"); return; } - var typeelem = extform.elements[prefix+'exttooltype']; - if (typeelem.length) { - for (var i=0; i 0) { labelinput += '_'+residx; titleinput += '_'+residx; - appendinput += '_'+residx; + appendinput += '_'+residx; } if (document.getElementById(labelinput)) { var crslabel = document.getElementById(labelinput).value; @@ -1118,14 +947,14 @@ function setExternal(extform,residx,type } function editext(residx,type) { - if (document.getElementById('upload'+type+residx)) { - var curr = document.getElementById('upload'+type+residx).style.display; + if (document.getElementById('external'+type+residx)) { + var curr = document.getElementById('external'+type+residx).style.display; if (curr == 'none') { disp = 'block'; } else { disp = 'none'; } - document.getElementById('upload'+type+residx).style.display=disp; + document.getElementById('external'+type+residx).style.display=disp; } resize_scrollbox('contentscroll','1','1'); return; @@ -1206,77 +1035,6 @@ function openPreviewWindow(url,name,noif } } -function updateExttoolSel(form,radioname,supplementalflag) { - var prefix = ''; - var typepick; - var radelem = form.elements[radioname]; - if (radelem.length) { - for (var i=0; i=0) { - for (i = numopts; i >= 0; i--) { - selelem.remove(i); - } - } - if (ltitoolsnum[typepick]) { - if ((Array.isArray(tooloptval[typepick])) && (Array.isArray(toolopttxt[typepick]))) { - var len = tooloptval[typepick].length; - if (len) { - selelem.options[selelem.options.length] = new Option('$js_lt{sele}','',1,1); - var j; - for (j=0; j 0) { - for (var j=0; j 0) { + for (var j=0; j'; - } - } + if (document.getElementById(explanationinput)) { + if (ltitoolsExplain[j]) { + document.getElementById(explanationinput).value = ltitoolsExplainDef[j]; } else { - document.getElementById(appenddiv).style.display = 'none'; - if (document.getElementById(providerurl)) { - document.getElementById(providerurl).innerHTML = ''; - } + document.getElementById(explananationinput).value = ''; } } - if (document.getElementById(gradablediv)) { - if (supplementalflag != 1) { - document.getElementById(gradablediv).style.display = 'inline'; + } + if (document.getElementById(labeldiv)) { + if (ltitoolsLabel[j]) { + document.getElementById(labeldiv).style.display = 'inline'; + } else { + document.getElementById(labeldiv).style.display = 'none'; + } + } + if (document.getElementById(titlediv)) { + if (ltitoolsTitle[j]) { + document.getElementById(titlediv).style.display = 'inline'; + } else { + document.getElementById(titlediv).style.display = 'none'; + } + } + if (document.getElementById(appenddiv)) { + if (ltitoolsAppend[j]) { + document.getElementById(appenddiv).style.display = 'inline'; + if (document.getElementById(providerurl)) { + if ((ltitoolsUrl[j] != '') && (ltitoolsUrl[j] != null)) { + document.getElementById(providerurl).innerHTML = ' ('+ltitoolsUrl[j]+')
'; + } + } + } else { + document.getElementById(appenddiv).style.display = 'none'; + if (document.getElementById(providerurl)) { + document.getElementById(providerurl).innerHTML = ''; } } - break; } + if (document.getElementById(gradablediv)) { + if (supplementalflag != 1) { + document.getElementById(gradablediv).style.display = 'inline'; + } + } + break; } } }