'.
'
'.&mt('Display target:').' '.
''.(' 'x2).
- ''.(' 'x2).
''.
@@ -558,11 +534,6 @@ sub extedit_form {
'
'.
''.&mt('Course title:').' '.
'
'.
- '
'.
- '
'.
- ''.&mt('Append to URL[_1]',
- ' ('.$providerurl.')
').
- '
'.
'
';
}
my $chooser = $toolelem;
@@ -620,7 +591,7 @@ sub display_editor {
}
my %ltitools;
if ($type eq 'tool') {
- %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+ %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
}
$js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
my $args = { 'force_register' => $env{'form.register'} };
@@ -645,7 +616,6 @@ 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".
@@ -655,8 +625,7 @@ 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 ltitoolsAppend = new Array($num);\n";
+ " var ltitoolsTitle = new Array($num);\n";
my $i = 0;
foreach my $key (sort { $a <=> $b } keys(%{$toolsref})) {
if (ref($toolsref->{$key}) eq 'HASH') {
@@ -666,20 +635,12 @@ 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".
- ' ltitoolsUrl['.$i.'] = '."'$providerurl';\n";
+ ' ltitoolsExplainDef['.$i.'] = '."'$explaindef';\n";
}
if (ref($toolsref->{$key}->{'crsconf'}) eq 'HASH') {
my $display = $toolsref->{$key}->{'crsconf'}->{'target'};
@@ -692,8 +653,6 @@ 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++;
}
@@ -702,12 +661,6 @@ sub extedit_javascript {
my %js_lt = &Apache::lonlocal::texthash(
invurl => 'Invalid URL',
titbl => 'Title is blank',
- mixfra => 'Show preview in pop-up? (http in https page + no framing)',
- mixonly => 'Show preview in pop-up? (http in https page)',
- fraonly => 'Show preview in pop-up? (framing disallowed)',
- nopopup => 'Pop-up blocked',
- nopriv => 'Insufficient privileges to use preview',
- badurl => 'URL is not: http://hostname/path or https://hostname/path',
invtool => 'Please select an external tool',
);
&js_escape(\%js_lt);
@@ -776,8 +729,6 @@ 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::';
}
@@ -820,11 +771,9 @@ 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;
@@ -840,13 +789,6 @@ function setExternal(extform,residx,type
} else {
info += ':';
}
- if (document.getElementById(appendinput)) {
- var crsappend = document.getElementById(appendinput).value;
- crsappend.trim();
- info += ':'+escape(crsappend);
- } else {
- info += ':';
- }
info=escape(info);
if (residx > 0) {
eval("extform.importdetail.value=title+'='+info+'='+residx;extform.submit();");
@@ -875,73 +817,14 @@ function extUrlPreview(caller,protocol)
var url = document.getElementById(caller).value;
if (regexp.test(url)) {
var http_regex = /^http\:\/\//gi;
- var mixed = 0;
- var noiframe = 0;
- var nopriv = 0;
- var badurl = 0;
- var name = "externalpreview";
if ((protocol == 'https') && (http_regex.test(url))) {
- mixed = 1;
- }
- var http = new XMLHttpRequest();
- var lcurl = "/adm/exturlcheck";
- var params = "exturl="+url;
- http.open("POST",lcurl, true);
- http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
- http.onreadystatechange = function() {
- if (http.readyState == 4) {
- if (http.status == 200) {
- if (http.responseText.length > 0) {
- if (http.responseText == 1) {
- noiframe = 1;
- } else if (http.responseText == -1) {
- nopriv = 1;
- } else if (http.responseText == 0) {
- badurl = 1;
- }
- }
- openPreviewWindow(url,name,noiframe,mixed,nopriv,badurl);
- }
- }
- }
- http.send(params);
- } else {
- alert("$js_lt{'invurl'}");
- }
- }
-}
-
-var previewLCWindow = null;
-function openPreviewWindow(url,name,noiframe,mixed,nopriv,badurl) {
- if (previewLCWindow !=null) {
- previewLCWindow.close();
- }
- if (badurl) {
- alert("$js_lt{'badurl'}");
- } else if (nopriv) {
- alert("$js_lt{'nopriv'}");
- } else if ((noiframe == 1) || (mixed == 1)) {
- var encurl = encodeURI(url);
- var msg;
- if (mixed == 1) {
- if (noiframe == 1) {
- msg = "$js_lt{'mixfra'}";
+ window.open(url,"externalpreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
} else {
- msg = "$js_lt{'mixonly'}";
+ openMyModal(url,500,400,'yes');
}
} else {
- msg = "$js_lt{'fraonly'}";
- }
- if (confirm(msg)) {
- previewLCWindow = window.open(url,name,"height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
- if (previewLCWindow != null) {
- previewLCWindow.focus();
- } else {
- alert("$js_lt{'nopopup'}");
- }
+ alert("$js_lt{'invurl'}");
}
- } else {
- openMyModal(url,500,400,'yes');
}
}
@@ -956,11 +839,8 @@ function updateExttool(caller,form,suppl
heightinput = prefix+'tooldimenheight';
labeldiv = prefix+'toolcrslabeldiv';
titlediv = prefix+'toolcrstitlediv';
- appenddiv = prefix+'toolcrsappenddiv';
- providerurl = prefix+'toolproviderurl';
labelinput = prefix+'toolcrslabel';
titleinput = prefix+'toolcrstitle';
- appendinput = prefix+'toolcrsappend';
windiv = prefix+'toolwindiv';
linktextdiv = prefix+'toollinktextdiv';
linktextinput = prefix+'toollinktext';
@@ -991,9 +871,6 @@ 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';
- }
} 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 = '';
- }
- }
- }
break;
}
}
@@ -1110,21 +972,17 @@ function updateTooldim(form,dimendiv,win
dimen = 'block';
linkconf = 'block';
} else {
- 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(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)) {