--- loncom/interface/lonextresedit.pm	2016/01/26 14:30:25	1.9
+++ loncom/interface/lonextresedit.pm	2018/01/31 14:51:05	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.9 2016/01/26 14:30:25 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.24 2018/01/31 14:51:05 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 = '<input type="hidden" name="folderpath" value="'.
@@ -146,7 +146,7 @@ sub process_changes {
         $oldtitle = &unescape($env{'form.title'});
         $container = 'sequence';
         $supplementalflag = 1;
-        if ($oldurl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) {
+        if ($oldurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
             $type = 'tool';
         } else {
             $type = 'ext';
@@ -157,10 +157,13 @@ sub process_changes {
     if ($env{'form.importdetail'}) {
         ($newtitle,$newurl,$newidx) =
             map {&unescape($_)} split(/\=/,$env{'form.importdetail'});
-        if ($newurl =~ m{^(/adm/$cdom/$cnum/(\d+)/exttools?)\:?(.*)$}) {
+        if ($newurl =~ m{^(/adm/$cdom/$cnum/(\d+)/ext\.tool)\:?(.*)$}) {
             $newurl = $1;
             $marker = $2;
             $args = $3;
+            if ((!$symb) && (!$supplementalflag)) {
+                $symb = "uploaded/$cdom/$cnum/$folder.$container"."___$newidx"."___adm/$cdom/$cnum/$marker/ext.tool";
+            }
         }
     }
     if ($supplementalflag) {
@@ -170,7 +173,7 @@ sub process_changes {
     }
     if ($folder && $container) {
         if ($env{'form.importdetail'}) {
-            my ($errtext,$fatal,$mismatchedid,@imports);
+            my ($errtext,$fatal,$mismatchedid,$needreload,$newgradable,@imports);
             if (!$supplementalflag) {
                 if (($oldidx) && ($oldidx != $newidx)) {
                     $mismatchedid = 1;
@@ -181,9 +184,27 @@ sub process_changes {
             } elsif (($newtitle eq $oldtitle) && ($newurl eq $oldurl)) {
                 if ($type eq 'tool') {
                     if ($args) {
-                        ($updated,$errormsg) = &update_exttool($marker,$cdom,$cnum,$args);
-                        unless ($updated) {
-                            $output = &mt('No change');      
+                        ($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');
                         }
                     } else {
                         $output = &mt('No change');
@@ -202,13 +223,25 @@ sub process_changes {
                     my $ext = 'true';
                     if ($type eq 'tool') {
                         if ($args) {
-                            ($updated,$errormsg) = &update_exttool($marker,$cdom,$cnum,$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;
+                            }
                         }
                         $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);
+                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,$dotimeupdate);
                     if ($errtext) {
                         $errormsg = &mt('Update failed: [_1].',$errtext);
                     } else {
@@ -230,19 +263,24 @@ sub process_changes {
                                     &Apache::lonnet::devalidate_title_cache($symb);
                                 }
                             }
-                        }
-                        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);
-                            }
+                            $needreload = 1;
                         }
                     }
                 }
             }
+            if ($needreload) {
+                my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+                if ($ferr) {
+                    $errormsg = &mt('Reload failed: [_1].',$ferr);
+                } else {
+                    &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');
         }
@@ -257,40 +295,71 @@ sub process_changes {
 }
 
 sub update_exttool {
-    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 ($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 %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-    foreach my $item ('target','width','height') {
+    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle','crsappend','gradable') {
         $newhash{$item} =~ s/^\s+//;
         $newhash{$item} =~ s/\s+$//;
-        unless ($item eq 'target') {
+        if (($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) {
             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 '') {
-                delete($toolhash{$item});
+                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;
+                }
             } 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);
         }
     }
-    return ($changed,$errormsg);
+    if (@deleted) {
+        &Apache::lonnet::del('exttool_'.$marker,\@deleted,$cdom,$cnum);
+    }
+    return ($changed,$newgradable,$errormsg);
 }
 
 sub extedit_form {
     my ($supplementalflag,$residx,$orig_url,$orig_title,$pathitem,$helpitem,$caller,
-        $symb,$type,$cdom,$cnum,$ltitools) = @_;
+        $symb,$type,$cdom,$cnum,$ltitools,$disabled) = @_;
     if ($type ne 'tool') {
         $type = 'ext';
     }
@@ -313,14 +382,26 @@ sub extedit_form {
         $tabid = 'ee';
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
-        $legend,$urlelem,$toolelem,%toolattr);
+        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
+        $appendstyle,$gradablestyle,$legend,$urlelem,$toolelem,%toolattr);
     $formname = 'new'.$type;
     $toggle = $type;
     $fieldsetid = 'upload'.$type.'form';
     $urlid = $type.'url';
-    map { $toolattr{$_} = $type.$_; } ('dispdiv','dimendiv','dimenwidth','dimenheight');
+    map { $toolattr{$_} = $type.$_; } ('dispdiv','dimendiv','dimenwidth','dimenheight',
+                                       'crstitlediv','crslabeldiv','crsappenddiv',
+                                       'gradablediv','crstitle','crslabel','crsappend',
+                                       'windiv','linktextdiv','explanationdiv',
+                                       'linktext','explanation','providerurl');
     $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';
     if ($supplementalflag) {
         $formname = 'newsupp'.$type;
         $toggle = 'supp'.$type;
@@ -328,14 +409,20 @@ sub extedit_form {
         $urlid = 'supp'.$type.'url';
         map { $toolattr{$_} = 'supp'.$toolattr{$_}; } (keys(%toolattr));
     }
-    my ($link,$legend,$active,$srcclass,$extsrc,$preview,$title,$save,
-        $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,%chkstate);
+    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);
     $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{'ee'};
             } else {
@@ -362,7 +449,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'".');">'.$lt{'pr'}.'</a>';
+            $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid','$protocol'".');">'.$lt{'pr'}.'</a>';
         }
         $title = '<span class="LC_docs_ext_edit">'.$lt{'ti'}.'&nbsp;</span>';
         $save = $lt{'sv'};
@@ -384,27 +471,26 @@ 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'".');" />';
+            $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid','$protocol'".');"'.$disabled.' />';
             $save = $lt{'al'};
         } else {
             $orig_title = $lt{'et'};
             $save = $lt{'at'};
-            $orig_url = "/adm/$cdom/$cnum/new/exttool"; 
+            $orig_url = "/adm/$cdom/$cnum/new/ext\.tool"; 
         }
         $pathitem .= '<br />';
     }
     $formid = $formname;
     if ($type eq 'ext') {
-        $urlelem = '<input type="text" size="'.$size.'" name="exturl" id="'.$urlid.'" value="'.$orig_url.'" />';
+        $urlelem = '<input type="text" size="'.$size.'" name="exturl" id="'.$urlid.'" value="'.$orig_url.'"'.$disabled.' />';
     } else {
         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'}) {
-                    $dispdivstyle = 'display:block';
                     if (ref($ltitools) eq 'HASH') {
                         if (keys(%{$ltitools})) {
                             if (ref($ltitools->{$toolhash{'id'}}) eq 'HASH') {
@@ -414,16 +500,56 @@ sub extedit_form {
                                 if ($icon) {
                                     $image = '<img src="'.$icon.'" alt="'.$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 = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
+                                $gradablestyle = 'display:inline';
                             }
                         }
                     }
@@ -432,7 +558,7 @@ sub extedit_form {
         } else {
             $toolelem = '<span class="LC_docs_ext_edit">'."\n".
                        '<select name="exttoolid" id="LC_exttoolid" onchange="javascript:updateExttool(this,'.
-                       'this.form,'."'$supplementalflag'".');">'."\n".
+                       'this.form,'."'$supplementalflag'".');"'.$disabled.'>'."\n".
                        '<option value="" selected="selected">'.&mt('Select').'</option>';
             my %bynum;
             if (ref($ltitools) eq 'HASH') {
@@ -452,19 +578,55 @@ sub extedit_form {
                     }
                 }
             }
-            $toolelem .= '</select></span>';
+            $toolelem .= '</select></span><br />';
+            $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
+            $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
+            $crsappend = '';
+            $chknogrd = ' checked="checked"';
         }
         $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{dimenwidth}','$toolattr{dimenheight}'".');">'.&mt('iframe').'</label>'.('&nbsp;'x2).
+                    "'$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).
                     '<label><input type="radio" name="exttooltarget" value="window" '.$chkstate{'window'}.'onclick="updateTooldim(this.form,'.
-                    "'$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".
+                    "'$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".
                     '</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') {
@@ -487,11 +649,11 @@ $chooser
 <div>
 <span$srcclass>
 $title
-<input type="text" size="$size" name="exttitle" value="$orig_title" />
+<input type="text" size="$size" name="exttitle" value="$orig_title" $disabled />
 <input type="hidden" name="importdetail" value="" />
 $pathitem
 $hiddenelem
-<input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx','$type','$orig_url');" />
+<input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx','$type','$orig_url','$supplementalflag');" $disabled />
 </span>
 </div>
 </fieldset>
@@ -505,8 +667,8 @@ ENDFORM
 }
 
 sub display_editor {
-    my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum) = @_;
-    my ($residx,$supplementalflag,$title,$pathitem,$output,$js);
+    my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum,$hostname) = @_;
+    my ($residx,$supplementalflag,$title,$pathitem,$output,$js,$navmap);
     if ($folderpath =~ /^supplemental/) {
         $supplementalflag = 1;
         $residx = $idx;
@@ -516,15 +678,18 @@ 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);
+        my $path = &Apache::loncommon::symb_to_docspath($symb,\$navmap);
         $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
     }
     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'} };
