--- loncom/interface/lonextresedit.pm	2023/07/05 18:41:20	1.8.2.4.4.2
+++ loncom/interface/lonextresedit.pm	2016/01/26 14:30:25	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.8.2.4.4.2 2023/07/05 18:41:20 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.9 2016/01/26 14:30:25 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+/ext\.tool$}) {
+        if (&unescape($env{'form.suppurl'}) =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) {
             $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+/ext\.tool$}) {
+            if ($url =~ m{/adm/$cdom/$cnum/\d+/exttools?$}) {
                 $type = 'tool';
             }
         }
@@ -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_ltitools($cdom);
     }
     my $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $pathitem = '<input type="hidden" name="folderpath" value="'.
@@ -157,7 +146,7 @@ sub process_changes {
         $oldtitle = &unescape($env{'form.title'});
         $container = 'sequence';
         $supplementalflag = 1;
-        if ($oldurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
+        if ($oldurl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) {
             $type = 'tool';
         } else {
             $type = 'ext';
@@ -168,13 +157,10 @@ sub process_changes {
     if ($env{'form.importdetail'}) {
         ($newtitle,$newurl,$newidx) =
             map {&unescape($_)} split(/\=/,$env{'form.importdetail'});
-        if ($newurl =~ m{^(/adm/$cdom/$cnum/(\d+)/ext\.tool)\:?(.*)$}) {
+        if ($newurl =~ m{^(/adm/$cdom/$cnum/(\d+)/exttools?)\:?(.*)$}) {
             $newurl = $1;
             $marker = $2;
             $args = $3;
-            if ((!$symb) && (!$supplementalflag)) {
-                $symb = "uploaded/$cdom/$cnum/$folder.$container"."___$newidx"."___adm/$cdom/$cnum/$marker/ext.tool";
-            }
         }
     }
     if ($supplementalflag) {
@@ -184,7 +170,7 @@ sub process_changes {
     }
     if ($folder && $container) {
         if ($env{'form.importdetail'}) {
-            my ($errtext,$fatal,$mismatchedid,$needreload,$newgradable,@imports);
+            my ($errtext,$fatal,$mismatchedid,@imports);
             if (!$supplementalflag) {
                 if (($oldidx) && ($oldidx != $newidx)) {
                     $mismatchedid = 1;
@@ -195,27 +181,9 @@ sub process_changes {
             } elsif (($newtitle eq $oldtitle) && ($newurl eq $oldurl)) {
                 if ($type eq 'tool') {
                     if ($args) {
-                        ($updated,$newgradable,$errormsg) = &update_exttool($marker,$cdom,$cnum,
-                                                                            $supplementalflag,$args);
-                        if ($updated) {
-                            if ($newgradable) {
-                                my $map = "/uploaded/$cdom/$cnum/$folder.$container";
-                                my ($errtext,$fatal) = &LONCAPA::map::mapread($map);
-                                if ($fatal) {
-                                    $errormsg = &mt('Update failed: [_1].',$errtext);
-                                } else {
-                                    &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',
-                                                                  $newgradable,'string_yesno');
-                                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,1);
-                                    if ($errtext) {
-                                        $errormsg = &mt('Update failed: [_1].',$errtext);
-                                    } else {
-                                        $needreload = 1;
-                                    }
-                                }
-                            }
-                        } else {
-                            $output = &mt('No change');
+                        ($updated,$errormsg) = &update_exttool($marker,$cdom,$cnum,$args);
+                        unless ($updated) {
+                            $output = &mt('No change');      
                         }
                     } else {
                         $output = &mt('No change');
@@ -234,25 +202,13 @@ sub process_changes {
                     my $ext = 'true';
                     if ($type eq 'tool') {
                         if ($args) {
-                            ($updated,$newgradable,$errormsg) = &update_exttool($marker,$cdom,$cnum,
-                                                                                $supplementalflag,$args);
-                            if ($newgradable) {
-                                &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$newgradable,
-                                                              'string_yesno');
-                                $needreload = 1;
-                            }
+                            ($updated,$errormsg) = &update_exttool($marker,$cdom,$cnum,$args);
                         }
                         $ext = 'false';
                     }
-                    my $dotimeupdate;
-                    unless ($supplementalflag) {
-                        if (($newgradable) || ($newurl ne $oldurl)) {
-                            $dotimeupdate = 1;
-                        }
-                    }
                     $LONCAPA::map::resources[$residx] =
                         join(':', ($savetitle,$saveurl,$ext,'normal','res'));
-                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,$dotimeupdate);
+                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1);
                     if ($errtext) {
                         $errormsg = &mt('Update failed: [_1].',$errtext);
                     } else {
@@ -274,26 +230,19 @@ sub process_changes {
                                     &Apache::lonnet::devalidate_title_cache($symb);
                                 }
                             }
-                            $needreload = 1;
+                        }
+                        my ($furl,$ferr) = 
+                            &Apache::lonuserstate::readmap("$cdom/$cnum");
+                        if ($ferr) {
+                            $errormsg = &mt('Reload failed: [_1].',$ferr);
+                        } else {
+                            unless ($supplementalflag) {
+                                &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
+                            }
                         }
                     }
                 }
             }
-            if ($needreload) {
-                my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
-                if ($ferr) {
-                    $errormsg = &mt('Reload failed: [_1].',$ferr);
-                } else {
-                    unless ($supplementalflag) {
-                        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
-                                                                       $cdom.'_'.$cnum);
-                    }
-                }
-            }
-            if (($type eq 'tool') && ($newgradable)) {
-                my $uri = &Apache::lonnet::declutter($url);
-                &Apache::lonnet::devalidate_cache_new('meta',$uri);
-            }
         } else {
             $output = &mt('No change');
         }
@@ -308,71 +257,40 @@ sub process_changes {
 }
 
 sub update_exttool {
-    my ($marker,$cdom,$cnum,$supplementalflag,$args) = @_;
-    my (%newhash,$changed,$newgradable,@deleted,$errormsg);
-    ($newhash{'target'},$newhash{'width'},$newhash{'height'},$newhash{'linktext'},$newhash{'explanation'},
-     $newhash{'crslabel'},$newhash{'crstitle'},$newhash{'crsappend'},$newhash{'gradable'}) = split(/:/,$args);
-    foreach my $item ('linktext','explanation','crslabel','crstitle','crsappend') {
-        $newhash{$item} = &unescape($newhash{$item});
-    }
+    my ($marker,$cdom,$cnum,$args) = @_;
+    my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
+    my (%newhash,$changed,$errormsg);
+    ($newhash{'target'},$newhash{'width'},$newhash{'height'}) = split(/:/,$args);
     my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle','crsappend','gradable') {
+    foreach my $item ('target','width','height') {
         $newhash{$item} =~ s/^\s+//;
         $newhash{$item} =~ s/\s+$//;
-        if (($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) {
+        unless ($item eq 'target') {
             if ($newhash{'target'} eq 'iframe') {
                 $newhash{$item} = '';
-            } elsif ($newhash{'target'} eq 'tab') {
-                if (($item eq 'width') || ($item eq 'height')) {
-                    $newhash{$item} = '';
-                }
-            }
-        } elsif ($item eq 'gradable') {
-            unless ($newhash{$item} == 1) {
-                $newhash{$item} = '';
             }
         }
         if ($toolhash{$item} ne $newhash{$item}) {
-            if (($item eq 'gradable') && (!$supplementalflag)) {
-                if ($newhash{$item}) {
-                    $newgradable = 'yes';
-                } else {
-                    $newgradable = 'no';
-                }
-            }
             if ($newhash{$item} eq '') {
-                unless (($item eq 'target') ||
-                        ((($item eq 'width') || ($item eq 'height')) &&
-                         (($newhash{'target'} eq 'window') || 
-                          (($newhash{'target'} eq '') && ($toolhash{'target'} eq 'window')))) ||
-                        ((($item eq 'linktext') || ($item eq 'explanation')) &&
-                         ((($newhash{'target'} =~ /^(window|tab)$/)) ||
-                         (($newhash{'target'} eq '') && ($toolhash{'target'} =~ /^(window|tab)$/))))) {
-                    delete($toolhash{$item});
-                    push(@deleted,$item);
-                    $changed = 1;
-                }
+                delete($toolhash{$item});
             } else {
                 $toolhash{$item} = $newhash{$item};
-                $changed = 1; 
             }
+            $changed = 1;
         }
     }
     if ($changed) {
         my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$cdom,$cnum);
         unless ($putres eq 'ok') {
-            $errormsg = &mt('Failed to save updated settings.').' '.&mt('Error: [_1].',$putres);
+             $errormsg = &mt('Failed to save updated settings.').' '.&mt('Error: [_1].',$putres);
         }
     }
-    if (@deleted) {
-        &Apache::lonnet::del('exttool_'.$marker,\@deleted,$cdom,$cnum);
-    }
-    return ($changed,$newgradable,$errormsg);
+    return ($changed,$errormsg);
 }
 
 sub extedit_form {
     my ($supplementalflag,$residx,$orig_url,$orig_title,$pathitem,$helpitem,$caller,
-        $symb,$type,$cdom,$cnum,$ltitools,$disabled) = @_;
+        $symb,$type,$cdom,$cnum,$ltitools) = @_;
     if ($type ne 'tool') {
         $type = 'ext';
     }
@@ -388,36 +306,21 @@ sub extedit_form {
         ti => 'Title',
         al => 'Add Link',
         at => 'Add Tool',
-        dd => 'Defined in domain',
-        dc => 'Defined in course',
     );
     my $tabid = 'aa';
     my $size = 60;
     if ($supplementalflag) {
         $tabid = 'ee';
     }
-    my ($formname,$formid,$toggle,$fieldsetid,$urlid,$subdivid,$dispdivstyle,$dimendivstyle,
-        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $appendstyle,$gradablestyle,$subdivstyle,$legend,$urlelem,$toolelem,%toolattr);
+    my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
+        $legend,$urlelem,$toolelem,%toolattr);
     $formname = 'new'.$type;
     $toggle = $type;
     $fieldsetid = 'upload'.$type.'form';
     $urlid = $type.'url';
-    map { $toolattr{$_} = $type.$_; } ('dispdiv','dimendiv','dimenwidth','dimenheight',
-                                       'crstitlediv','crslabeldiv','crsappenddiv',
-                                       'gradablediv','crstitle','crslabel','crsappend',
-                                       'windiv','linktextdiv','explanationdiv',
-                                       'linktext','explanation','providerurl');
+    map { $toolattr{$_} = $type.$_; } ('dispdiv','dimendiv','dimenwidth','dimenheight');
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
-    $windivstyle = 'display:none';
-    $linktextstyle = 'display:none';
-    $explanationstyle = 'display:none';
-    $labelstyle = 'display:none';
-    $titlestyle = 'display:none';
-    $appendstyle = 'display:none';
-    $gradablestyle = 'display:none';
-    $subdivstyle = 'display:block';
     if ($supplementalflag) {
         $formname = 'newsupp'.$type;
         $toggle = 'supp'.$type;
@@ -425,24 +328,18 @@ sub extedit_form {
         $urlid = 'supp'.$type.'url';
         map { $toolattr{$_} = 'supp'.$toolattr{$_}; } (keys(%toolattr));
     }
-    my ($link,$legend,$active,$srcclass,$extsrc,$preview,$title,$save,$crstitle,$crslabel,
-        $crsappend,$fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,
-        $linktext,$explanation,$providerurl,$chkgrd,$chknogrd,%chkstate);
+    my ($link,$legend,$active,$srcclass,$extsrc,$preview,$title,$save,
+        $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,%chkstate);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
-    my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
-    my $rows = 2;
-    my $cols = 20;
     if ($residx) {
         if ($caller eq 'direct') {
             $fieldsetstyle = 'display: block;';
             $action = '/adm/extresedit';
-            $rows = 10;
-            $cols = 45;
             if ($type eq 'tool') {
-                $legend = $lt{'te'};
-            } else {
                 $legend = $lt{'ee'};
+            } else {
+                $legend = $lt{'te'};
             }
             $legend = '<legend>'.$legend.'</legend>';
             if ($symb) {
@@ -465,7 +362,7 @@ sub extedit_form {
         $srcclass = ' class="LC_nobreak"';
         if ($type eq 'ext') {
             $extsrc = '<span class="LC_docs_ext_edit">'.$lt{'ul'}.'&nbsp;</span>';
-            $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid','$protocol'".');">'.$lt{'pr'}.'</a>';
+            $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid'".');">'.$lt{'pr'}.'</a>';
         }
         $title = '<span class="LC_docs_ext_edit">'.$lt{'ti'}.'&nbsp;</span>';
         $save = $lt{'sv'};
@@ -487,224 +384,87 @@ sub extedit_form {
             $orig_url = 'http://';
             $orig_title = $lt{'ex'};
             $extsrc = $lt{'ul'}.':<br />';
-            $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid','$protocol'".');"'.$disabled.' />';
+            $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid'".');" />';
             $save = $lt{'al'};
         } else {
             $orig_title = $lt{'et'};
             $save = $lt{'at'};
-            $orig_url = "/adm/$cdom/$cnum/new/ext\.tool"; 
+            $orig_url = "/adm/$cdom/$cnum/new/exttool"; 
         }
         $pathitem .= '<br />';
     }
     $formid = $formname;
     if ($type eq 'ext') {
-        $urlelem = '<input type="text" size="'.$size.'" name="exturl" id="'.$urlid.'" value="'.$orig_url.'"'.$disabled.' />';
+        $urlelem = '<input type="text" size="'.$size.'" name="exturl" id="'.$urlid.'" value="'.$orig_url.'" />';
     } else {
         my $class = 'LC_nobreak';
         if ($residx) {
             $class = 'LC_docs_ext_edit LC_nobreak'; 
-            if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
+            if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/exttools?$}) {
                 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 ($toolhash{'id'}) {
+                    $dispdivstyle = 'display:block';
                     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 (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 = '<img src="'.$icon.'" alt="'.$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 = '<img src="'.$icon.'" alt="'.$tooltitle.'" />';
+                                }
+                                $tooltarget = $toolhash{'target'};
+                                if ($tooltarget eq 'window') {
+                                    $dimendivstyle = 'display:block';
+                                    $chkstate{'window'} = 'checked="checked" ';
+                                } else {
+                                    $chkstate{'iframe'} = 'checked="checked" ';
+                                }
+                                $width = $toolhash{'width'};
+                                $height = $toolhash{'height'};
+                                $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
+                            }
                         }
                     }
-                    $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
-                    $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 = '<span class="LC_docs_ext_edit">'."\n".
+                       '<select name="exttoolid" id="LC_exttoolid" onchange="javascript:updateExttool(this,'.
+                       'this.form,'."'$supplementalflag'".');">'."\n".
+                       '<option value="" selected="selected">'.&mt('Select').'</option>';
+            my %bynum;
             if (ref($ltitools) eq 'HASH') {
-                if (ref($ltitools->{'crs'}) eq 'HASH') {
-                    $numcrstools = scalar(keys(%{$ltitools->{'crs'}}));
-                }
-                if (ref($ltitools->{'dom'}) eq 'HASH') {
-                    $numdomtools = scalar(keys(%{$ltitools->{'dom'}}));
-                }
-                if ($numcrstools || $numdomtools) {
-                    $typeclick = ' onclick="'.
-                        'javascript:updateExttoolSel(this.form,'."'$toolradio','$supplementalflag'".');"';
-                } else {
-                    $exttypeoffsty = 'display:block';
-                    $exttypeofftext = &mt('No external tools defined in either the domain or the course are available for selection.');
-                }
-                if ($numcrstools && !$numdomtools) {
-                    $defcheck{'crs'} = ' checked="checked"';
-                    $subdivstyle = 'display:block';
-                    $exttypeonsty = 'display:block';
-                    my $firstoption = '<option value="" selected="selected">'.&mt('Select').'</option>';
-                    $seloptions = &ordered_tooloptions($ltitools->{'crs'});
-                    if ($seloptions) {
-                        $seloptions = "$firstoption\n$seloptions";
+                foreach my $id (keys(%{$ltitools})) {
+                    if (ref($ltitools->{$id}) eq 'HASH') {
+                        my $order = $ltitools->{$id}->{'order'};
+                        $bynum{$order} = [$id,$ltitools->{$id}];
                     }
-                    $exttypeofftext = &mt('No external tools defined in the domain are available for selection.');
-                } elsif (!$numcrstools && $numdomtools) {
-                    $defcheck{'dom'} = ' checked="checked"';
-                    $subdivstyle = 'display:block';
-                    $exttypeonsty = 'display:block';
-                    my $firstoption = '<option value="" selected="selected">'.&mt('Select').'</option>';
-                    $seloptions = &ordered_tooloptions($ltitools->{'dom'});
-                    if ($seloptions) {
-                        $seloptions = "$firstoption\n$seloptions";
+                }
+            }
+            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'};
+                        my $icon =  $bynum{$item}->[1]->{'image'};
+                        $toolelem .= '<option value="'.$bynum{$item}->[0].'">'.$tooltitle.'</option>';
                     }
-#FIXME need crstype
-                    $exttypeofftext = &mt('No external tools defined in the course are available for selection.');
                 }
             }
-            foreach my $type ('crs','dom') {
-                $toolelem .= '<span class="LC_nobreak"> <label>'.
-                             '<input type="radio" name="'.$toolradio.'" value="'.$type.'"'.$defcheck{$type}.
-                             $typeclick.$disabled.' />'.$typedesc{$type}.'</label></span> '."\n";
-            }
-            $toolelem .= '<div id="'.$exttypeon.'" style="'.$exttypeonsty.'">'.
-                         '<select name="exttoolid" onchange="javascript:updateExttool(this,'.
-                         'this.form,'."'$supplementalflag'".');"'.$disabled.'>'."\n".
-                         $seloptions.
-                         '</select><br /></div>'."\n".
-                         '<div id="'.$exttypeoff.'" style="'.$exttypeoffsty.'">'.
-                         $exttypeofftext.
-                         '<br /></div>'."\n";
-            $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
-            $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
-            $crsappend = '';
-            $chknogrd = ' checked="checked"';
+            $toolelem .= '</select></span>';
         }
         $toolelem .= '<div id="'.$toolattr{'dispdiv'}.'" style="'.$dispdivstyle.'">'.
                     '<span class="'.$class.'">'.&mt('Display target:').'&nbsp;'.
                     '<label><input type="radio" name="exttooltarget" value="iframe" '.$chkstate{'iframe'}.'onclick="updateTooldim(this.form,'.
-                    "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
-                    '$toolattr{linktext}','$toolattr{explanation}'".');"'.$disabled.' />'.&mt('iframe').'</label>'.('&nbsp;'x2).
-                    '<label><input type="radio" name="exttooltarget" value="tab" '.$chkstate{'tab'}.'onclick="updateTooldim(this.form,'.
-                    "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
-                    '$toolattr{linktext}','$toolattr{explanation}'".');"'.$disabled.' />'.&mt('tab').'</label>'.('&nbsp;'x2).
+                    "'$toolattr{dimendiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}'".');">'.&mt('iframe').'</label>'.('&nbsp;'x2).
                     '<label><input type="radio" name="exttooltarget" value="window" '.$chkstate{'window'}.'onclick="updateTooldim(this.form,'.
-                    "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
-                    '$toolattr{linktext}','$toolattr{explanation}'".');"'.$disabled.' />'.&mt('window').'</label></span>'.
-                    '<div id="'.$toolattr{'dimendiv'}.'" style="'.$dimendivstyle.'"><span class="'.$class.'">'.
-                    &mt('Width').':&nbsp;<input type="text" size="4" id="'.$toolattr{'dimenwidth'}.'" name="exttoolwidth" value="'.$width.'"'.$disabled.' />'.('&nbsp;'x2).
-                    &mt('Height').':&nbsp;<input type="text" size="4" id="'.$toolattr{'dimenheight'}.'" name="exttoolheight" value="'.$height.'"'.$disabled.' /></span>'."\n".
+                    "'$toolattr{dimendiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}'".');">'.&mt('window').'</label>'.
+                    '</span><div id="'.$toolattr{'dimendiv'}.'" style="'.$dimendivstyle.'">'. 
+                    '<span class="'.$class.'">'.
+                    &mt('Width').'<input type="text" id="'.$toolattr{'dimenwidth'}.'" name="exttoolwidth" value="'.$width.'">'.('&nbsp;'x2).
+                    &mt('Height').'<input type="text" id="'.$toolattr{'dimenheight'}.'" name="exttoolheight" value="'.$height.'"></span>'."\n".
                     '</div></div>';
-        $toolelem .= '<div id="'.$toolattr{'windiv'}.'" style="'.$windivstyle.'">'.
-                     '<div id="'.$toolattr{'linktextdiv'}.'" class="LC_left_float" style="'.$linktextstyle.'">'.
-                     '<span class="'.$class.'">'.&mt('Link Text').'</span><br /><input type="text" size="25" id="'.$toolattr{'linktext'}.
-                     '" name="exttoollinktext" value="'.$linktext.'"'.$disabled.' />'.
-                     '</div><div id="'.$toolattr{'explanationdiv'}.'" class="LC_left_float" style="'.$explanationstyle.'">'.
-                     '<span class="'.$class.'">'.&mt('Explanation').'</span><br />'.
-                     '<textarea rows="'.$rows.'" cols="'.$cols.'" id="'.$toolattr{'explanation'}.'" name="exttoolexplanation" '.$disabled.'>'.
-                     $explanation.'</textarea></div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
-                     '</div>';
-        $toolelem .= '<div id="'.$toolattr{'crslabeldiv'}.'" style="'.$labelstyle.'">'.
-                    '<span class="'.$class.'">'.&mt('Course label:').'&nbsp;'.
-                    '<input type="text" id="'.$toolattr{'crslabel'}.'" name="exttoollabel" value="'.$crslabel.'"'.$disabled.' /></span><br />'.
-                    '</div>'.
-                    '<div id="'.$toolattr{'crstitlediv'}.'" style="'.$titlestyle.'">'.
-                    '<span class="'.$class.'">'.&mt('Course title:').'&nbsp;'.
-                    '<input type="text" id="'.$toolattr{'crstitle'}.'" name="exttooltitle" value="'.$crstitle.'"'.$disabled.' /></span><br />'.
-                    '</div>'.
-                    '<div id="'.$toolattr{'crsappenddiv'}.'" style="'.$appendstyle.'">'.
-                    '<span class="'.$class.'">'.&mt('Append to URL[_1]',
-                    '<span id="'.$toolattr{'providerurl'}.'">&nbsp;('.$providerurl.')<br /></span>').
-                    '<input type="text" id="'.$toolattr{'crsappend'}.'" size="30" name="exttoolappend" value="'.$crsappend.'"'.$disabled.' /></span><br />'.
-                    '</div>'.
-                    '<div id="'.$toolattr{'gradablediv'}.'" style="'.$gradablestyle.'">'.
-                    '<span class="'.$class.'">'.&mt('Gradable').'&nbsp;'.
-                    '<label><input type="radio" name="exttoolgradable" value="1"'.$chkgrd.$disabled.
-                    ' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
-                    '<label><input type="radio" name="exttoolgradable" value="0"'.$chknogrd.$disabled.
-                    ' />'.&mt('No').'</label></span></div>';
     }
     my $chooser = $toolelem;
     if ($type eq 'ext') {
@@ -724,14 +484,14 @@ $preview
 $legend
 $active
 $chooser
-<div id="$subdivid" style="$subdivstyle">
+<div>
 <span$srcclass>
 $title
-<input type="text" size="$size" name="exttitle" value="$orig_title" $disabled />
+<input type="text" size="$size" name="exttitle" value="$orig_title" />
 <input type="hidden" name="importdetail" value="" />
 $pathitem
 $hiddenelem
-<input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx','$type','$orig_url','$supplementalflag');" $disabled />
+<input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx','$type','$orig_url');" />
 </span>
 </div>
 </fieldset>
@@ -744,38 +504,9 @@ 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 .= '<option value="'.$bynum{$item}->[0].'">'.$tooltitle.'</option>'."\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);
+    my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum) = @_;
+    my ($residx,$supplementalflag,$title,$pathitem,$output,$js);
     if ($folderpath =~ /^supplemental/) {
         $supplementalflag = 1;
         $residx = $idx;
@@ -785,29 +516,15 @@ sub display_editor {
         (my $map,$residx,my $res) =
             &Apache::lonnet::decode_symb($symb);
         $title = &Apache::lonnet::gettitle($symb);
-        my $path = &Apache::loncommon::symb_to_docspath($symb,\$navmap);
+        my $path = &Apache::loncommon::symb_to_docspath($symb);
         $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
     }
-    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_ltitools($cdom);
     }
     $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $args = { 'force_register' => $env{'form.register'} };
-    if ($hostname) {
-        $args->{'hostname'} = $hostname;
-    }
     my $description = 'External Resource Editor';
     if ($type eq 'tool') {
         $description = 'External Tool Editor';
@@ -822,112 +539,31 @@ 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 = '<option value="" selected="selected">'.&mt('Select').'</option>';
-                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";
-                    }
-                }
-                $exttoolnums .= "        ltitoolsnum[$idx] = $i;\n";
+        my $num = scalar(keys(%{$toolsref}));
+        $toolsjs = "        var ltitools = new Array($num);\n".
+                   "        var ltitoolsTarget = new Array($num);\n".
+                   "        var ltitoolsWidth = new Array($num);\n".
+                   "        var ltitoolsHeight = new Array($num);\n"; 
+        my $i = 0;
+        foreach my $key (sort { $a <=> $b } keys(%{$toolsref})) {
+            if (ref($toolsref->{$key})) {
+                my $target = $toolsref->{$key}->{'target'};
+                my $width = $toolsref->{$key}->{'width'};
+                my $height = $toolsref->{$key}->{'height'};
+                $toolsjs .= '        ltitools['.$i.'] = '."'$key';\n".
+                            '        ltitoolsTarget['.$i.'] = '."'$target';\n".
+                            '        ltitoolsWidth['.$i.'] = '."'$width';\n".
+                            '        ltitoolsHeight['.$i.'] = '."'$height';\n";
+                $i++;
             }
-            $idx ++;
         }
     }
     my %js_lt = &Apache::lonlocal::texthash(
         invurl  => 'Invalid URL',
         titbl   => 'Title is blank',
         invtool => 'Please select an external tool',
-        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',
-        sele    => 'Select',
     );
     &js_escape(\%js_lt);
 
