From e7dab48469ac779d639fff7e221c7b5a23ded148 Mon Sep 17 00:00:00 2001
From: Evan O'Connell <oconn.e@gmail.com>
Date: Sun, 18 Aug 2013 17:50:36 -0400
Subject: Removing files

---
 themes/new/footer.php                     |  57 ---------------
 themes/new/header.php                     |  55 --------------
 themes/new/images/active_nav_bg.jpg       | Bin 546 -> 0 bytes
 themes/new/images/btn_collapse.gif        | Bin 2946 -> 0 bytes
 themes/new/images/content_tile.jpg        | Bin 668 -> 0 bytes
 themes/new/images/footer_tile.jpg         | Bin 673 -> 0 bytes
 themes/new/images/footerwidget_bg.jpg     | Bin 551 -> 0 bytes
 themes/new/images/footerwidget_border.jpg | Bin 511 -> 0 bytes
 themes/new/images/header_tile.png         | Bin 222 -> 0 bytes
 themes/new/images/header_tile_ie6.gif     | Bin 808 -> 0 bytes
 themes/new/images/logo-trans.png          | Bin 30008 -> 0 bytes
 themes/new/images/nav_a.gif               | Bin 860 -> 0 bytes
 themes/new/images/search_btn.jpg          | Bin 1135 -> 0 bytes
 themes/new/images/w (1).png               | Bin 25506 -> 0 bytes
 themes/new/images/w.png                   | Bin 5520 -> 0 bytes
 themes/new/images/widget_bg.jpg           | Bin 543 -> 0 bytes
 themes/new/include/functions.php          |  51 -------------
 themes/new/include/primary.css            | 115 ------------------------------
 themes/new/include/style_bbcode.css       |  71 ------------------
 themes/new/include/theme.ini              |   2 -
 themes/new/index.php                      |  93 ------------------------
 themes/new/navigation.php                 |  31 --------
 22 files changed, 475 deletions(-)
 delete mode 100644 themes/new/footer.php
 delete mode 100644 themes/new/header.php
 delete mode 100644 themes/new/images/active_nav_bg.jpg
 delete mode 100644 themes/new/images/btn_collapse.gif
 delete mode 100644 themes/new/images/content_tile.jpg
 delete mode 100644 themes/new/images/footer_tile.jpg
 delete mode 100644 themes/new/images/footerwidget_bg.jpg
 delete mode 100644 themes/new/images/footerwidget_border.jpg
 delete mode 100644 themes/new/images/header_tile.png
 delete mode 100644 themes/new/images/header_tile_ie6.gif
 delete mode 100644 themes/new/images/logo-trans.png
 delete mode 100644 themes/new/images/nav_a.gif
 delete mode 100644 themes/new/images/search_btn.jpg
 delete mode 100644 themes/new/images/w (1).png
 delete mode 100644 themes/new/images/w.png
 delete mode 100644 themes/new/images/widget_bg.jpg
 delete mode 100644 themes/new/include/functions.php
 delete mode 100644 themes/new/include/primary.css
 delete mode 100644 themes/new/include/style_bbcode.css
 delete mode 100644 themes/new/include/theme.ini
 delete mode 100644 themes/new/index.php
 delete mode 100644 themes/new/navigation.php

(limited to 'themes/new')

