--- loncom/interface/loncommon.pm	2013/07/12 00:15:40	1.1139
+++ loncom/interface/loncommon.pm	2013/07/15 17:42:11	1.1140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1139 2013/07/12 00:15:40 raeburn Exp $
+# $Id: loncommon.pm,v 1.1140 2013/07/15 17:42:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7656,12 +7656,12 @@ var modalWindow = {
 		$(".LCmodal-overlay").click(function(){modalWindow.close();});
 	}
 };
-	var openMyModal = function(source,width,height,scrolling)
+	var openMyModal = function(source,width,height,scrolling,transparency,style)
 	{
 		modalWindow.windowId = "myModal";
 		modalWindow.width = width;
 		modalWindow.height = height;
-		modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='true' src='" + source + "'>&lt/iframe>";
+		modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='"+transparency+"' src='" + source + "' style='"+style+"'>&lt/iframe>";
 		modalWindow.open();
 	};	
 // END LON-CAPA Internal -->
@@ -7671,16 +7671,18 @@ ENDMODAL
 }
 
 sub modal_link {
-    my ($link,$linktext,$width,$height,$target,$scrolling,$title)=@_;
+    my ($link,$linktext,$width,$height,$target,$scrolling,$title,$transparency,$style)=@_;
     unless ($width) { $width=480; }
     unless ($height) { $height=400; }
     unless ($scrolling) { $scrolling='yes'; }
+    unless ($transparency) { $transparency='true'; }
+
     my $target_attr;
     if (defined($target)) {
         $target_attr = 'target="'.$target.'"';
     }
     return <<"ENDLINK";
-<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling'); return false;">
+<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling','$transparency','$style'); return false;">
            $linktext</a>
 ENDLINK
 }
@@ -7707,11 +7709,11 @@ sub modal_adhoc_inner {
     my ($funcname,$width,$height,$content)=@_;
     my $innerwidth=$width-20;
     $content=&js_ready(
-               &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
-                 &start_scrollbox($width.'px',$innerwidth.'px',$height.'px','modal').
-                    $content.
+                 &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
+                 &start_scrollbox($width.'px',$innerwidth.'px',$height.'px','myModal','#FFFFFF',undef,1).
+                 $content.
                  &end_scrollbox().
-               &end_page()
+                 &end_page()
              );
     return &modal_adhoc_script($funcname,$width,$height,$content);
 }
