[LON-CAPA-cvs] cvs: loncom /interface lonchatfetch.pm loncommon.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 03 Jul 2006 00:11:55 -0000 

albertel		Sun Jul  2 20:11:55 2006 EDT

  Modified files:              
    /loncom/interface	lonchatfetch.pm loncommon.pm 
  Log:
  - moving the CSS load to be the last thing done in head fixes mozilla
    being idiotic with popups and the writing / display ing of the chat
    window
  
  
Index: loncom/interface/lonchatfetch.pm
diff -u loncom/interface/lonchatfetch.pm:1.28 loncom/interface/lonchatfetch.pm:1.29
--- loncom/interface/lonchatfetch.pm:1.28	Wed Jun 28 19:56:09 2006
+++ loncom/interface/lonchatfetch.pm	Sun Jul  2 20:11:53 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat Fetching
 #
-# $Id: lonchatfetch.pm,v 1.28 2006/06/28 23:56:09 raeburn Exp $
+# $Id: lonchatfetch.pm,v 1.29 2006/07/03 00:11:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,7 @@
         if ((! &Apache::lonnet::allowed('pgc',$env{'request.course.id'}.'/'.
 				       $group)) &&
            (! &Apache::lonnet::allowed('vcg',$env{'request.course.id'}))) {
+	    
             return HTTP_NOT_ACCEPTABLE;
         }
         my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
@@ -108,13 +109,6 @@
 					   {'only_body' => 1,
 					    'bgcolor'   => '#FFFFFF',
 					    'js_ready'  => 1,});
-	# removing the CSS reference for now
-	# see BUG# 4839
-        # to fix, need to either write the whole webpage to the bottom frame
-        # everytime or store the page in a js variable somewhere.
-	# although in tryng both of these ideas, the .scroll to 
-	# the bottom seems to fail.
-	$newstuff =~ s|(<link.*?/>)||;
     }
     my @participants=();
     foreach (@entries) {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.412 loncom/interface/loncommon.pm:1.413
--- loncom/interface/loncommon.pm:1.412	Sun Jul  2 08:36:08 2006
+++ loncom/interface/loncommon.pm	Sun Jul  2 20:11:53 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.412 2006/07/02 12:36:08 raeburn Exp $
+# $Id: loncommon.pm,v 1.413 2006/07/03 00:11:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3505,7 +3505,6 @@
 
     my $result =
 	'<head>'.
-	'<link rel="stylesheet" type="text/css" href="'.$url.'" />'.
 	&font_settings().
 	&Apache::lonhtmlcommon::htmlareaheaders();
 
@@ -3526,7 +3525,8 @@
 	$title = 'The LearningOnline Network with CAPA';
     }
     
-    $result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra;
+    $result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra
+	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />';
     return $result;
 }