--- loncom/xml/londefdef.pm 2014/08/24 23:38:30 1.453
+++ 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.453 2014/08/24 23:38:30 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 .= '
';
+ if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+ my $uri = $env{'request.uri'};
+ my $daxeurl = '/daxepage'.$uri;
+ $result .= '';
+ }
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
if ($url =~ /\.html?$/i) {
@@ -1735,7 +1741,7 @@ sub start_a {
} elsif ($env{'request.course.id'}) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) {
+ if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) {
my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
if ($cleanhref) {
&Apache::lonxml::extlink($cleanhref);
@@ -2811,7 +2817,7 @@ sub start_img {
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
- #if original bmp/gif/jpg/png file exist do following:
+ #if original bmp/gif/jpg/png/svg file exist do following:
my $origsrc=$src;
my ($path,$file) = &get_eps_image($src);
# &Apache::lonnet::logthis("Image source: $src result: $path $file");
@@ -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;
}
@@ -4325,8 +4331,8 @@ sub get_eps_image {
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
}
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
- my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i);
- $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i;
+ my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i);
+ $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i;
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("Filelocation gives: $src");
if (! -e $src) {
@@ -4612,7 +4618,7 @@ sub clean_docs_httpref {
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
}
my $cleanhref;
- if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/docs/\E)(.+/)[^/]+$}) {
+ if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) {
my $prefix = $1;
my $relpath = $2;
my ($hrefpath,$fname);
@@ -4765,7 +4771,8 @@ described at http://www.lon-capa.org.
Output:
returns an absolute URL constructed from the href provided, and the calling context.
- (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/).
+ (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or
+ /uploaded/$cdom/$cnum/supplemental/).
=back