@@ -939,7 +575,7 @@ ENDREGEXP
 
 var regexp = $urlregexp;
 
-function setExternal(extform,residx,type,exttoolurl,supplementalflag) {
+function setExternal(extform,residx,type,exttoolurl) {
     var title=extform.exttitle.value;
     if (!String.trim) {
         String.prototype.trim = function() {return this.replace(\/^\\s+|\\s+$\/g, "");};    }
@@ -966,143 +602,28 @@ 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<typeelem.length; i++) {
-                    if (typeelem[i].checked) {
-                        tooltype = typeelem[i].value;
-                    }
-                }
-            }
-            if (tooltype == 'crs') {
-                info += ':c'+toolid;
-            } else {
-                info += ':'+toolid;
-            }
-        }
-        var dispdiv = prefix+'tooldispdiv';
-        var windiv = prefix+'toolwindiv';
-        if (residx > 0) {
-            dispdiv += '_'+residx;
-            windiv += '_'+residx;
-        }
-        if (document.getElementById(dispdiv)) {
-            if (document.getElementById(dispdiv).style.display == 'block') {
-                if (extform.exttooltarget.length) {
-                    for (var i=0; i<extform.exttooltarget.length; i++) {
-                        if (extform.exttooltarget[i].checked) {
-                            if (extform.exttooltarget[i].value == 'window') {
-                                var width = extform.exttoolwidth.value;
-                                width.trim();
-                                var height = extform.exttoolheight.value;
-                                height.trim();
-                                info += ':window:'+width+':'+height;
-                            } else if (extform.exttooltarget[i].value == 'tab') {
-                                info += ':tab::';
-                            } else {
-                                info += ':iframe::';
-                            }
-                        }
-                    }
-                }
-            } else {
-                info += ':::';
-            }
-        } else {
-            info += ':::';
+            info += ':'+toolid;
         }
