--- rat/lonwrapper.pm	2017/04/22 16:15:13	1.59
+++ rat/lonwrapper.pm	2017/04/25 22:19:03	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.59 2017/04/22 16:15:13 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.60 2017/04/25 22:19:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@ use LONCAPA qw(:DEFAULT :match);;
 
 # ================================================================ Main Handler
 sub wrapper {
-    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_;
+    my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title) = @_;
 
     my $forcereg;
     unless ($env{'form.folderpath'}) {
@@ -100,10 +100,16 @@ sub wrapper {
             }
             $output .= '<a href="'.$url.'">'.&mt('Link to PDF (for mobile devices)').'</a>';
         } elsif ($exttool eq 'window') {
+            if ($linktext eq '') {
+                $linktext = &mt('Launch External Tool');
+            }
             $output .= '<div>'.
                        '<a href="'.$url.'" target="LC_LTI" style="padding:0;clear:both;margin:0;border:0">'.
-                       &mt('Launch External Tool').'</a>'.
+                       $linktext.'</a>'.
                        '</div>';
+            if ($explanation ne '') {
+                $output .= '<div>'.$explanation.'</div>';
+            }
         } else {
             $output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
                        '<iframe src="'.$url.$anchor.'" height="100%" width="100%" frameborder="0">'."\n".
@@ -164,7 +170,8 @@ sub handler {
     return OK if $r->header_only;
 
     my $url = $r->uri;
-    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname);
+    my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
+        $linktext,$explanation);
 
     for ($url){
         s|^/adm/wrapper||;
@@ -181,9 +188,12 @@ sub handler {
         $cnum = $2;
         my $marker = $3;
         $exttool = 'iframe';
-        my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target'],$cdom,$cnum);
+        my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation'],
+                                            $cdom,$cnum);
         if ($toolhash{'target'} eq 'window') {
-           $exttool = 'window'; 
+            $exttool = 'window'; 
+            $linktext = $toolhash{'linktext'}; 
+            $explanation = $toolhash{'explanation'};
         }
     }
     if (($is_ext) || ($exttool)) {
@@ -258,7 +268,7 @@ sub handler {
             &Apache::lonenc::check_encrypt(\$url);
         }
 
-        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool) );
+        $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation) );
 
     } # not just the menu