Merge pull request #3 from eoconnell/masterHEAD master

Some more stuff
author: Joseph Hunkeler <jhunkeler@gmail.com> 2013-08-19 09:41:19 -0400
committer: Joseph Hunkeler <jhunkeler@gmail.com> 2013-08-19 09:41:19 -0400
commit: c5eb569f5122d4140952bd5cc7ad4fdc5fbf8a23 (patch)
tree: 37024ec14fde9fef92eef8e9f997f72731e5155d /themes/default
parent: 41d7bde950d6166a6cc414a48d0fa57f3fd9a512 (diff)
parent: 50f14f6bee7e1efaac5971579fc2e76c728ecad6 (diff)
download: bayonetcms-c5eb569f5122d4140952bd5cc7ad4fdc5fbf8a23.tar.gz
6 files changed, 73 insertions, 85 deletions
diff --git a/themes/default/footer.php b/themes/default/footer.php
index afadce7..db656ce 100644
--- a/themes/default/footer.php
+++ b/themes/default/footer.php
@@ -16,7 +16,7 @@
  * 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;
@@ -26,25 +26,19 @@ $debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) p
 
 <div class="footer">
 
-		<br />
-		<span class="footer-text">	
-			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.</span>
-		
-		<br /><br />
-
-      <a href="admin/">Administrative Control Panel</a><br />
+<a href="admin/">Administrative Control Panel</a><br />
 <?php echo $config['product']['name'] . ' ' . $config['product']['version'] . ' ' . $config['product']['release'] ?><br />
 <?php echo stripslashes($config['product']['copyright']); ?><br />
 <?php if($config['debug']['enabled']) echo $debug_output ?><br />
+
 </div>
 
 <?php
- if($config['debug']['enabled']){ 
+if($config['debug']['enabled']){
 	logQueueFlush();
- } 
+}
 ?>
 
 </body>
 </html>
-<?php ob_flush();?>
- 
+<?php ob_flush();?>
+\ No newline at end of file
diff --git a/themes/default/header.php b/themes/default/header.php
index a9b043b..0ade800 100644
--- a/themes/default/header.php
+++ b/themes/default/header.php
@@ -23,18 +23,16 @@ $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">
+<!DOCTYPE html>
+<html>
 
 <head>
-<title>3rd Infantry Division - 8 years strong - ArmaII Unit</title>
+<title>Bayonet CMS</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"/>
 </head>
 
-<body>
+<body>
+\ No newline at end of file
diff --git a/themes/default/include/functions.php b/themes/default/include/functions.php
index 4aeeb14..4a401fd 100644
--- a/themes/default/include/functions.php
+++ b/themes/default/include/functions.php
@@ -1,22 +1,4 @@
 <?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() */
 	
@@ -55,4 +37,4 @@
 	  CloseContent();
 	}
 
-?>
+?>
+\ No newline at end of file
diff --git a/themes/default/include/primary.css b/themes/default/include/primary.css
index 7bed7ce..6a7747a 100644
--- a/themes/default/include/primary.css
+++ b/themes/default/include/primary.css
@@ -1,37 +1,62 @@
+
 	/*********************************
  	 **  	  Layout Styles			**
  	 *********************************/
  	 div.container {
 		width: 990px;
-		/* width: 1000px; */
-		color: #000000;
-		 margin: auto auto;
+		color: black;
+		margin: auto auto;
 		text-align: left; /* IE 5 fix */
 	}
  	div.banner {
-	  	/* width: 990px; */
-	  	text-align:center;
-		/* margin: auto auto; */
+	  	height: 100px;
 	}