-        if (document.getElementById(windiv)) {
-            if (document.getElementById(windiv).style.display == 'block') {
-                var linktextdiv = prefix+'toollinktextdiv';
-                var explanationdiv = prefix+'toolexplanationdiv';
-                if (residx > 0) {
-                    linktextdiv += '_'+residx;
-                    explanationdiv += '_'+residx;
-                }
-                if (document.getElementById(linktextdiv).style.display == 'inline') {
-                    var linktext = extform.exttoollinktext.value;
-                    linktext.trim();
-                    info += ':'+escape(linktext);
-                } else {
-                    info += ':';
-                }
-                if (document.getElementById(explanationdiv).style.display == 'inline') {
-                    var explaintext = extform.exttoolexplanation.value;
-                    explaintext.trim();
-                    info += ':'+escape(explaintext);
-                } else {
-                    info += ':';
-                }
-            } else {
-                info += '::';
-            }
-        } else {
-            info += '::';
-        }
-        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;
-            crslabel.trim();
-            info += ':'+escape(crslabel);
-        } else {
-            info += ':';
-        } 
-        if (document.getElementById(titleinput)) {
-            var crstitle = document.getElementById(titleinput).value;
-            crstitle.trim();
-            info += ':'+escape(crstitle);
-        } 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<extform.exttoolgradable.length; i++) {
-                        if (extform.exttoolgradable[i].checked) {
-                            if (extform.exttoolgradable[i].value == '1') {
-                                info += ':1';
-                            } else {
-                                info += ':';
-                            }
-                            break;
-                        }
+        if (extform.exttooltarget.length) {
+            for (var i=0; i<extform.exttooltarget.length; i++) {
+                if (extform.exttooltarget[i].checked) {
+                    if (extform.exttooltarget[i].value == 'window') {
+                        var width = extform.exttoolwidth.value;
+                        width.trim();
+                        var height = extform.exttoolheight.value;
+                        height.trim();
+                        info += ':window:'+width+':'+height;  
+                    } else {
+                        info += ':iframe';
                     }
-                } else {
-                    info += ':';
                 }
-            } else {
-                info += ':';
             }
-        } else {
-            info += ':';
         }
         info=escape(info);
         if (residx > 0) {
@@ -1127,152 +648,17 @@ function editext(residx,type) {
     return;
 }
 
-function extUrlPreview(caller,protocol) {
+function extUrlPreview(caller) {
     if (document.getElementById(caller)) {
         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);
+            openMyModal(url,500,400,'yes');
         } 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'}";
-            } else {
-                msg = "$js_lt{'mixonly'}";
-            }
-        } 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'}");
-            }
-        }
-    } else {
-        openMyModal(url,500,400,'yes');
-    }
-}
-
-function updateExttoolSel(form,radioname,supplementalflag) {
-    var prefix = '';
-    var typepick;
-    var radelem = form.elements[radioname];
-    if (radelem.length) {
-        for (var i=0; i<radelem.length; i++) {
-            if (radelem[i].checked) {
-                if (radelem[i].value == 'crs') {
-                    typepick = 0;
-                } else if (radelem[i].value == 'dom') {
-                    typepick = 1;
-                }
-                break;
-            }
-        }
-    }
-    if (supplementalflag == 1) {
-        prefix = 'supp';
-    }
-    $exttoolnums
-    $exttooloptions
-    if ((typepick == 0) || (typepick == 1)) {
-        var selelem = form.elements['exttoolid'];
-        var i, numopts = selelem.options.length -1;
-        if (numopts >=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<len; j++) {
-                        selelem.options[selelem.options.length] = new Option(toolopttxt[typepick][j],tooloptval[typepick][j]);
-                    }
-                    selelem.selectedIndex = 0;
-                }
-            }
-            if (document.getElementById('LC_exttoolon'+prefix)) {
-                document.getElementById('LC_exttoolon'+prefix).style.display = 'block';
-            }
-            if (document.getElementById('LC_exttooloff'+prefix)) {
-                document.getElementById('LC_exttooloff'+prefix).style.display = 'none';
-            }
-            if (document.getElementById('LC_addtool'+prefix)) {
-                document.getElementById('LC_addtool'+prefix).style.display = 'block';
-            }
-        } else {
-            if (document.getElementById('LC_exttoolon'+prefix)) {
-                document.getElementById('LC_exttoolon'+prefix).style.display = 'none';
-            }
-            if (document.getElementById('LC_exttooloff'+prefix)) {
-                document.getElementById('LC_exttooloff'+prefix).style.display = 'block';
-            }
-            if (document.getElementById('LC_addtool'+prefix)) {
-                document.getElementById('LC_addtool'+prefix).style.display = 'none';
-            }
-        }
-        if (selelem.options.length == 0) {
-            selelem.options[selelem.options.length] = new Option('','');
-            selelem.selectedIndex = 0;
-        }
-        updateExttool(selelem,form,supplementalflag);
-        resize_scrollbox('contentscroll','1','1');
-    }
-    return;
-}
-
 function updateExttool(caller,form,supplementalflag) {
     var prefix = '';
     if (supplementalflag == 1) {
@@ -1280,21 +666,8 @@ function updateExttool(caller,form,suppl
     }
     dispdiv = prefix+'tooldispdiv';
     dimendiv = prefix+'tooldimendiv';
-    widthinput = prefix+'tooldimenwidth';
-    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';
-    explanationdiv = prefix+'toolexplanationdiv';
-    explanationinput = prefix+'toolexplanation';
+    widthinput = prefix+'toolwidth';
+    heightinput = prefix+'toolheight';
     if (document.getElementById(dispdiv)) {
         var toolpick = caller.options[caller.selectedIndex].value;
         $toolsjs
@@ -1305,186 +678,65 @@ function updateExttool(caller,form,suppl
             if (document.getElementById(dimendiv)) {
                 document.getElementById(dimendiv).style.display = 'none';
             }
-            if (document.getElementById(windiv)) {
-                document.getElementById(windiv).style.display = 'none';
-            }
-            if (document.getElementById(linktextdiv)) {
-                document.getElementById(linktextdiv).style.display = 'none';
-            }
-            if (document.getElementById(explanationdiv)) {
-                document.getElementById(explanationdiv).style.display = 'none';
-            }
-            if (document.getElementById(labeldiv)) {
-                document.getElementById(labeldiv).style.display = 'none';
-            }
-            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 {
-            var tooltype = '';
-            var typeelem = form.elements[prefix+'exttooltype'];
-            if (typeelem.length) {
-                for (var i=0; i<typeelem.length; i++) {
-                    if (typeelem[i].checked) {
-                        tooltype = typeelem[i].value;
-                    }
-                }
+            if (document.getElementById(dispdiv)) {
+                document.getElementById(dispdiv).style.display = 'block';
             }
-            if ((tooltype == 'crs') || (tooltype == 'dom')) {
-                var i = 0;
-                if (tooltype == 'dom') {
-                    i = 1;
-                }
-                if (ltitools[i].length > 0) {
-                    for (var j=0; j<ltitools[i].length; j++) {
-                        if (ltitools[i][j] == toolpick) {
-                            if (document.getElementById(dispdiv)) {
-                                if (ltitoolsDisplay[i][j]) {
-                                    document.getElementById(dispdiv).style.display = 'block';
-                                    if (form.exttooltarget.length) {
-                                        for (var k=0; k<form.exttooltarget.length; k++) {
-                                            if (form.exttooltarget[k].value == ltitoolsTarget[i][j]) {
-                                                form.exttooltarget[k].checked = true;
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-                                var dimen = 'none';
-                                var dimenwidth = '';
-                                var dimenheight = '';
-                                if ((ltitoolsDisplay[i][j]) && (ltitoolsTarget[i][j] == 'window')) {
-                                    dimen = 'block';
-                                    dimenwidth = ltitoolsWidth[i][j];
-                                    dimenheight = ltitoolsHeight[i][j];
-                                }
-                                if (document.getElementById(dimendiv)) {
-                                    document.getElementById(dimendiv).style.display = dimen;
-                                }
-                                if (document.getElementById(widthinput)) {
-                                    document.getElementById(widthinput).value = dimenwidth;
-                                }
-                                if (document.getElementById(heightinput)) {
-                                    document.getElementById(heightinput).value = dimenheight;
+            if (ltitools.length > 0) {
+                for (var j=0; j<ltitools.length; j++) {
+                    if (ltitools[j] == toolpick) {
+                        if (form.exttooltarget.length) {
+                            for (var k=0; k<form.exttooltarget.length; k++) {
+                                if (form.exttooltarget[k].value == ltitoolsTarget[j]) {
+                                    form.exttooltarget[k].checked = true;
+                                    break;
                                 }
                             }
-                            if (document.getElementById(windiv)) {
-                                if ((ltitoolsTarget[i][j] == 'window') || (ltitoolsTarget[i][j] == 'tab')) {
-                                    document.getElementById(windiv).style.display = 'block';
-                                } else {
-                                    document.getElementById(windiv).style.display = 'none';
-                                }
-                                if (document.getElementById(linktextdiv)) {
-                                    if (ltitoolsLink[i][j]) {
-                                        document.getElementById(linktextdiv).style.display = 'inline';
-                                    } else {
-                                        document.getElementById(linktextdiv).style.display = 'none';
-                                    }
-                                }
-                                if (document.getElementById(linktextinput)) {
-                                    if (ltitoolsLink[i][j]) {
-                                        document.getElementById(linktextinput).value = ltitoolsLinkDef[i][j];
-                                    } else {
-                                        document.getElementById(linktextinput).value = '';
-                                    }
-                                }
-                                if (document.getElementById(explanationdiv)) {
-                                    if (ltitoolsExplain[i][j]) {
-                                        document.getElementById(explanationdiv).style.display = 'inline';
-                                    } else {
-                                        document.getElementById(explanationdiv).style.display = 'none';
-                                    }
-                                }
-                                if (document.getElementById(explanationinput)) {
-                                    if (ltitoolsExplain[i][j]) {
-                                        document.getElementById(explanationinput).value = ltitoolsExplainDef[i][j];
-                                    } else {
-                                        document.getElementById(explananationinput).value = '';
-                                    }
-                                }
-                            }
-                            if (document.getElementById(labeldiv)) {
-                                if (ltitoolsLabel[i][j]) {
-                                    document.getElementById(labeldiv).style.display = 'inline';
-                                } else {
-                                    document.getElementById(labeldiv).style.display = 'none';
-                                }
-                            }
-                            if (document.getElementById(titlediv)) {
-                                if (ltitoolsTitle[i][j]) {
-                                    document.getElementById(titlediv).style.display = 'inline';
-                                } else {
-                                    document.getElementById(titlediv).style.display = 'none';
-                                }
-                            }
-                            if (document.getElementById(appenddiv)) {
-                                if (ltitoolsAppend[i][j]) {
-                                    document.getElementById(appenddiv).style.display = 'inline';
-                                    if (document.getElementById(providerurl)) {
-                                        if ((ltitoolsUrl[i][j] != '') && (ltitoolsUrl[i][j] != null)) {
-                                            document.getElementById(providerurl).innerHTML = '&nbsp;('+ltitoolsUrl[i][j]+')<br />';
-                                        }
-                                    }
-                                } 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;
+                        }
+                        if (ltitoolsTarget[j] == 'window') {
+                            dimen = 'block';
+                            dimenwidth = ltitoolsWidth[j];
+                            dimenheight = ltitoolsHeight[j];                    
+                        } else {
+                            dimen = 'none';
+                            dimenwidth = '';
+                            dimenheight = '';
+                        }
+                        if (document.getElementById(dimendiv)) {
+                            document.getElementById(dimendiv).style.display = dimen;
+                        }
+                        if (document.getElementById(widthinput)) {
+                            document.getElementById(widthinput).value = dimenwidth;
+                        }
+                        if (document.getElementById(heightinput)) {
+                            document.getElementById(heightinput).value = dimenheight;
                         }
                     }
+                    break;
                 }
             }
         }
     }
 }
 
-function updateTooldim(form,dimendiv,windiv,widthinput,heightinput,linkinput,explaininput) {
+function updateTooldim(form,dimendiv,widthinput,heightinput) {
     if (form.exttooltarget.length) {
         for (var i=0; i<form.exttooltarget.length; i++) {
             if (form.exttooltarget[i].checked) {
                 var dimen = 'none';
-                var linkconf = 'none';
                 if (form.exttooltarget[i].value == 'window') {
                     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(dimendiv)) {
                     document.getElementById(dimendiv).style.display = dimen;
                 }
-                if (document.getElementById(windiv)) {
-                    document.getElementById(windiv).style.display = linkconf;
-                }
                 break;
             }
         }