diff --git a/themes/new/footer.php b/themes/new/footer.php
deleted file mode 100644
index c628cca..0000000
--- a/themes/new/footer.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-$phpversion = preg_replace('/[a-z-]/', '', phpversion());
-$mtime = explode(' ', microtime());
-$totaltime = $mtime[0] + $mtime[1] - $starttime;
-$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s<br/>Connections: %d | Queries: %d | Fetches: %d | Frees: %d<br/>\n",
-                $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees);
-?>
-
-<div id="footerContainer"> 
-<div id="footer">  
-
-
-<?php echo $config['product']['name'] . ' ' . $config['product']['version'] . ' ' . $config['product']['release'] ?><br />
-<?php echo $config['product']['copyright']; ?><span style="float:right;"><a href="admin/">Admin</a></span><br />
-<?php if($config['debug']['enabled']) echo $debug_output ?><br />
-
-
-<div class="clear"></div> 
-</div><!--end footer--> 
-</div><!--end footerContainer--> 
- 
-<div id="bottomBarContainer"> 
-	<div id="bottomBar"> 
-		<div id="copyright">All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest &copy; 2001-<?php echo date('Y'); ?> 3rd Infantry Division. &nbsp;&nbsp;</div> 
-	</div><!--end bottomBar--> 
-</div><!--end bottomBarContainer--> 
-
-<?php
- if($config['debug']['enabled']){ 
-	logQueueFlush();
- } 
-?>
-
-
-
-</body>
-</html>
-<?php ob_flush();?>
- 
diff --git a/themes/new/header.php b/themes/new/header.php
deleted file mode 100644
index f1e9f0c..0000000
--- a/themes/new/header.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-global $config;
-ob_start();
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US" dir="ltr">
-
-<head>
-<title>Bayonet CMS Default Theme</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<?php if(isset($config['site']['favicon'])): ?>
-<!--<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::$primary_css; ?>" media="screen"/>
-
-
-<script type="text/javascript" src="functions.js"></script>
-
-<!-- jQuery -->
-<script type="text/javascript" src="markitup/jquery.pack.js"></script>
-<!-- markItUp! -->
-<script type="text/javascript" src="markitup/markitup/jquery.markitup.pack.js"></script>
-<!-- markItUp! toolbar settings -->
-<script type="text/javascript" src="markitup/markitup/sets/bbcode/set.js"></script>
-<!-- markItUp! skin -->
-<link rel="stylesheet" type="text/css" href="markitup/markitup/skins/markitup/style.css" />
-<!--  markItUp! toolbar skin -->
-<link rel="stylesheet" type="text/css" href="markitup/markitup/sets/bbcode/style.css" />       
-
-</head>
-
-<body>
diff --git a/themes/new/images/active_nav_bg.jpg b/themes/new/images/active_nav_bg.jpg
deleted file mode 100644
index 402bbe7..0000000
Binary files a/themes/new/images/active_nav_bg.jpg and /dev/null differ
diff --git a/themes/new/images/btn_collapse.gif b/themes/new/images/btn_collapse.gif
deleted file mode 100644
index 4f875e8..0000000
Binary files a/themes/new/images/btn_collapse.gif and /dev/null differ
diff --git a/themes/new/images/content_tile.jpg b/themes/new/images/content_tile.jpg
deleted file mode 100644
index 3d292c5..0000000
Binary files a/themes/new/images/content_tile.jpg and /dev/null differ
diff --git a/themes/new/images/footer_tile.jpg b/themes/new/images/footer_tile.jpg
deleted file mode 100644
index 6e3f2ba..0000000
Binary files a/themes/new/images/footer_tile.jpg and /dev/null differ
diff --git a/themes/new/images/footerwidget_bg.jpg b/themes/new/images/footerwidget_bg.jpg
deleted file mode 100644
index 3f4da4a..0000000
Binary files a/themes/new/images/footerwidget_bg.jpg and /dev/null differ
diff --git a/themes/new/images/footerwidget_border.jpg b/themes/new/images/footerwidget_border.jpg
deleted file mode 100644
index 5b3bcfb..0000000
Binary files a/themes/new/images/footerwidget_border.jpg and /dev/null differ
diff --git a/themes/new/images/header_tile.png b/themes/new/images/header_tile.png
deleted file mode 100644
index be956a5..0000000
Binary files a/themes/new/images/header_tile.png and /dev/null differ
diff --git a/themes/new/images/header_tile_ie6.gif b/themes/new/images/header_tile_ie6.gif
deleted file mode 100644
index 9b15b1a..0000000
Binary files a/themes/new/images/header_tile_ie6.gif and /dev/null differ
diff --git a/themes/new/images/logo-trans.png b/themes/new/images/logo-trans.png
deleted file mode 100644
index 87b6cf9..0000000
Binary files a/themes/new/images/logo-trans.png and /dev/null differ
diff --git a/themes/new/images/nav_a.gif b/themes/new/images/nav_a.gif
deleted file mode 100644
index 531cced..0000000
Binary files a/themes/new/images/nav_a.gif and /dev/null differ
diff --git a/themes/new/images/search_btn.jpg b/themes/new/images/search_btn.jpg
deleted file mode 100644
index 3f8ba67..0000000
Binary files a/themes/new/images/search_btn.jpg and /dev/null differ
diff --git a/themes/new/images/w (1).png b/themes/new/images/w (1).png
deleted file mode 100644
index 2dae5d3..0000000
Binary files a/themes/new/images/w (1).png and /dev/null differ
diff --git a/themes/new/images/w.png b/themes/new/images/w.png
deleted file mode 100644
index e0bf686..0000000
Binary files a/themes/new/images/w.png and /dev/null differ
diff --git a/themes/new/images/widget_bg.jpg b/themes/new/images/widget_bg.jpg
deleted file mode 100644
index c704d59..0000000
Binary files a/themes/new/images/widget_bg.jpg and /dev/null differ
diff --git a/themes/new/include/functions.php b/themes/new/include/functions.php
deleted file mode 100644
index 1a1abbc..0000000
--- a/themes/new/include/functions.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-	/* EVERY THEME SHOULD HAVE THIS FILE WITH THE FUNCTIONS OPENCONTENT() & CLOSECONTENT() */
-	
-	/**
-	* OpenContent()
-	* Opens a Bayonet site content block.
-	* @return
-	*/
-	function OpenContent()
-	{
-		echo "OPEN CONTENT<br />";
-	}
-	  
-	/**
-	* CloseContent()
-	* Closes a Bayonet site content block.
-	* @return
-	*/
-	function CloseContent()
-	{
-		echo "CLOSE CONTENT<br />";
-	}
-	
-	function OpenBlock($title = 'New Block')
-	{
-		echo "<h2 class=\"widgettitle\"><span>{$title}</span></h2>";
-	}
-	
-	function CloseBlock()
-	{
-	}
-
-?>
diff --git a/themes/new/include/primary.css b/themes/new/include/primary.css
deleted file mode 100644
index 94a4c28..0000000
--- a/themes/new/include/primary.css
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -----BODY STUFF----- */
-body {height:auto; width:auto; font-family:'Arial', Sans-Serif; color:#333; margin:0; padding:0; background: #b8b8b8;
-line-height:1.7em; padding:0; margin:0; font-size: 13px;}
-
-/*--- P TAG STUFF ---*/
-p {font-size: 12px; line-height: 1.7em;}
-.entry{ }
-
-
-#sidebar h2.widgettitle {padding: 0; margin: 0; font-size: 12px; text-transform: uppercase; color: #555; border: 1px solid #ebebeb; font-weight: normal;}
-#sidebar h2.widgettitle span {padding: 8px; display: block; border: 1px solid #fff; font-weight: normal; background: url('../images/widget_bg.jpg') repeat-x center;}
-
-
-
-/* -----A TAG STUFF----- */
-a {text-decoration:none;}
-a:hover {text-decoration:underline;}
-
-
-/* -----PAGE STUFF----- */
-#contentContainer {width: 100%; background: #f5f5f5 url('../images/content_tile.jpg') repeat-y center; border: 1px solid #fff; border-width:0 0 1px;}
-#content {padding:30px 0 0; margin:0 auto;  width:960px; background: #f8f8f8;}
-#main {width:640px; float: left; padding:0; margin: 0; overflow: hidden; line-height: 1.5em;}
-#main-full {width:100%; float: left; padding:0; margin: 0; overflow: hidden; line-height: 1.5em;}
-#sidebar {float: right; margin: 0; overflow: hidden; width: 290px;}
-
-/*---------HEADER STUFF-----------*/
-#headerContainer {width: 100%; background: #4B72A6 url('../images/header_tile.png') repeat-x;}
-#header {height:259px; margin:0 auto;  width:960px; position: relative; color:white;}
-#topBarContainer {width: 100%; background-color:black;}
-#topBar {width:960px; height: 42px; color: #eee; font-size: 10px; margin:0 auto;}
-#topBar #today {padding: 13px 0 0;}
-#logo {margin: 0; padding: 41px 0 0;}
-#logo a {margin: 0; padding: 0; display: block; height: 86px; width: 601px; overflow: hidden; background: url('../images/logo-trans.png') no-repeat; text-indent: -999px;}
-#navigation {padding:0;margin:0; width: 100%; height: 42px; position: absolute; bottom: 0; _bottom:-1px; left:0; z-index:6000;}
-
-/*--------FOOTER STUFF--------*/
-#footerContainer {width: 100%; background: #b8b8b8 url('../images/footer_tile.jpg') repeat-y center; border: 1px solid #9c9c9c; border-width: 1px 0 0;}
-#footer {padding:20px 0 0; margin:0 auto;  width:960px; clear:both;}
-#footer a {color:#fff;}
-#bottomBarContainer {width: 100%; background: #1a1a1a;}
-#bottomBar {width:960px; margin: 0 auto; height: 53px; color: #eee;}
-#bottomBar #copyright {font-size: 10px; margin:0; padding:20px 0 0;}
-#bottomBar #socialbuttons {float: right; font-size: 10px; padding:20px 0 0; text-transform: uppercase; letter-spacing: 1px;}
-#bottomBar #socialbuttons a {color: #fff;}
-
-/*-------MAIN NAVIGATION STUFF--------*/
-#menu {padding: 0; margin:0; list-style:none; position:relative; width:100%; z-index: 4000;}
-#menu li {list-style:none; padding:0; margin:0; position:relative; float: left; line-height: 42px;}
-#menu li a {margin: 0; padding: 0 13px; display: block; line-height: 42px; color: #fff; text-transform: uppercase; font-size: 12px;}
-#menu li a:hover {text-decoration: none; background: url('../images/active_nav_bg.jpg') repeat-x; color: #999;}
-#menu li ul {margin:0; padding:0; list-style:none; display:none; position:absolute; width:200px; z-index:3000; top:41px; _top:42px;/*IE6 fix*/ left: -1px; background: #F8F8F8; border: 1px solid #ddd; border-width: 0 1px 1px;}
-#menu li ul li {margin:0; position:relative; border: 1px solid #fff; border-width: 0 1px 1px; border-top:1px solid #ebebeb; line-height: 20px; padding:0;}
-#menu li ul li a {padding:0 10px; margin:0; width:178px; color: #999; font-size: 12px; line-height: 30px;}
-#menu li ul li a:hover {background: none; color: #555;}
-#menu li ul li ul {position:absolute;top:-1px; left:199px; margin:0; z-index: 2000;}
-#menu li:hover ul ul, 
-#menu li:hover ul ul ul, 
-#menu li:hover ul ul ul ul {display:none;}
-#menu li:hover ul, 
-#menu li li:hover ul, 
-#menu li li li:hover ul, 
-#menu li li li li:hover ul {display:block;}
-#menu li.current_page_item, #menu li.current-cat {background: url('../images/active_nav_bg.jpg') repeat-x;}
-#menu li li.current_page_item, #menu li li.current-cat {background:none;}
-#menu li.current_page_item a, #menu li.current-cat a {color: #555;}
-
-/* -----SEARCH STUFF----- */
-#searchform #s {width:200px; padding: 5px;}
-#searchform #searchsubmit {cursor: pointer; padding:5px;} 
-#searchform #searchsubmit:hover {text-decoration: none;}
-
-#searcher {float: right; padding:2px 0 0;}
-#searcher #searchform #s {font-size:9px; width:200px; padding: 3px; background: #1f1f1f; border: 1px solid #3b3b3b; color: #bbb; text-transform: uppercase; margin: 0 4px 0 0;}
-#searcher #searchform #searchsubmit {
-cursor: pointer; 
-padding:0px; 
-width: 38px; 
-height: 22px; 
-background: transparent url('../images/search_btn.jpg') no-repeat 0 2px !important; 
-border: none; 
-overflow: hidden; 
-text-indent: -999px;
-line-height: 0;
-} 
-
-
-/*---FORM STUFF---*/
-input, textarea {padding: 5px;}
-input {width:170px; margin:5px 0 0 0; }
-textarea {width:100%;}
-input[type="submit"] {padding:5px 0; cursor: pointer;}
-
-/* -----UNIVERSAL STUFF----- */
-code {font:1.1em 'Courier New', Courier, Fixed;}
-acronym,abbr,span.caps {font-size:.9em;letter-spacing:.07em;cursor:help;}
-p img {max-width:100%;padding:0;}
-img.centered {display:block;margin:0 auto;}
-img.alignright {display:inline;margin:0 0 10px 10px;}
-img.alignleft {display:inline;margin:0 10px 10px 0;}
-.alignright {float:right;}
-.alignleft {float:left;}
-acronym.abbr {border-bottom:1px dashed #999;}
-blockquote {padding-left:20px;margin:15px;}
-blockquote cite {display:block;margin:5px 0 0;}
-.center {text-align:center;}
-hr {display:none;}
-a img {border:none;}
-img#wpstats {width:0;height:0;border:none;overflow:hidden;padding:0;}
-#hideme {visibility:hidden;}
-.hidden {visibility: hidden; display: none;}
-.rssSummary {padding-bottom:15px;}
-.clear {clear: both;}
-p.clear {height:1px; width:1px; margin:0; padding:0;}
-.hide {display: none;} 
\ No newline at end of file
diff --git a/themes/new/include/style_bbcode.css b/themes/new/include/style_bbcode.css
deleted file mode 100644
index 05333f9..0000000
--- a/themes/new/include/style_bbcode.css
+++ /dev/null
@@ -1,71 +0,0 @@
-.bold {
-   font-weight: bold;
-}
-
-.italics {
-   font-style: italic;
-}
-
-.underline {
-   text-decoration: underline;
-}
-
-.strikethrough {
-   text-decoration: line-through;
-}
-
-.overline {
-   text-decoration: overline;
-}
-
-.quotecodeheader {
-   font-family: Verdana, arial, helvetica, sans-serif;
-   font-size: 12px;
-   font-weight: bold;
-}
-
-.codebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #006600;
-    border: 1px solid #BFBFBF;
-}
-
-.quotebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #660002;
-   border: 1px solid #BFBFBF;
-}
-
-.listbullet {
-   list-style-type: disc;
-   list-style-position: inside;
-}
-
-.listdecimal {
-   list-style-type: decimal;
-   list-style-position: inside;
-}
-
-.listlowerroman {
-   list-style-type: lower-roman;
-   list-style-position: inside;
-}
-
-.listupperroman {
-   list-style-type: upper-roman;
-   list-style-position: inside;
-}
-
-.listloweralpha {
-   list-style-type: lower-alpha;
-   list-style-position: inside;
-}
-
-.listupperalpha {
-   list-style-type: upper-alpha;
-   list-style-position: inside;
-}
diff --git a/themes/new/include/theme.ini b/themes/new/include/theme.ini
deleted file mode 100644
index 34bd055..0000000
--- a/themes/new/include/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[author]
-name = "Evan O'Connell"
\ No newline at end of file
diff --git a/themes/new/index.php b/themes/new/index.php
deleted file mode 100644
index 750cc1f..0000000
--- a/themes/new/index.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Begin try/catch block */
-try {
-
-/* Setup error handing callbacks */
-ob_start("fatal_error_handler");
-set_error_handler("handle_error");
-
-require_once self::$root_path . '/include/functions.php';
-
-include self::$header;
-//session_start(); 
-?>
-<div id="headerContainer">
-
-	<div id="header"> 
-		<div id="topBar">
-			<div id="searcher"><form method="get" id="searchform" action=""> 
-			<label class="hidden" for="s">Search for:</label> 
-			<input type="text" value="Search Site" onfocus="this.value=''; this.onfocus=null;" name="s" id="s" /> 
-	        <input type="submit" id="searchsubmit" value="GO!" /> 
-	        
-			</form></div> 
-				<div id="today"><?php //echo date('l | F jS, Y'); ?></div>
-		</div><!--end topBar-->	
-		<h1>Bayonet CMS</h1><!--end logo-->    
- 
-	
-		<div id="navigation">
-			<?php require_once self::$root_path . '/navigation.php'; ?>
-		</div><!--end navigation--> 
-	
-	</div><!--end header--> 
-</div><!--end headerContainer--> 
-	
-<div id="contentContainer"> 
-	<div id="content"> 
-
-<?php  if(!defined('BLOCK_RIGHT_DISABLE')): ?>		
-	<div id="main"> 
- 		<?php  require_once 'modules.php'; ?>
-	</div><!--end main--> 
- 
-		<!-- block area RIGHT -->
-		
-	<div id="sidebar"> 
-		<?php GetBlocks(BLOCK_RIGHT); ?>
-		
-	</div><!--end sidebar--> 
-<?php endif; ?>
-<?php if(defined('BLOCK_RIGHT_DISABLE')): ?>
-	<div id="main-full"> 
-	THIS IS SOME MAIN TEXT
- 		<?php  require_once 'modules.php'; ?>
-	</div><!--end main--> 
-<?php endif; ?>
- 
-
-<div class="clear"></div> 
-</div><!--end content--> 
-</div><!--end contentContainer--> 
-
-<?php include self::$footer; ?>
-<?php
-/* Flushing is needed by the error handler */
-ob_end_flush();
-
-} //try ^^    
-catch(Exception $e)
-{
-  ReportError( 
-    "<style>td.short{width:100%;}</style><table style=\"width:0;\"><tr><th>Code</th>" . "<td class=\"short\">" . $e->getCode() . "</td>" . "</tr><tr><th>In File</th>" . "<td class=\"short\">" . $e->getFile() . "</td>" . "</tr></table>" . $e->getLine() . " - " . $e->getMessage() . "<br/>" 
-  );        
-}
-?> 
diff --git a/themes/new/navigation.php b/themes/new/navigation.php
deleted file mode 100644
index 6a99e5a..0000000
--- a/themes/new/navigation.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-?>
-	<ul id="menu"> 
- 		<li class="current_page_item"><a href="index.php">HOME</a></li>
-<?php
-  
-   	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
-   	$nav = $db->Fetch($result);
-
-   	foreach ($nav as $link) {
-   	  echo '<li class="page_item"><a href="' . str_replace('&', '&amp;', $link['link']) . '">' . strtoupper($link['title']) . '</a></li>'; 
-   	}
-   	?> 
-	</ul><!--end dropmenu--> 
-- 
cgit