just making themes work a little better :)

8 files changed, 59 insertions, 17 deletions

diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc
index 41255d0..0d13063 100755
--- a/usr/local/www/fend.inc
+++ b/usr/local/www/fend.inc
@@ -9,14 +9,6 @@
 
 <div> <!-- Wrapper Div -->
 
-<script type="text/javascript">
-NiftyCheck();
-Rounded("div#niftyMenu","top bottom","#FFFFFF","#000000","smooth");
-Rounded("div#mainarea","bl br tr","#FFF","#eeeeee","smooth");
-Rounded("div#boxarea","bl br tl tr","#FFF","#eeeeee","smooth");
-Rounded("tr#fend","bl br tl tr","#FFF","#990000","smooth");
-Rounded("div#topbox","all","#FFF","#990000","smooth");
-Rounded("div#navigation","top bottom","#FFFFFF","#000000","smooth");
-Rounded("div#footer","bl br tl tr]","#FFF","#990000","smooth");
-</script>
+<script type="text/javascript" src="/themes/<?php echo $g['theme']; ?>/bottom-loader.js"></script>
+
 
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index 5e2ef81..1d44007 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -18,7 +18,7 @@ else
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
     <link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" />
     <link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print">
-    <script type="text/javascript" src="/niftyjsCode.js"></script>
+	<script type="text/javascript" src="/themes/<?php echo $g['theme']; ?>/loader.js"></script>
 <?php if (!isset($closehead)){ ?>
 </head>
 <?php } ?>
diff --git a/usr/local/www/themes/pfsense-dropdown/all.css b/usr/local/www/themes/pfsense-dropdown/all.css
index a456342..af47146 100644
--- a/usr/local/www/themes/pfsense-dropdown/all.css
+++ b/usr/local/www/themes/pfsense-dropdown/all.css
@@ -16,6 +16,10 @@ form input {
 
 
 /* ID Based CSS Definitions */
+#wrapper {
+	
+}
+
 #header {
 	height: 70px;
 	width: 800px;
@@ -93,14 +97,13 @@ form input {
 }
 
 #left {
-	padding-bottom: 10px;
-	margin-bottom: 10px;
+
 	width: 800px;
 	height: 25px;
-	border: 1px solid #990000;
 }
 #right {
-
+	width: 785px;
+	margin: 0px auto;
 }
 
 
diff --git a/usr/local/www/themes/pfsense-dropdown/bottom-loader.js b/usr/local/www/themes/pfsense-dropdown/bottom-loader.js
new file mode 100644
index 0000000..2f06f01
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/bottom-loader.js
@@ -0,0 +1,11 @@
+<!-- 
+
+NiftyCheck();
+Rounded("div#niftyMenu","top bottom","#FFFFFF","#000000","smooth");
+Rounded("div#mainarea","bl br tr","#FFF","#eeeeee","smooth");
+Rounded("div#boxarea","bl br tl tr","#FFF","#eeeeee","smooth");
+Rounded("tr#fend","bl br tl tr","#FFF","#990000","smooth");
+Rounded("div#topbox","all","#FFF","#990000","smooth");
+Rounded("div#footer","bl br tl tr]","#FFF","#990000","smooth");
+
+//-->
diff --git a/usr/local/www/themes/pfsense-dropdown/loader.js b/usr/local/www/themes/pfsense-dropdown/loader.js
index faaf81e..bc77a8e 100644
--- a/usr/local/www/themes/pfsense-dropdown/loader.js
+++ b/usr/local/www/themes/pfsense-dropdown/loader.js
@@ -26,5 +26,4 @@ if (version < 7) {
 
 document.write('<script type="text/javascript" src="/themes/pfsense-dropdown/javascript/niftyjsCode.js"></script>'); 
 
-
 // -->
\ No newline at end of file
diff --git a/usr/local/www/themes/pfsense/all.css b/usr/local/www/themes/pfsense/all.css
index 2acd2cd..2bb6db5 100644
--- a/usr/local/www/themes/pfsense/all.css
+++ b/usr/local/www/themes/pfsense/all.css
@@ -72,7 +72,6 @@ form input {
 	margin-top: 0px;
 	padding-top: 0px;
 	width: 800px;
-	border-right: 1px solid #990000;
 }
 
 #footer {
diff --git a/usr/local/www/themes/pfsense/bottom-loader.js b/usr/local/www/themes/pfsense/bottom-loader.js
new file mode 100644
index 0000000..db74034
--- /dev/null
+++ b/usr/local/www/themes/pfsense/bottom-loader.js
@@ -0,0 +1,12 @@
+<!-- 
+
+NiftyCheck();
+Rounded("div#niftyMenu","top bottom","#FFFFFF","#000000","smooth");
+Rounded("div#mainarea","bl br tr","#FFF","#eeeeee","smooth");
+Rounded("div#boxarea","bl br tl tr","#FFF","#eeeeee","smooth");
+Rounded("tr#fend","bl br tl tr","#FFF","#990000","smooth");
+Rounded("div#topbox","all","#FFF","#990000","smooth");
+Rounded("div#navigation","top bottom","#FFFFFF","#000000","smooth");
+Rounded("div#footer","bl br tl tr]","#FFF","#990000","smooth");
+
+//-->
diff --git a/usr/local/www/themes/pfsense/loader.js b/usr/local/www/themes/pfsense/loader.js
new file mode 100644
index 0000000..28cad95
--- /dev/null
+++ b/usr/local/www/themes/pfsense/loader.js
@@ -0,0 +1,26 @@
+<!-- 
+var browser     = '';
+var version     = '';
+var entrance    = '';
+var cond        = '';
+
+// BROWSER?
+if (browser == '') {
+	if (navigator.appName.indexOf('Microsoft') != -1)
+		browser = 'IE'
+	else if (navigator.appName.indexOf('Netscape') != -1)
+		browser = 'Netscape'
+	else
+		browser = 'IE';
+}
+if (version == '') {
+	version= navigator.appVersion;
+	paren = version.indexOf('(');
+	whole_version = navigator.appVersion.substring(0,paren-1);
+	version = parseInt(whole_version);
+}
+
+
+document.write('<script type="text/javascript" src="/themes/pfsense-dropdown/javascript/niftyjsCode.js"></script>'); 
+
+// -->
\ No newline at end of file