+    if ($hostname) {
+        $args->{'hostname'} = $hostname;
+    }
     my $description = 'External Resource Editor';
     if ($type eq 'tool') {
         $description = 'External Tool Editor';
@@ -543,19 +708,57 @@ 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"; 
+                   "        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})) {
-                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";
+            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";
+                }
+
                 $i++;
             }
         }
@@ -575,7 +778,7 @@ ENDREGEXP
 
 var regexp = $urlregexp;
 
-function setExternal(extform,residx,type,exttoolurl) {
+function setExternal(extform,residx,type,exttoolurl,supplementalflag) {
     var title=extform.exttitle.value;
     if (!String.trim) {
         String.prototype.trim = function() {return this.replace(\/^\\s+|\\s+$\/g, "");};    }
@@ -610,20 +813,123 @@ function setExternal(extform,residx,type
             }
             info += ':'+toolid;
         }
-        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';
+        var prefix = '';
+        if (supplementalflag == 1) {
+           prefix = 'supp';
+        }
+        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 += ':::';
+        }
+        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;
+                        }
                     }
+                } else {
+                    info += ':';
                 }
+            } else {
+                info += ':';
             }
+        } else {
+            info += ':';
         }
         info=escape(info);
         if (residx > 0) {
@@ -648,11 +954,16 @@ function editext(residx,type) {
     return;
 }
 
-function extUrlPreview(caller) {
+function extUrlPreview(caller,protocol) {
     if (document.getElementById(caller)) {
         var url = document.getElementById(caller).value;
         if (regexp.test(url)) {
-            openMyModal(url,500,400,'yes');
+            var http_regex = /^http\:\/\//gi;
+            if ((protocol == 'https') && (http_regex.test(url))) {
+                window.open(url,"externalpreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
+            } else {
+                openMyModal(url,500,400,'yes');
+            }
         } else {
             alert("$js_lt{'invurl'}");
         }
@@ -666,8 +977,21 @@ function updateExttool(caller,form,suppl
     }
     dispdiv = prefix+'tooldispdiv';
     dimendiv = prefix+'tooldimendiv';
-    widthinput = prefix+'toolwidth';
-    heightinput = prefix+'toolheight';
+    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';
     if (document.getElementById(dispdiv)) {
         var toolpick = caller.options[caller.selectedIndex].value;
         $toolsjs
@@ -678,65 +1002,171 @@ function updateExttool(caller,form,suppl
             if (document.getElementById(dimendiv)) {
                 document.getElementById(dimendiv).style.display = 'none';
             }
-        } else {
-            if (document.getElementById(dispdiv)) {
-                document.getElementById(dispdiv).style.display = 'block';
+            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 {
             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(dispdiv)) {
+                            if (ltitoolsDisplay[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[j]) {
+                                            form.exttooltarget[k].checked = true;
+                                            break;
+                                        }
+                                    }
                                 }
                             }
+                            var dimen = 'none';
+                            var dimenwidth = '';
+                            var dimenheight = '';
+                            if ((ltitoolsDisplay[j]) && (ltitoolsTarget[j] == 'window')) {
+                                dimen = 'block';
+                                dimenwidth = ltitoolsWidth[j];
+                                dimenheight = ltitoolsHeight[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 (ltitoolsTarget[j] == 'window') {
-                            dimen = 'block';
-                            dimenwidth = ltitoolsWidth[j];
-                            dimenheight = ltitoolsHeight[j];                    
-                        } else {
-                            dimen = 'none';
-                            dimenwidth = '';
-                            dimenheight = '';
+                        if (document.getElementById(windiv)) {
+                            if ((ltitoolsTarget[j] == 'window') || (ltitoolsTarget[j] == 'tab')) {
+                                document.getElementById(windiv).style.display = 'block';
+                            } else {
+                                document.getElementById(windiv).style.display = 'none';
+                            }
+                            if (document.getElementById(linktextdiv)) {
+                                if (ltitoolsLink[j]) {
+                                    document.getElementById(linktextdiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(linktextdiv).style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById(linktextinput)) {
+                                if (ltitoolsLink[j]) {
+                                    document.getElementById(linktextinput).value = ltitoolsLinkDef[j]; 
+                                } else {
+                                    document.getElementById(linktextinput).value = '';
+                                }
+                            }
+                            if (document.getElementById(explanationdiv)) {
+                                if (ltitoolsExplain[j]) {
+                                    document.getElementById(explanationdiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(explanationdiv).style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById(explanationinput)) {
+                                if (ltitoolsExplain[j]) {
+                                    document.getElementById(explanationinput).value = ltitoolsExplainDef[j];
+                                } else {
+                                    document.getElementById(explananationinput).value = '';
+                                }
+                            }
                         }
-                        if (document.getElementById(dimendiv)) {
-                            document.getElementById(dimendiv).style.display = dimen;
+                        if (document.getElementById(labeldiv)) {
+                            if (ltitoolsLabel[j]) {
+                                document.getElementById(labeldiv).style.display = 'inline';
+                            } else {
+                                document.getElementById(labeldiv).style.display = 'none';
+                            } 
                         }
-                        if (document.getElementById(widthinput)) {
-                            document.getElementById(widthinput).value = dimenwidth;
+                        if (document.getElementById(titlediv)) {
+                            if (ltitoolsTitle[j]) {
+                                document.getElementById(titlediv).style.display = 'inline';
+                            } else {
+                                document.getElementById(titlediv).style.display = 'none';
+                            }
                         }
-                        if (document.getElementById(heightinput)) {
-                            document.getElementById(heightinput).value = dimenheight;
+                        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 = '&nbsp;('+ltitoolsUrl[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;
                     }
-                    break;
                 }
             }
         }
     }
 }
 
-function updateTooldim(form,dimendiv,widthinput,heightinput) {
+function updateTooldim(form,dimendiv,windiv,widthinput,heightinput,linkinput,explaininput) {
     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 (document.getElementById(widthinput)) {
-                        document.getElementById(widthinput).value = '';
-                    }
-                    if (document.getElementById(heightinput)) {
-                        document.getElementById(heightinput).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)) {
                     document.getElementById(dimendiv).style.display = dimen;
                 }
+                if (document.getElementById(windiv)) {
+                    document.getElementById(windiv).style.display = linkconf;
+                }
                 break;
             }
         }