--- loncom/xml/londefdef.pm	2014/09/01 19:01:08	1.455
+++ loncom/xml/londefdef.pm	2016/01/06 16:44:37	1.457
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.455 2014/09/01 19:01:08 raeburn Exp $
+# $Id: londefdef.pm,v 1.457 2016/01/06 16:44:37 damieng Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -638,6 +638,12 @@ sub edit_controls {
     }
     $result .= '
 <div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
+    if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+        my $uri = $env{'request.uri'};
+        my $daxeurl = '/daxepage'.$uri;
+        $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
+                  'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
+    }
     if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
         if ($url =~ /\.html?$/i) {
@@ -3450,7 +3456,7 @@ sub start_caption {
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
-    } 
+    }
     return $currentstring;
 }
 
@@ -3458,7 +3464,7 @@ sub end_caption {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     } 
     return $currentstring;
 }