--- loncom/interface/lonextresedit.pm 2017/05/06 15:47:48 1.17 +++ loncom/interface/lonextresedit.pm 2018/07/04 13:55:27 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: lonextresedit.pm,v 1.17 2017/05/06 15:47:48 raeburn Exp $ +# $Id: lonextresedit.pm,v 1.26 2018/07/04 13:55:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,7 +60,7 @@ sub handler { $symb,$type); if (($env{'form.folderpath'} =~ /^supplemental/) && ($env{'form.suppurl'})) { $supplementalflag = 1; - if (&unescape($env{'form.suppurl'}) =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) { + if (&unescape($env{'form.suppurl'}) =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) { $type = 'tool'; } } @@ -79,7 +79,7 @@ sub handler { if ($symb ne $env{'form.symb'}) { $env{'form.symb'} = $symb; } - if ($url =~ m{/adm/$cdom/$cnum/\d+/exttools?$}) { + if ($url =~ m{/adm/$cdom/$cnum/\d+/ext\.tool$}) { $type = 'tool'; } } @@ -98,7 +98,7 @@ sub handler { } my %ltitools; if ($type eq 'tool') { - %ltitools = &Apache::lonnet::get_domain_ltitools($cdom); + %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"'; @@ -400,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 { @@ -418,7 +476,7 @@ sub extedit_form { } else { $orig_title = $lt{'et'}; $save = $lt{'at'}; - $orig_url = "/adm/$cdom/$cnum/new/exttool"; + $orig_url = "/adm/$cdom/$cnum/new/ext\.tool"; } $pathitem .= '
'; } @@ -429,7 +487,7 @@ sub extedit_form { my $class = 'LC_nobreak'; if ($residx) { $class = 'LC_docs_ext_edit LC_nobreak'; - if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/exttools?$}) { + if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) { my $marker = $1; my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum); if ($toolhash{'id'}) { @@ -442,11 +500,19 @@ sub extedit_form { 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" '; } @@ -454,6 +520,11 @@ sub extedit_form { $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'}; @@ -463,6 +534,10 @@ sub extedit_form { $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'; } @@ -474,6 +549,7 @@ sub extedit_form { } } $toolelem = ''.$image.' '.$tooltitle.'
'; + $gradablestyle = 'display:inline'; } } } @@ -505,12 +581,17 @@ sub extedit_form { $toolelem .= '
'; $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'}; $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'}; + $crsappend = ''; + $chknogrd = ' checked="checked"'; } $toolelem .= '
'. ''.&mt('Display target:').' '. ''.(' 'x2). + ''.(' 'x2). ''. @@ -534,7 +615,18 @@ sub extedit_form { '
'. ''.&mt('Course title:').' '. '
'. - '
'; + '
'. + '
'. + ''.&mt('Append to URL[_1]', + ' ('.$providerurl.')
'). + '

