--- loncom/interface/londocs.pm	2020/03/01 15:39:17	1.667
+++ loncom/interface/londocs.pm	2020/03/03 01:16:35	1.668
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.667 2020/03/01 15:39:17 raeburn Exp $
+# $Id: londocs.pm,v 1.668 2020/03/03 01:16:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4157,11 +4157,19 @@ END
     my ($editlink,$extresform,$anchor,$hiddenres,$nomodal);
     my $orig_url = $url;
     $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
-    $url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/};
+    if ($container eq 'page') {
+        $url=~s{^http(|s)(:|:)//}{/ext/};
+    } else {
+        $url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/};
+    }
     if (!$supplementalflag && $residx && $symb) {
         if ((!$isfolder) && (!$ispage)) {
 	    (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-	    $url=&Apache::lonnet::clutter($url);
+            if (($url =~ m{^ext/}) && ($container eq 'page')) {
+                $url=&Apache::lonnet::clutter_with_no_wrapper($url);
+            } else {
+                $url=&Apache::lonnet::clutter($url);
+            } 
 	    if ($url=~/^\/*uploaded\//) {
 	        $url=~/\.(\w+)$/;
 	        my $embstyle=&Apache::loncommon::fileembstyle($1);
@@ -4175,7 +4183,7 @@ END
 	    } elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) {
                 my $wrapped = $1;
                 my $exturl = $2;
-                if ($wrapped eq '') {
+                if (($wrapped eq '') && ($container ne 'page')) { 
                     $url='/adm/wrapper'.$url;
                 }
                 if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
@@ -4201,6 +4209,9 @@ END
                         my $escan = &escape('#');
                         $shownsymb =~ s/^([^\#]+)#([^\#]+)$/$1$escan$2/;
                     }
+                    if ($container eq 'page') {
+                        $url = &Apache::lonnet::clutter($url);
+                    }
                 }
                 unless ($env{'request.role.adv'}) {
                     if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {