From 76cd0d8938a31f69829d7384b7d3c86a12692a30 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 27 Jul 2008 03:50:05 +0000
Subject: Add inline print style css output code and switch nifty to it.

---
 usr/local/www/guiconfig.inc | 14 ++++++++++++++
 usr/local/www/head.inc      | 16 +++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 271e017..cda5e0e 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -813,6 +813,20 @@ function outputJavaScriptFileInline($javascript) {
 }
 
 
+
+function outputCSSPrintFileInline($css) {
+	if(file_exists($css)) {
+		echo "\n<style media=\"print\" type=\"text/css\">\n";
+		include($css);
+		echo "\n</style>\n";
+	} else {
+		echo "<p/>ERROR!  COULD NOT LOCATE $css";
+		echo "<p/>Please contact webmaster.";
+		exit;
+	}
+}
+
+
 function outputCSSFileInline($css) {
 	if(file_exists($css)) {
 		echo "\n<style type=\"text/css\">\n";
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index 7af1867..b6386f9 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -23,15 +23,13 @@ $pagetitle = gentitle( $pgtitle );
         <?php else: ?>
         	<link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" />
         <?php endif; ?>
-
-	<?php outputCSSFileInline("niftycssCode.css"); ?>
-	<link rel="stylesheet" type="text/css" href="niftycssprintCode.css" media="print">
-	<?php outputJavaScriptFileInline("niftyjsCode.js"); ?>
-	<script type="text/javascript">
-		var theme = "<?php echo $g['theme']; ?>";
-	</script>
-	<?php outputJavaScriptFileInline("themes/{$g['theme']}/loader.js"); ?>
-
+		<?php outputCSSFileInline("niftycssCode.css"); ?>
+		<?php outputCSSPrintFileInline("niftycssprintCode.css"); ?>	
+		<?php outputJavaScriptFileInline("niftyjsCode.js"); ?>
+		<script type="text/javascript">
+			var theme = "<?php echo $g['theme']; ?>";
+		</script>
+		<?php outputJavaScriptFileInline("themes/{$g['theme']}/loader.js"); ?>
 <?
 
 	/*
-- 
cgit v1.1