Project

General

Profile

« Previous | Next » 

Revision f6f6947e

Added by Scott Ullrich over 15 years ago

Stop using the inline output function to include javascript and css files. Even with this function speeding up embedded installs it slows down all installation via WAN links since it is loading so much data on every request.

View differences:

usr/local/www/head.inc
33 33 
	<link rel="apple-touch-icon" href="/themes/<?php echo $g['theme']; ?>/apple-touch-icon.png"/>
34 34 
        <?php if (strpos($_SERVER["SCRIPT_FILENAME"], "wizard.php") !== false &&
35 35 
                  file_exists("{$g['www_path']}/themes/{$g['theme']}/wizard.css")): ?>
36 
					<?php outputCSSFileInline("{$g['www_path']}/themes/{$g['theme']}/wizard.css"); ?>
36 
					<?php echo "<style type=\"text/css\" src=\"{$g['www_path']}/themes/{$g['theme']}/wizard.css\"></style>"; ?>
37 37 
        <?php else: ?>
38 38 
        	<link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" />
39 39 
        <?php endif; ?>
40 40 
		<?php
41 41 
			if(file_exists("{$g['www_path']}/niftycssCode.css"))
42 
				outputCSSFileInline("{$g['www_path']}/niftycssCode.css");
42 
				echo "<style type=\"text/css\" src=\"{$g['www_path']}/niftycssCode.css\"></style>";
43 43 
			if(file_exists("{$g['www_path']}/niftycssprintCode.css"))
44 
				outputCSSPrintFileInline("{$g['www_path']}/niftycssprintCode.css");
44 
				echo "<style type=\"text/css\" src=\"{$g['www_path']}/niftycssprintCode.css\"></style>";
45 45 
			if(file_exists("{$g['www_path']}/javascript/niftyjsCode.js"))
46 
				outputJavaScriptFileInline("{$g['www_path']}/javascript/niftyjsCode.js");
46 
				echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/niftyjsCode.js\"></script>\n";
47 47 
		?>
48 48 
		<script type="text/javascript">
49 49 
			var theme = "<?php echo $g['theme']; ?>";
50 50 
		</script>
51 
		<?php outputJavaScriptFileInline("{$g['www_path']}/themes/{$g['theme']}/loader.js"); ?>
51 
		<?php echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/themes/{$g['theme']}/loader.js\"></script>\n"; ?>
52 52 
<?php
53 53 
		if($_GET['enablefirebuglite']) {
54 
			outputJavaScriptFileInline("{$g['www_path']}/javascript/pi.js");
55 
			outputJavaScriptFileInline("{$g['www_path']}/javascript/firebug-lite.js");
54 
			echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/pi.js\"></script>\n";
55 
			echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/firebug-lite.js\"></script>\n";
56 56 
		}
57 
		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/prototype.js");
58 
		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/scriptaculous.js");
59 
		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/effects.js");
60 
		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/dragdrop.js");
57 
		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/prototype.js\"></script>\n";
58 
		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/scriptaculous.js\"></script>\n";
59 
		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/effects.js\"></script>\n";
60 
		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/dragdrop.js\"></script>\n";
61 61 
		if(file_exists("{$g['www_path']}/javascript/global.js"))
62 
			outputJavaScriptFileInline("{$g['www_path']}/javascript/global.js");
63 

  		




  
  62
  
    
			echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/global.js\"></script>\n";


  		




  64
  63
  
    
	/*


  		




  65
  64
  
    
	 *	Find all javascript files that need to be included


  		




  66
  65
  
    
	 *	for this page ... from the arrays ... :)


  		




  ......




  72
  71
  
    
	if (is_dir($path)) {


  		




  73
  72
  
    
		if ($dh = opendir($path)) {


  		




  74
  73
  
    
			while (($file = readdir($dh)) !== false) {


  		




  75
  
  
    
		   		if (is_dir($file)) continue;


  		




  76
  
  
    
				//echo "\t".'<script type="text/javascript" src="/javascript/'.$dir.'/'.$file.'"></script>'."\n";


  		




  77
  
  
    
				outputJavaScriptFileInline("{$g['www_path']}/javascript/{$dir}/{$file}"); 


  		




  
  74
  
    
		   		if (is_dir($file)) 


  		




  
  75
  
    
					continue;


  		




  
  76
  
    
				echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/{$dir}/{$file}\"></script>\n";


  		




  78
  77
  
    
			}


  		




  79
  78
  
    
			closedir($dh);


  		




  80
  79
  
    
		}


  		












  

    
      usr/local/www/index.php
    
  





  424
  424
  
    
## Set Page Title and Include Header


  		




  425
  425
  
    
$pgtitle = array("{$g['product_name']} Dashboard");


  		




  426
  426
  
    
include("head.inc");


  		




  427
  
  
    
outputJavaScriptFileInline("javascript/domTT/domLib.js");


  		




  428
  
  
    
outputJavaScriptFileInline("javascript/domTT/domTT.js");


  		




  429
  
  
    
outputJavaScriptFileInline("javascript/domTT/behaviour.js");


  		




  430
  
  
    
outputJavaScriptFileInline("javascript/domTT/fadomatic.js");


  		




  
  427
  
    

  		




  
  428
  
    
echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/domLib.js\"></script>\n";


  		




  
  429
  
    
echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/domTT.js\"></script>\n";


  		




  
  430
  
    
echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/behaviour.js\"></script>\n";


  		




  
  431
  
    
echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/fadomatic.js\"></script>\n";


  		




  
  432
  
    

  		




  431
  433
  
    
?>


  		




  432
  434
  
    

  		




  433
  435
  
    
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">


  		












Also available in:  Unified diff