--- rat/lonwrapper.pm	2006/04/11 19:42:32	1.23
+++ rat/lonwrapper.pm	2008/03/03 19:57:28	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.23 2006/04/11 19:42:32 albertel Exp $
+# $Id: lonwrapper.pm,v 1.28 2008/03/03 19:57:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,8 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet;
 use Apache::lonxml();
-use Apache::lonmenu;
+use Apache::lonenc();
+use Apache::lonmenu();
 
 # ================================================================ Main Handler
 
@@ -67,7 +68,11 @@ sub wrapper {
 
     my %layout = ('border' => 0);
     if ($env{'environment.remote'} eq 'off') {
-	$layout{'rows'} = "180,*";
+        if ($env{'environment.icons'} eq 'iconsonly') {
+           $layout{'rows'} = "100,*";
+        } else {
+	   $layout{'rows'} = "200,*";
+        }
     } else {
 	$layout{'rows'} = "1,*";
 	$topurl = "/adm/rat/empty.html";
@@ -81,8 +86,12 @@ sub wrapper {
 
     my $end_page = 
 	&Apache::loncommon::end_page({'frameset' => 1});
-
-  
+    
+    foreach my $url ($topurl,$bottomurl) {
+	if ($url !~ /^http:/) {
+	    $url = &Apache::lonenc::check_encrypt($url);
+	}
+    }
 #
 # frame-based rendering for graphical interface
 #
@@ -117,7 +126,8 @@ sub handler {
     $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';
     $url=~s/^\/adm\/wrapper//;
     my $is_ext = $url =~ m|^/ext/|;
-    $url=~s/^\/ext\//http\:\/\//;
+    $url=~s{^/ext/}{http://};
+    $url=~s|http://https://|https://|;
     $url=~s|:|:|g;
 #
 # Actual URL