diff options
author | Bill Marquette <bill.marquette@gmail.com> | 2009-03-14 14:41:04 -0500 |
---|---|---|
committer | Bill Marquette <bill.marquette@gmail.com> | 2009-03-14 14:41:04 -0500 |
commit | 625dcc400cea74155d426e620d7e4a5bf109e93b (patch) | |
tree | 14ba73db8c3d1e33b9d8bafa99a40bed5630ad6a /usr/local/www/head.inc | |
parent | d3bc15eae54618efba3214984fba6b79e0a6456e (diff) | |
download | pfsense-625dcc400cea74155d426e620d7e4a5bf109e93b.zip pfsense-625dcc400cea74155d426e620d7e4a5bf109e93b.tar.gz |
Massive javascript cleanup, all .js files now live in $g['www_path']/javascript
Purged unused JS
Diffstat (limited to 'usr/local/www/head.inc')
-rwxr-xr-x | usr/local/www/head.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc index 44807c1..47fcd19 100755 --- a/usr/local/www/head.inc +++ b/usr/local/www/head.inc @@ -28,33 +28,33 @@ $pagetitle = gentitle( $pgtitle ); <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <?php if (strpos($_SERVER["SCRIPT_FILENAME"], "wizard.php") !== false && file_exists("{$g['www_path']}/themes/{$g['theme']}/wizard.css")): ?> - <?php outputCSSFileInline("themes/{$g['theme']}/wizard.css"); ?> + <?php outputCSSFileInline("{$g['www_path']}/themes/{$g['theme']}/wizard.css"); ?> <?php else: ?> <link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" /> <?php endif; ?> <?php - if(file_exists("niftycssCode.css")) - outputCSSFileInline("niftycssCode.css"); - if(file_exists("niftycssprintCode.css")) - outputCSSPrintFileInline("niftycssprintCode.css"); - if(file_exists("niftyjsCode.js")) - outputJavaScriptFileInline("niftyjsCode.js"); + if(file_exists("{$g['www_path']}/niftycssCode.css")) + outputCSSFileInline("{$g['www_path']}/niftycssCode.css"); + if(file_exists("{$g['www_path']}/niftycssprintCode.css")) + outputCSSPrintFileInline("{$g['www_path']}/niftycssprintCode.css"); + if(file_exists("{$g['www_path']}/javascript/niftyjsCode.js")) + outputJavaScriptFileInline("{$g['www_path']}/javascript/niftyjsCode.js"); ?> <script type="text/javascript"> var theme = "<?php echo $g['theme']; ?>"; </script> - <?php outputJavaScriptFileInline("themes/{$g['theme']}/loader.js"); ?> + <?php outputJavaScriptFileInline("{$g['www_path']}/themes/{$g['theme']}/loader.js"); ?> <?php if($_GET['enablefirebuglite']) { - outputJavaScriptFileInline("javascript/pi.js"); - outputJavaScriptFileInline("javascript/firebug-lite.js"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/pi.js"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/firebug-lite.js"); } - outputJavaScriptFileInline("javascript/scriptaculous/prototype.js"); - outputJavaScriptFileInline("javascript/scriptaculous/scriptaculous.js"); - outputJavaScriptFileInline("javascript/scriptaculous/effects.js"); - outputJavaScriptFileInline("javascript/scriptaculous/dragdrop.js"); - if(file_exists("javascript/global.js")) - outputJavaScriptFileInline("javascript/global.js"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/prototype.js"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/scriptaculous.js"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/effects.js"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/dragdrop.js"); + if(file_exists("{$g['www_path']}/javascript/global.js")) + outputJavaScriptFileInline("{$g['www_path']}/javascript/global.js"); /* * Find all javascript files that need to be included @@ -63,13 +63,13 @@ $pagetitle = gentitle( $pgtitle ); */ $dir = trim(basename($_SERVER["SCRIPT_FILENAME"]), '.php'); - $path = "/usr/local/www/javascript/" . $dir . "/"; + $path = "{$g['www_path']}/javascript/" . $dir . "/"; if (is_dir($path)) { if ($dh = opendir($path)) { while (($file = readdir($dh)) !== false) { if (is_dir($file)) continue; //echo "\t".'<script type="text/javascript" src="/javascript/'.$dir.'/'.$file.'"></script>'."\n"; - outputJavaScriptFileInline("javascript/{$dir}/{$file}"); + outputJavaScriptFileInline("{$g['www_path']}/javascript/{$dir}/{$file}"); } closedir($dh); } |