-	div.nav {
-		/*width: 990px; */
-		height: 28px;
+		.banner h1 {
+			margin: 0;
+			padding-left: 15px;
+			line-height: 100px;
+			color: white;
+			font-weight: bold;
+		}
+	nav {
+		height: 32px;
 		background: #284c75;
-		background-image:url('../images/navbackground.jpg');
-		color: #000000;
+		background: #41678d; /* Old browsers */
+		background: -moz-linear-gradient(top,  #41678d 0%, #41678d 45%, #224567 55%, #224567 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#41678d), color-stop(45%,#41678d), color-stop(55%,#224567), color-stop(100%,#224567)); /* Chrome,Safari4+ */
+		background: -webkit-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* Chrome10+,Safari5.1+ */
+		background: -o-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* Opera 11.10+ */
+		background: -ms-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* IE10+ */
+		background: linear-gradient(to bottom,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* W3C */
+		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#41678d', endColorstr='#224567',GradientType=0 ); /* IE6-9 */
 		text-align:center;
-		/* margin: auto auto; */
 		font-size:14px;
+		border-radius: 2px;
+	}
+	nav a {
+		color: white !important;
+		font-weight: bold;
+	}
+	nav ul {
+		list-style: none;
+		margin: 0;
+		padding-left: 20px;
+		line-height: 32px;
 	}
+		nav li {
+			float: left;
+			margin-right: 2em;
+		}
 	table.main {
-		background-image:url('../images/sandbackground.jpg');
+		/*background-image:url('../images/sandbackground.jpg');*/
 	 	padding: 0px;
 		color:#ffffff;
 	 	width:990px;
 	 	/*width: 1134px; */
 	 	 /* width: 1234px; */
 	 	margin: auto auto;
-		background-color:#a3a2a0;
+	 	margin-top: 20px;
+		/*background-color:#a3a2a0;*/
 	}
 
 	table.main td {
@@ -56,6 +81,8 @@
 		color:#5e5e5e;
 		background-color:#333333;
 		border-top: 1px solid #5e5e5e;
+		margin-top: 30px;
+		padding: 15px;
 	}	
 	
 	/*********************************
@@ -70,7 +97,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;
@@ -85,6 +112,7 @@
 		/*background-color:#383838;
 		color:white; */
 		background-color:#f1f1f1;
+		/*width: 644px !important;*/
 	}	
 	div.content img {
 		padding:10px;	
diff --git a/themes/default/index.php b/themes/default/index.php
index 3da1144..fc2137b 100644
--- a/themes/default/index.php
+++ b/themes/default/index.php
@@ -33,12 +33,12 @@ include self::$header;
 <div class="container">
 
 <!-- banner -->
- <div class="banner"><a href="index.php"><img src="<?php echo self::$image_path . '/logo.jpg'; ?>" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
+ <div class="banner"><h1>Bayonet CMS</h1></div>
 <!-- navigation -->
  <div class="nav"><?php require_once self::$root_path . '/navigation.php'; ?></div>
 
 <!-- content -->
-<table border="0" cellspacing="15px" cellpadding="0"  class="main" width="100%">
+<table border="0" cellspacing="0px" cellpadding="0" class="main" width="100%">
 	<tr>
 		<td class="midcol">
 	    	<?php  require_once 'modules.php'; ?>
@@ -46,7 +46,7 @@ include self::$header;
  		
 	  <!-- block area RIGHT -->
 	  <?php  if(!defined('BLOCK_RIGHT_DISABLE')): ?>
-	    <td class="rightcol">
+	    <td class="rightcol" style="padding-left: 15px;">
 	      	<?php GetBlocks(BLOCK_RIGHT); ?>
 	    </td>    
 	  <?php endif; ?>
diff --git a/themes/default/navigation.php b/themes/default/navigation.php
index d90365a..012c95f 100644
--- a/themes/default/navigation.php
+++ b/themes/default/navigation.php
@@ -1,34 +1,20 @@
+<nav>
+	<ul>
+		<li><a href="index.php">HOME</a></li>
+
 <?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/>.
- */
 
+	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
+	$nav = $db->Fetch($result);
+
+	foreach ($nav as $link):
+
+		$href = str_replace('&', '&amp;', $link['link']);
+		$title = strtoupper($link['title']);
+		echo "<li><a href=\"{$href}\">{$title}</a></li>";
+
+	endforeach;
 ?>
-<table border="0" cellspacing="0" class="navLinks">
-	<tr>
- 		<td>&nbsp;&nbsp;<a href="index.php">HOME</a>&nbsp;&nbsp;</td>
-<?php
-  
-   	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
-   	$nav = $db->Fetch($result);
 
-   	foreach ($nav as $link) {
-   	  echo '<td>&nbsp;&nbsp;<a href="' . str_replace('&', '&amp;', $link['link']) . '">' . strtoupper($link['title']) . '</a>&nbsp;&nbsp;</td>'; 
-   	}
-   	?>
-	</tr>
-</table>
+	</ul>
+</nav>
author	Joseph Hunkeler <jhunkeler@gmail.com>	2013-08-19 09:41:19 -0400
committer	Joseph Hunkeler <jhunkeler@gmail.com>	2013-08-19 09:41:19 -0400
commit	c5eb569f5122d4140952bd5cc7ad4fdc5fbf8a23 (patch)
tree	37024ec14fde9fef92eef8e9f997f72731e5155d /themes/default
parent	41d7bde950d6166a6cc414a48d0fa57f3fd9a512 (diff)
parent	50f14f6bee7e1efaac5971579fc2e76c728ecad6 (diff)
download	bayonetcms-c5eb569f5122d4140952bd5cc7ad4fdc5fbf8a23.tar.gz