@@ -7928,13 +7930,13 @@ sub validate_page {
 
 
 sub start_scrollbox {
-    my ($outerwidth,$width,$height,$id,$bgcolor,$cursor) = @_;
+    my ($outerwidth,$width,$height,$id,$bgcolor,$cursor,$needjsready) = @_;
     unless ($outerwidth) { $outerwidth='520px'; }
     unless ($width) { $width='500px'; }
     unless ($height) { $height='200px'; }
     my ($table_id,$div_id,$tdcol);
     if ($id ne '') {
-        $table_id = " id='table_$id'";
+        $table_id = ' id="table_'.$id.'"';
         $div_id = ' id="div_'.$id.'"';
     }
     if ($bgcolor ne '') {
@@ -7942,57 +7944,8 @@ sub start_scrollbox {
     }
     my $nicescroll_js;
     if ($env{'browser.mobile'}) {
-        my %options;
-        if (ref($cursor) eq 'HASH') {
-            %options = %{$cursor};
-        }
-        unless ($options{'railalign'} =~ /^left|right$/) {
-            $options{'railalign'} = 'left';
-        }
-        unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
-            my $function  = &get_users_function();
-            $options{'cursorcolor'} = &designparm($function.'.sidebg',$env{'request.role.domain'});
-            unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
-                $options{'cursorcolor'} = '#00F';
-            }
-        }
-        if ($options{'cursoropacity'} =~ /^[\d.]+$/) {
-            unless ($options{'cursoropacity'} >= 0.0 && $options{'cursoropacity'} <=1.0) {
-                $options{'cursoropacity'}='1.0';
-            }
-        } else {
-            $options{'cursoropacity'}='1.0';
-        }
-        if ($options{'cursorfixedheight'} eq 'none') {
-            delete($options{'cursorfixedheight'});
-        } else {
-            unless ($options{'cursorfixedheight'} =~ /^\d+$/) { $options{'cursorfixedheight'}='50'; }
-        }
-        unless ($options{'railoffset'} =~ /^{[\w\:\d]+}$/) {
-            delete($options{'railoffset'});
-        } 
-        my @niceoptions;
-        while (my($key,$value) = each(%options)) {
-            if ($value =~ /^\{.+\}$/) {
-                push(@niceoptions,$key.':'.$value);
-            } else {
-                push(@niceoptions,$key.':"'.$value.'"');
-            }
-        }
-        $nicescroll_js = '
-<script type="text/javascript">
-// <![CDATA[ 
-$(document).ready(
-  function() {  
-      $("#div_'.$id.'").niceScroll({'.join(',',@niceoptions).'});
-  }
-);
-
-// ]]>
-</script>
-';
+        $nicescroll_js = &nicescroll_javascript('div_'.$id,$cursor,$needjsready);
     }
-
     return <<"END";
 $nicescroll_js
 
@@ -8005,6 +7958,87 @@ sub end_scrollbox {
     return '</div></td></tr></table>';
 }
 
+sub nicescroll_javascript {
+    my ($id,$cursor,$needjsready,$framecheck,$location) = @_;
+    my %options;
+    if (ref($cursor) eq 'HASH') {
+        %options = %{$cursor};
+    }
+    unless ($options{'railalign'} =~ /^left|right$/) {
+        $options{'railalign'} = 'left';
+    }
+    unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
+        my $function  = &get_users_function();
+        $options{'cursorcolor'} = &designparm($function.'.sidebg',$env{'request.role.domain'});
+        unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
+            $options{'cursorcolor'} = '#00F';
+        }
+    }
+    if ($options{'cursoropacity'} =~ /^[\d.]+$/) {
+        unless ($options{'cursoropacity'} >= 0.0 && $options{'cursoropacity'} <=1.0) {
+            $options{'cursoropacity'}='1.0';
+        }
+    } else {
+        $options{'cursoropacity'}='1.0';
+    }
+    if ($options{'cursorfixedheight'} eq 'none') {
+        delete($options{'cursorfixedheight'});
+    } else {
+        unless ($options{'cursorfixedheight'} =~ /^\d+$/) { $options{'cursorfixedheight'}='50'; }
+    }
+    unless ($options{'railoffset'} =~ /^{[\w\:\d\-,]+}$/) {
+        delete($options{'railoffset'});
+    }
+    my @niceoptions;
+    while (my($key,$value) = each(%options)) {
+        if ($value =~ /^\{.+\}$/) {
+            push(@niceoptions,$key.':'.$value);
+        } else {
+            push(@niceoptions,$key.':"'.$value.'"');
+        }
+    }
+    my $nicescroll_js = '
+$(document).ready(
+      function() {
+          $("#'.$id.'").niceScroll({'.join(',',@niceoptions).'});
+      }
+);
+';
+    if ($framecheck) {
+        $nicescroll_js .= '
+function expand_div(caller) {
+    if (top === self) {
+        document.getElementById("'.$id.'").style.width = "auto";
+        document.getElementById("'.$id.'").style.height = "auto";
+    } else {
+        try {
+            if (parent.frames) {
+                if (parent.frames.length > 1) {
+                    var framesrc = parent.frames[1].location.href;
+                    var currsrc = framesrc.replace(/\#.*$/,"");
+                    if ((caller == "search") || (currsrc == "'.$location.'")) {
+                        document.getElementById("'.$id.'").style.width = "auto";
+                        document.getElementById("'.$id.'").style.height = "auto";
+                    }
+                }
+            }
+        } catch (e) {
+            return;
+        }
+    }
+    return;
+}
+';
+    }
+    if ($needjsready) {
+        $nicescroll_js = '
+<script type="text/javascript">'."\n".$nicescroll_js."\n</script>\n";
+    } else {
+        $nicescroll_js = &Apache::lonhtmlcommon::scripttag($nicescroll_js);
+    }
+    return $nicescroll_js;
+}
+
 sub simple_error_page {
     my ($r,$title,$msg) = @_;
     my $page =