'. + '
'. + '
'. + ''.&mt('Gradable').' '. + ''.(' 'x2). + '
'; } my $chooser = $toolelem; if ($type eq 'ext') { @@ -591,7 +683,7 @@ sub display_editor { } my %ltitools; if ($type eq 'tool') { - %ltitools = &Apache::lonnet::get_domain_ltitools($cdom); + %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); } $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript()); my $args = { 'force_register' => $env{'form.register'} }; @@ -616,6 +708,7 @@ sub extedit_javascript { if (ref($toolsref) eq 'HASH') { 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". @@ -625,7 +718,8 @@ sub extedit_javascript { " 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 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') { @@ -635,12 +729,20 @@ sub extedit_javascript { 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"; + ' ltitoolsExplainDef['.$i.'] = '."'$explaindef';\n". + ' ltitoolsUrl['.$i.'] = '."'$providerurl';\n"; } if (ref($toolsref->{$key}->{'crsconf'}) eq 'HASH') { my $display = $toolsref->{$key}->{'crsconf'}->{'target'}; @@ -653,7 +755,10 @@ sub extedit_javascript { $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"; } + $i++; } } @@ -729,6 +834,8 @@ function setExternal(extform,residx,type var height = extform.exttoolheight.value; height.trim(); info += ':window:'+width+':'+height; + } else if (extform.exttooltarget[i].value == 'tab') { + info += ':tab::'; } else { info += ':iframe::'; } @@ -771,9 +878,11 @@ function setExternal(extform,residx,type } var labelinput = prefix+'toolcrslabel'; var titleinput = prefix+'toolcrstitle'; + var appendinput = prefix+'toolcrsappend'; if (residx > 0) { labelinput += '_'+residx; titleinput += '_'+residx; + appendinput += '_'+residx; } if (document.getElementById(labelinput)) { var crslabel = document.getElementById(labelinput).value; @@ -789,6 +898,39 @@ function setExternal(extform,residx,type } else { info += ':'; } + if (document.getElementById(appendinput)) { + var crsappend = document.getElementById(appendinput).value; + crsappend.trim(); + info += ':'+escape(crsappend); + } else { + info += ':'; + } + var gradablediv = prefix+'toolgradablediv'; + if (residx > 0) { + gradablediv += '_'+residx; + } + if (document.getElementById(gradablediv)) { + if (document.getElementById(gradablediv).style.display == 'inline') { + if (extform.exttoolgradable.length) { + for (var i=0; i 0) { eval("extform.importdetail.value=title+'='+info+'='+residx;extform.submit();"); @@ -839,8 +981,12 @@ function updateExttool(caller,form,suppl heightinput = prefix+'tooldimenheight'; labeldiv = prefix+'toolcrslabeldiv'; titlediv = prefix+'toolcrstitlediv'; + appenddiv = prefix+'toolcrsappenddiv'; + gradablediv = prefix+'toolgradablediv'; + providerurl = prefix+'toolproviderurl'; labelinput = prefix+'toolcrslabel'; titleinput = prefix+'toolcrstitle'; + appendinput = prefix+'toolcrsappend'; windiv = prefix+'toolwindiv'; linktextdiv = prefix+'toollinktextdiv'; linktextinput = prefix+'toollinktext'; @@ -871,6 +1017,12 @@ function updateExttool(caller,form,suppl if (document.getElementById(titlediv)) { document.getElementById(titlediv).style.display = 'none'; } + if (document.getElementById(appenddiv)) { + document.getElementById(appenddiv).style.display = 'none'; + } + if (document.getElementById(gradablediv)) { + document.getElementById(gradablediv).style.display = 'none'; + } } else { if (ltitools.length > 0) { for (var j=0; j'; + } + } + } else { + document.getElementById(appenddiv).style.display = 'none'; + if (document.getElementById(providerurl)) { + document.getElementById(providerurl).innerHTML = ''; + } + } + } + if (document.getElementById(gradablediv)) { + if (supplementalflag != 1) { + document.getElementById(gradablediv).style.display = 'inline'; + } + } break; } } @@ -972,17 +1144,21 @@ function updateTooldim(form,dimendiv,win dimen = 'block'; linkconf = 'block'; } else { - if (document.getElementById(widthinput)) { - document.getElementById(widthinput).value = ''; - } - if (document.getElementById(heightinput)) { - document.getElementById(heightinput).value = ''; - } - if (document.getElementById(linkinput)) { - document.getElementById(linkinput).value = ''; - } - if (document.getElementById(explaininput)) { - document.getElementById(explaininput).value = ''; + if (form.exttooltarget[i].value == 'tab') { + linkconf = 'block'; + } else { + if (document.getElementById(widthinput)) { + document.getElementById(widthinput).value = ''; + } + if (document.getElementById(heightinput)) { + document.getElementById(heightinput).value = ''; + } + if (document.getElementById(linkinput)) { + document.getElementById(linkinput).value = ''; + } + if (document.getElementById(explaininput)) { + document.getElementById(explaininput).value = ''; + } } } if (document.getElementById(dimendiv)) {