Theme system has been implemented and we were trying to clean up any code

that was causing problems after the move.



git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2.1@474 c5b2fb0a-d05d-0410-98c8-828840a80ff6

3 files changed, 10 insertions, 10 deletions

diff --git a/themes/default/header.php b/themes/default/header.php
index b0dba31..556b770 100644
--- a/themes/default/header.php
+++ b/themes/default/header.php
@@ -34,8 +34,8 @@ $starttime = $starttime[1] + $starttime[0];
 <!--<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/x-icon" />-->
 <link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/png" />
 <?php endif; ?>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$include_path . '/style.css'; ?>" media="screen"/>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$include_path . '/style_bbcode.css'; ?>" media="screen"/>
+<link rel="stylesheet" type="text/css" href="<?php echo self::$primary_css; ?>" media="screen"/>
+
 
 <script type="text/javascript" src="functions.js"></script>
 
diff --git a/themes/default/include/primary.css b/themes/default/include/primary.css
index 103c21b..93aa1ab 100644
--- a/themes/default/include/primary.css
+++ b/themes/default/include/primary.css
@@ -17,14 +17,14 @@
 		/*width: 990px; */
 		height: 28px;
 		background: #284c75;
-		background-image:url('images/navbackground.jpg');
+		background-image:url('../images/navbackground.jpg');
 		color: #000000;
 		text-align:center;
 		/* margin: auto auto; */
 		font-size:14px;
 	}
 	table.main {
-		background-image:url('images/sandbackground.jpg');
+		background-image:url('../images/sandbackground.jpg');
 	 	padding: 0px;
 		color:#ffffff;
 	 	width:990px;
@@ -70,7 +70,7 @@
 		border:1px solid #333333; 
 	}
  	div.contentHeading {
-		background-image:url(images/blockbackground.jpg);
+		background-image:url(../images/blockbackground.jpg);
 		background-repeat:repeat-x;
 		background-color:#112f50;
 		height:25px;
@@ -187,13 +187,13 @@
 	}
 	/* photo gallery styles */
     .photoleft{
-    	background-image:url("images/photoleft.png");
+    	background-image:url("../images/photoleft.png");
     	background-repeat:repeat-y;
      	text-align:center;
     	width:49px;
    	}
 	.photoright{
-		background-image:url("images/photoright.png");
+		background-image:url("../images/photoright.png");
 		background-repeat:repeat-y;
 		text-align:center;
 		width:49px;
@@ -220,13 +220,13 @@
 	}
 		/* may need these two when we add the background images back */  	 
 	.leftbar {
-	 /*	background-image:url("images/leftshadow.png");   */
+	 /*	background-image:url("../images/leftshadow.png");   */
 		background-repeat: 
 		repeat-y; 
 		width:50px;
 	}		
 	.rightbar {
-		/* background-image:url("images/rightshadow.png");  */
+		/* background-image:url("../images/rightshadow.png");  */
 		background-repeat: 
 		repeat-y; 
 		width:15px;
@@ -248,5 +248,5 @@
             font-family:arial;
     }
 
-
+@import "style_bbcode.css"
 
diff --git a/themes/default/include/default.ini b/themes/default/include/theme.ini
index 223cd14..223cd14 100644
--- a/themes/default/include/default.ini
+++ b/themes/default/include/theme.ini