--- loncom/interface/lonextresedit.pm	2017/03/08 02:51:08	1.15
+++ loncom/interface/lonextresedit.pm	2017/04/25 22:18:59	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.15 2017/03/08 02:51:08 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.16 2017/04/25 22:18:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,14 +260,16 @@ sub update_exttool {
     my ($marker,$cdom,$cnum,$args) = @_;
     my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
     my (%newhash,$changed,@deleted,$errormsg);
-    ($newhash{'target'},$newhash{'width'},$newhash{'height'},$newhash{'crslabel'},$newhash{'crstitle'}) = split(/:/,$args);
-    $newhash{'crslabel'} = &unescape($newhash{'crslabel'});
-    $newhash{'crstitle'} = &unescape($newhash{'crstitle'});
+    ($newhash{'target'},$newhash{'width'},$newhash{'height'},$newhash{'linktext'},$newhash{'explanation'},
+     $newhash{'crslabel'},$newhash{'crstitle'}) = split(/:/,$args);
+    foreach my $item ('linktext','explanation','crslabel','crstitle') {
+        $newhash{$item} = &unescape($newhash{$item});
+    }
     my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-    foreach my $item ('target','width','height','crslabel','crstitle') {
+    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle') {
         $newhash{$item} =~ s/^\s+//;
         $newhash{$item} =~ s/\s+$//;
-        if (($item eq 'width') || ($item eq 'height')) {
+        if (($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) {
             if ($newhash{'target'} eq 'iframe') {
                 $newhash{$item} = '';
             }
@@ -275,7 +277,7 @@ sub update_exttool {
         if ($toolhash{$item} ne $newhash{$item}) {
             if ($newhash{$item} eq '') {
                 unless (($item eq 'target') ||
-                        ((($item eq 'width') || ($item eq 'height')) &&
+                        ((($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) &&
                          (($newhash{'target'} eq 'window') || 
                           (($newhash{'target'} eq '') && ($toolhash{'target'} eq 'window'))))) {
                     delete($toolhash{$item});
@@ -325,15 +327,21 @@ sub extedit_form {
         $tabid = 'ee';
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
-        $labelstyle,$titlestyle,$legend,$urlelem,$toolelem,%toolattr);
+        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
+        $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','crstitle','crslabel');
+                                       'crstitlediv','crslabeldiv','crstitle','crslabel',
+                                       'windiv','linktextdiv','explanationdiv','linktext', 
+                                       'explanation');
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
+    $windivstyle = 'display:none';
+    $linktextstyle = 'display:none';
+    $explanationstyle = 'display:none';
     $labelstyle = 'display:none';
     $titlestyle = 'display:none';
     if ($supplementalflag) {
@@ -344,14 +352,19 @@ sub extedit_form {
         map { $toolattr{$_} = 'supp'.$toolattr{$_}; } (keys(%toolattr));
     }
     my ($link,$legend,$active,$srcclass,$extsrc,$preview,$title,$save,$crstitle,$crslabel,
-        $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,%chkstate);
+        $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,
+        $linktext,$explanation,%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 {
@@ -432,12 +445,15 @@ sub extedit_form {
                                 $tooltarget = $toolhash{'target'};
                                 if ($tooltarget eq 'window') {
                                     $dimendivstyle = 'display:block';
+                                    $windivstyle = 'display:block';
                                     $chkstate{'window'} = 'checked="checked" ';
                                 } else {
                                     $chkstate{'iframe'} = 'checked="checked" ';
                                 }
                                 $width = $toolhash{'width'};
                                 $height = $toolhash{'height'};
+                                $linktext = $toolhash{'linktext'};
+                                $explanation = $toolhash{'explanation'};
                                 if (ref($ltitools->{$toolhash{'id'}}->{'crsconf'}) eq 'HASH') {
                                     if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'title'}) {
                                         $crstitle = $toolhash{'crstitle'};
@@ -450,6 +466,12 @@ sub extedit_form {
                                     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 />';
                             }
@@ -487,21 +509,31 @@ sub extedit_form {
         $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}'".');"'.$disabled.'>'.&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="window" '.$chkstate{'window'}.'onclick="updateTooldim(this.form,'.
-                    "'$toolattr{dimendiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}'".');"'.$disabled.'>'.&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.'"'.$disabled.'>'.('&nbsp;'x2).
-                    &mt('Height').'<input type="text" id="'.$toolattr{'dimenheight'}.'" name="exttoolheight" value="'.$height.'"'.$disabled.'></span>'."\n".
-                    '</div></div>'.
-                    '<div id="'.$toolattr{'crslabeldiv'}.'" style="'.$labelstyle.'">'.
+                    "'$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.'><br />'.
+                    '<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.'><br />'.
+                    '<input type="text" id="'.$toolattr{'crstitle'}.'" name="exttooltitle" value="'.$crstitle.'"'.$disabled.' /></span><br />'.
                     '</div>';
     }
     my $chooser = $toolelem;
@@ -587,23 +619,36 @@ sub extedit_javascript {
                    "        var ltitoolsTarget = new Array($num);\n".
                    "        var ltitoolsWidth = new Array($num);\n".
                    "        var ltitoolsHeight = new Array($num);\n".
+                   "        var ltitoolsLinkDef = new Array($num);\n".
+                   "        var ltitoolsExplainDef = new Array($num);\n".
                    "        var ltitoolsDisplay = new Array($num);\n".
+                   "        var ltitoolsLink = new Array($num);\n".
+                   "        var ltitoolsExplain = new Array($num);\n".
                    "        var ltitoolsLabel = new Array($num);\n".
                    "        var ltitoolsTitle = new Array($num);\n";
         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";
-                my %courseconfig;
+            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'};
+                    $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";
+                }
                 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'};
@@ -668,8 +713,10 @@ function setExternal(extform,residx,type
            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') {
@@ -681,7 +728,7 @@ function setExternal(extform,residx,type
                                 width.trim();
                                 var height = extform.exttoolheight.value;
                                 height.trim();
-                                info += ':window:'+width+':'+height;  
+                                info += ':window:'+width+':'+height;
                             } else {
                                 info += ':iframe::';
                             }
@@ -694,6 +741,34 @@ function setExternal(extform,residx,type
         } 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';
         if (residx > 0) {
@@ -760,12 +835,17 @@ 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';
     labelinput = prefix+'toolcrslabel';
     titleinput = prefix+'toolcrstitle';
+    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
@@ -776,6 +856,15 @@ 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';
             }
@@ -797,23 +886,57 @@ function updateExttool(caller,form,suppl
                                         }
                                     }
                                 }
-                                if (ltitoolsTarget[j] == 'window') {
-                                    dimen = 'block';
-                                    dimenwidth = ltitoolsWidth[j];
-                                    dimenheight = ltitoolsHeight[j];                    
+                            }
+                            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 (document.getElementById(windiv)) {
+                            if (ltitoolsTarget[j] == 'window') {
+                                document.getElementById(windiv).style.display = 'block';
+                            } else {
+                                document.getElementById(windiv).style.display = 'none';
+                            }
+                            if (document.getElementById(linktextdiv)) {
+                                if ((ltitoolsLink[j]) && (ltitoolsTarget[j] == 'window')) {
+                                    document.getElementById(linktextdiv).style.display = 'inline';
                                 } else {
-                                    dimen = 'none';
-                                    dimenwidth = '';
-                                    dimenheight = '';
+                                    document.getElementById(linktextdiv).style.display = 'none';
                                 }
-                                if (document.getElementById(dimendiv)) {
-                                    document.getElementById(dimendiv).style.display = dimen;
+                            }
+                            if (document.getElementById(linktextinput)) {
+                                if ((ltitoolsLink[j]) && (ltitoolsTarget[j] == 'window')) {
+                                    document.getElementById(linktextinput).value = ltitoolsLinkDef[j]; 
+                                } else {
+                                    document.getElementById(linktextinput).value = '';
                                 }
-                                if (document.getElementById(widthinput)) {
-                                    document.getElementById(widthinput).value = dimenwidth;
+                            }
+                            if (document.getElementById(explanationdiv)) {
+                                if ((ltitoolsExplain[j]) && (ltitoolsTarget[j] == 'window')) {
+                                    document.getElementById(explanationdiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(explanationdiv).style.display = 'none';
                                 }
-                                if (document.getElementById(heightinput)) {
-                                    document.getElementById(heightinput).value = dimenheight;
+                            }
+                            if (document.getElementById(explanationinput)) {
+                                if ((ltitoolsExplain[j]) && (ltitoolsTarget[j] == 'window')) {
+                                    document.getElementById(explanationinput).value = ltitoolsExplainDef[j];
+                                } else {
+                                    document.getElementById(explananationinput).value = '';
                                 }
                             }
                         }
@@ -839,13 +962,15 @@ function updateExttool(caller,form,suppl
     }
 }
 
-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 = '';
@@ -853,10 +978,19 @@ function updateTooldim(form,dimendiv,wid
                     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;
             }
         }