(OC)

Fixed includes/functions::GetBlocks() so that left and right are 0 and 1.
Also fixed the query so that it doesnt get every block, just the active blocks for the defined side.
Re-did some display on the admin side for blocks.


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

9 files changed, 796 insertions, 772 deletions

diff --git a/admin/admins/functions.php b/admin/admins/functions.php
index 6cda0c4..d28ff7d 100644
--- a/admin/admins/functions.php
+++ b/admin/admins/functions.php
@@ -12,8 +12,9 @@
 		margin:0px;

 		padding:5px;

 		text-align:center;

-		background:#e5eecc;

-		border:solid 1px #c3c3c3;

+		background: #5b8dda;

+		border:solid 1px #848484;

+		color:white;

 	}

 	div.slidepanel

 	{

diff --git a/admin/blocks/functions.php b/admin/blocks/functions.php
index 5194357..fadf610 100644
--- a/admin/blocks/functions.php
+++ b/admin/blocks/functions.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Bayonet Content Management System
- * Copyright (C) 2008  Joseph Hunkeler
+ * Copyright (C) 2008  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
@@ -20,14 +20,21 @@
 function ListBlocks()
 {
   global $db;
-  $result = $db->Query("SELECT * FROM `bayonet_blocks` ORDER BY `active` DESC, `weight` ASC, `position`");
+  $result = $db->Query("SELECT * FROM `bayonet_blocks` ORDER BY `position`, `active` DESC, `weight` ASC");
   $blocks = $db->Fetch($result);
   
   
-  echo "<table align=\"center\"><tr><th colspan=\"3\">Existing Blocks</th></tr>";
+  echo "<table style=\"text-align:left;\" width=\"75%\">
+  			<tr><th colspan=\"6\" style=\"text-align:center;\">Existing Blocks</th></tr>";
+  echo "<tr><th>Weight</th><th>Position</th><th>Name</th><th>Active</th><th></th><th></th></tr>";
   foreach($blocks as $block)
   {
-    echo "<tr><td>{$block['weight']} : {$block['dir_name']}</td><td><a href=\"?load=admin&op=blocks&edit={$block['block_id']}\">Edit</a></td><td><a href=\"?load=admin&op=blocks&delete={$block['block_id']}\">Delete</a></td></tr>";
+    echo "<tr><td>{$block['weight']}</td><td>";
+    	if($block['position'])
+    		echo "Right";
+   		else
+   			echo "Left";
+	echo "</td><td>{$block['title']}</td><td>{$block['active']}</td><td><a href=\"?load=admin&op=blocks&edit={$block['block_id']}\">Edit</a></td><td><a href=\"?load=admin&op=blocks&delete={$block['block_id']}\">Delete</a></td></tr>";
   }
   echo "</table>";
 }
@@ -57,18 +64,19 @@ function NewBlock()
   }
     
   ?>
+  You are currently adding a new block<br /><br />
   <form action="<?php $_SERVER['PHP_SELF']?>" method="post">
   <table align="center">
-  <tr><th>Title</th><td><input type="text" name="title" value="<?php echo $block['title'] ?>"></td></tr>
-  <tr><th>Weight</th><td><input type="text" name="weight" value="<?php echo $block['weight'] ?>"></td></tr>
-  <tr><th>Position</th><td><input type="text" name="position" value="<?php echo $block['position'] ?>"></td></tr>
-  <tr><th>Directory Name</th><td><input type="text" name="dir_name" value="<?php echo $block['dir_name'] ?>"></td>
+  <tr><th>Title</th><td><input type="text" name="title" value="<?php echo $block['title'] ?>" /></td></tr>
+  <tr><th>Weight</th><td><input type="text" name="weight" value="<?php echo $block['weight'] ?>" /></td></tr>
+  <tr><th>Position</th><td><?php GetPosition(); ?></td></tr>
+  <tr><th>Directory Name</th><td><input type="text" name="dir_name" value="<?php echo $block['dir_name'] ?>" /></td>
   <tr><th>Active</th><td>
   <select name="active">
     <option value="1">Yes</option>
     <option value="0">No</option>
   </select></td>
-  <tr><th colspan="2"><input type="submit" name="processed" value="Submit"></th></tr>
+  <tr><th colspan="2"><input type="submit" name="processed" value="Submit" /><?php echo LinkInternal('<input type="button" value="Cancel" />', "?op=blocks"); ?></th></tr>
   </table>
   </form>
   <?php
@@ -111,7 +119,7 @@ function EditBlock($block_id)
     //Update the database with the new data.
     $db->Query("UPDATE bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'");
     //$isActive = $active ? "IS" : "IS NOT";
-    echo "Block, '$dir_name', at position '$weight' has been edited.\n";
+    echo "Block, '$dir_name', at position '$weight'(order) has been edited.\n";
     PageRedirect(3, "?op=blocks");
     //die, because we have completed what we wanted to do.
     return;
@@ -122,11 +130,12 @@ function EditBlock($block_id)
   $block = $db->FetchRow($result);
  
   ?>
+  You are currently editing the '<?php echo $block['title']; ?>' block<br /><br />
   <form action="<?php $_SERVER['PHP_SELF']?>" method="post">
   <table align="center">
   <tr><th>Title</th><td><input type="text" name="title" value="<?php echo $block['title'] ?>" /></td></tr>
   <tr><th>Weight</th><td><input type="text" name="weight" value="<?php echo $block['weight'] ?>" /></td></tr>
-  <tr><th>Position</th><td><input type="text" name="position" value="<?php echo $block['position'] ?>" /></td></tr>
+  <tr><th>Position</th><td><?php GetPosition($block['position']); ?></td></tr>
   <tr><th>Directory Name</th><td><input type="text" name="dir_name" value="<?php echo $block['dir_name'] ?>" /></td>
   <tr><th>Active</th><td>
     <select name="active">
@@ -134,7 +143,7 @@ function EditBlock($block_id)
     </select>
   </td>
   
-  <tr><th colspan="2"><input type="submit" name="processed" value="Submit"></th></tr>
+  <tr><th colspan="2"><input type="submit" name="processed" value="Submit" /><?php echo LinkInternal('<input type="button" value="Cancel" />', "?op=blocks"); ?></th></tr>
   </table>
   </form>
   <?php
@@ -169,4 +178,21 @@ function DeleteBlock($block_id)
   <?php  
 }
 
+/**
+ * GetPosition($value)
+ * -prints a drop down menu for positions defaulting the right pos.
+ */
+function GetPosition($value = 0){
+
+	echo "<select name=\"position\">";
+	if(!$value){
+		echo "<option value=\"0\" selected>Left</option>";
+		echo "<option value=\"1\">Right</option>";		
+	}else{
+		echo "<option value=\"0\">Left</option>";
+		echo "<option value=\"1\" selected>Right</option>";
+	}
+	echo "</select>";
+}
+
 ?> 
\ No newline at end of file
diff --git a/admin/blocks/index.php b/admin/blocks/index.php
index 8d63b6d..fb10441 100644
--- a/admin/blocks/index.php
+++ b/admin/blocks/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Bayonet Content Management System
- * Copyright (C) 2008  Joseph Hunkeler
+ * Copyright (C) 2008  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
@@ -16,6 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */ 
+ ?>
+ <div style="text-align:left;"><h2>- Manage Blocks</h2></div>
+ <table class="panel" width="100%">
+		<tr><td class="panel"><center>
+ <?php
  
 /**
  * This file administers the site blocks.
@@ -29,31 +34,27 @@ if(!defined("ADMIN_FILE"))
   die("Access denied.");
 }
 
-
 include $basedir.'blocks/functions.php';
 
 if(isset($_GET['edit']))
 {
   $block_id = $_GET['edit'];
   EditBlock($block_id);
-  return;
 }
-
-if(isset($_GET['delete']))
+else if(isset($_GET['delete']))
 {
   $block_id = $_GET['delete'];
   DeleteBlock($block_id);
-  return;
 }
-
-if(isset($_GET['create']))
+else if(isset($_GET['create']))
 {
   NewBlock();
-  return;
 }
-
-echo "<table align=\"center\" width=\"200px\"><tr><th>".LinkInternal('Create a Block','?load=admin&op=blocks&create=true')."</th></tr></table>";
-
-ListBlocks();
-
-?> 
\ No newline at end of file
+else{
+	echo "<table align=\"center\" width=\"200px\"><tr><th>".LinkInternal('<img src="images/add.png" />Create a Block','?op=blocks&create=true')."</th></tr></table>";
+	
+	ListBlocks();
+}
+?> 
+</center></td></tr>
+</table>
\ No newline at end of file
diff --git a/admin/calendar/functions.php b/admin/calendar/functions.php
index 9983870..351e5d7 100644
--- a/admin/calendar/functions.php
+++ b/admin/calendar/functions.php
@@ -1,443 +1,440 @@
-<?php

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008  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/>.

- */ 

- 

-/**

- * Note to anyone feeling the need to edit this file...

- * You MUST declare $db as global inside your functions in order access MySQL from here.

- */

- 

- /**

-  * SelectDate($date)

-  * Function for outputing an html form for selecting a month day and year

-  * @param date - formatted date string yyyy-mm-dd (optional)

-  */  

-  function SelectDate($date = NULL){

-  	

- 	//function for adding to the db in sql 'datetime' format

- 	//$date = date("Y-m-d h:i:s", mktime(8, 30, 0, 10, 26, 2009));

- 	//$date = "2009-11-2";

-	//echo $date."<br />";	

-	//function for parsing our date format into an array

-	//echo "<pre>";

-	$date_arr = date_parse($date); //returns an associative array $array['year']

-	//print_r($date_arr);

-	//echo "</pre>";	

-	//echo $date_arr['year']."   ".$date_arr['month']."   ".$date_arr['day']."<br />";; 

-				

-		//List Months

-		echo '<select name="month">';

-		for($m = 1;$m <= 12; $m++){

-		    $month =  date("F", mktime(0, 0, 0, $m));

-		    if($date_arr['month'] == $m)

-		    	echo "<option value='$m' selected=\"selected\">$month</option>";

-	    	else

-	    		echo "<option value='$m'>$month</option>";

-		}

-		echo "</select>";

-		

-		//List Days

-		echo '<select name="day">';

-		for($d = 1;$d <= 31; $d++){

-		    if($date_arr['day'] == $d)

-		    	echo "<option value='$d' selected=\"selected\">$d</option>";

-	    	else

-	    		echo "<option value='$d'>$d</option>";

-		}

-		echo "</select>";

-		

-		//List Years [CurYear, CurYear+5]

-		echo '<select name="year">';

-		$y = date('Y', time());

-		$max = $y+5;

-		for(;$y<$max; $y++){

-			if($date_arr['year'] == $y)

-		    	echo "<option value='$y' selected=\"selected\">$y</option>";

-	    	else

-	    		echo "<option value='$y'>$y</option>";		

-		}

-		echo "</select>";

-  

-  }

- 

- function ListEvents($date){

- 	

- 	global $db;

-

-?> 	

- 	<table width="100%"><tr><td>

- 	<h3>Events for: <?php echo date_format(date_create($date),'F jS, Y'); ?></h3>

- 	</td><td align="right">

- 	<a href="?op=calendar&create=true&date=<?php echo $date; ?>"><img src="images/add.png" /> Add New Event</a>

- 	</td></tr></table>

-<?php

-

-	echo "<table width=\"100%\">";

- 	

-	$result = $db->Query("SELECT * FROM bayonet_events WHERE `date` = '$date' ORDER BY `time`");

-	$row = $db->Fetch($result);

-	foreach($row as $event)

-	{

-		$tmp = true;

-	 	

-	 	$datetime = date_create($date.' '.$event['time']);

-	 	$time = date_format($datetime, 'g:ia'); //gets time in hour:minutes am|pm	

-?>

-

-<tr>

-	<td><strong><?php echo $time." - ".$event['title']; ?></strong></td>

-	<td><span style="border:1px solid black;background-color:<?php echo $event['color'];?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>

-	<td>

-		<a href="?op=calendar&month=<?php echo $_GET['month']; ?>&year=<?php echo $_GET['year']; ?>&edit=<?php echo $event['event_id'];?>">Edit</a>

-		&nbsp;|&nbsp;

-		<a href="?op=calendar&delete=<?php echo $event['event_id']; ?>">Delete</a>

-	</td>

-</tr>

-<tr>

-	<td><?php echo BBCode($event['text']); ?><br /><br /></td>

-</tr>

-		

-<tr>

-	<td colspan="2" style="border-top:1px solid black;"><br /></td>

-</tr>

-<?php

-	}

-	if(!isset($tmp))

-		echo "<tr><td>There are no events posted for this day.</td></tr>";

-	

-	echo "</table>";

-

- }

- 

- function EditEvent($event_id){

- 	

-	//function for adding to the db in sql 'datetime' format

-	//$date = date("Y-m-d h:i:s", mktime(8, 30, 0, 10, 26, 2009));

-	/*

-	echo $date."<br />";

-	

-	//function for parsing our date format into an array

-	echo "<pre>";

-	$date_arr = date_parse($date); //returns an associative array $array['year']

-	print_r($date_arr);

-	echo "</pre>";

-	

-	echo $date_arr['year']; */

-	

-	global $db;

-	

-	if(isset($_POST['processed'])){

-		$title = addslashes($_POST['title']);

-	    $text = addslashes($_POST['text']);

-	    $year = addslashes($_POST['year']);

-	    $month = addslashes($_POST['month']);

-	    $day = addslashes($_POST['day']);

-	    $time = addslashes($_POST['time']);

-	    $color = addslashes($_POST['color']);

-	    

-	    $date = date("Y-m-d", mktime(0, 0, 0, $month, $day, $year));

-	    

-$db->Query("UPDATE `bayonet_events` SET `title` = '$title', `text` = '$text', `color` = '$color', `date` = '$date', `time` = '$time' WHERE `event_id` ='$event_id' LIMIT 1");

-

-	}

-	

-	$result = $db->Query("SELECT * FROM `bayonet_events` WHERE `event_id` = $event_id LIMIT 1");

-	while(($row = $db->Fetch($result))!=false)

-	{

-		$event = $row;

-	}

-  ?>

-  <h3>Edit Event</h3>

-  <form action="<?php $_SERVER['PHP_SELF']?>" method="post">

-  <table>

-  <tr><th>Title</th><td><input type="text" name="title" value="<?php echo $event['title']; ?>" /></td></tr>

-  <tr><th>Color</th><td><input type="text" name="color" value="<?php echo $event['color']; ?>" /></td></tr>

-  <tr><th>Date</th><td><?php SelectDate($event['date']); ?></td></tr>

-  <tr><th>Time</th><td><input type="text" name="time" value="<?php echo substr($event['time'],0,-3); ?>" maxlength="5" size="5" /></td></tr>

-  <tr><th>Text</th><td><textarea id="markItUp" rows="30" cols="80" name="text"><?php echo $event['text']; ?></textarea></td>

-  <tr><th colspan="2"><input type="submit" name="processed" value="Submit" /></th></tr>

-  </table>

-  </form>

-  <?php

- }

- 

- function NewEvent(){

- 	 	

-  global $db;

-  if(isset($_POST['processed']))

-  {

-    //Secure our data to prevent injection attacks.

-    $title = addslashes($_POST['title']);

-    $text = addslashes($_POST['text']);

-    $year = addslashes($_POST['year']);

-    $month = addslashes($_POST['month']);

-    $day = addslashes($_POST['day']);

-    $time = addslashes($_POST['time']);

-    $color = addslashes($_POST['color']);

-    

-    $date = date("Y-m-d", mktime(0, 0, 0, $month, $day, $year));

-    

-    if(empty($title) || empty($text))

-    {

-      echo "You must fill everything out before proceeding.";

-      return;

-    }

-    $sent = false;

-  

-    //Update the database with the new data.

-    if(!$sent){

-    	$sent = true;

-   		$db->Query("INSERT INTO `bayonet_events` (`event_id` ,`date` ,`time` ,`title` ,`text` ,`color`)VALUES (NULL , '$date', '$time', '$title', '$text', '$color')");	

-		   

-		  //echo '<script>location.href="?op=calendar&list='.$date.'";</script>'; 	    

-    }

-    

-   

-    echo "New event, '$title', has been added.\n";

-    PageRedirect(2,"?op=calendar");

-    //die, because we have completed what we wanted to do.

-    return;

-  }

-     

-  ?>

-  <h3>Add New Event</h3>

-  <form action="<?php $_SERVER['PHP_SELF']?>" method="post">

-  <table>

-  <tr><th>Title</th><td><input type="text" name="title" value="" /></td></tr>

-  <tr><th>Color</th><td><input type="text" name="color" value="" /></td></tr>

-  <tr><th>Date</th><td><?php SelectDate($_GET['date']); ?></td></tr>

-  <tr><th>Time</th><td><input type="text" name="time" value="12:00" maxlength="5" size="5" /></td></tr>

-  <tr><th>Text</th><td><textarea id="markItUp" rows="30" cols="80" name="text"></textarea></td>

-  <tr><th colspan="2"><input type="submit" name="processed" value="Submit" /></th></tr>

-  </table>

-  </form>

-  <?php

- }

- 

- function DeleteEvent($event_id = 0){

- 	

-  global $db;

-  

-  $result = $db->Query("SELECT title FROM bayonet_events WHERE event_id = '$event_id'");

-  $event = $db->Fetch($result);

-  

-  if(isset($_POST['proceed']))

-  {

-    echo "Event '{$event['title']}', was deleted.";

-    $db->Query("DELETE FROM bayonet_events WHERE event_id = '$event_id' LIMIT 1");

-    return;

-  }

-  if(isset($_POST['cancel']))

-  {

-    echo "User cancelled deletion of event: '{$event['title']}'";

-    return;

-  } 

-  if($event_id <= 0 || !is_numeric($event_id)) {

-  	echo "Invalid request to delete this event.";

-	return;  

-  }

-  ?>

-

-  <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">

-  <table>

-  <th>Are you SURE you want to delete the event titled: '<?php echo $event['title']?>'?</th>

-  <tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>

-  </table>

-  </form>

-  <?php	 

- }

- 

- /**

- * PrintCalendar() - prints the calendar with events 

- */

- function PrintCalendar(){

- 	

-		$date = time();

-		date_default_timezone_set("America/New_York");  //EASTERN TIME ZONE

-		

-		//GET values for month and year

-		$month = $_GET['month'];

-		$year = $_GET['year'];

-		

-		$useCurDate = true;

-		

-		//check to makes sure month and year are in the desired ranges

-		if(!empty($month) && !empty($year) && $month > 0 && $month < 13 && $year > 1990){

-		    $useCurDate = false;

-		}		

-		//check to see if the get variables are for todays month

-		if($month == date('n', $date) && $year == date('Y', $date)){

-			$useCurDate = true;		

-		}

-									

-		//use current date unless GET values are set	

-		if($useCurDate)

-		{

-			$day = date('d', $date);

-		 	$today = date('j', $date);

-			$month = date('m', $date);

-			$monthNum = date('n', $date);

-			$year = date('Y', $date);

-		}

-		else

-		{

-			$monthNum = $month;

-			//if GET values are equal to curdate, set $today

-			if($year == date('Y', $date) && $monthNum == date('n', $date))

-				$today = date('j', $date);

-			else

-				$today = 0;

-		}   

-		

-		/* Accounts for the last couple days from the previous months */

-			$first_day = mktime(0,0,0,$monthNum, 1, $year); 

-		

-			$title = date('F', $first_day);

-		

-			$day_of_week = date('D', $first_day);

-		

-			switch($day_of_week){

-				case "Sun": $blank = 0; break;

-				case "Mon": $blank = 1; break;

-				case "Tue": $blank = 2; break;

-				case "Wed": $blank = 3; break;

-				case "Thu": $blank = 4; break;

-				case "Fri": $blank = 5; break;

-				case "Sat": $blank = 6; break;

-			}

-			

-		/* calculates the days in the current month */

-			$days_in_month = cal_days_in_month(0, $monthNum, $year);

-		

-				//makes sure that previous year is not year 0

-		        if($monthNum == 1){

-		            $previous_month = 12;

-		            $previous_year = $year-1;

-		        }else{

-		            $previous_month = $monthNum-1;

-		            $previous_year = $year;

-		        }

-		        //makes sure the next year is not year 13

-		        if($monthNum == 12){

-		            $next_month = 1;

-		            $next_year = $year+1;

-		        }else{

-		            $next_month = $monthNum+1;

-		            $next_year = $year;

-		        }  

-		?>		             

-		<center>

-			<table class="calendar" style="background-color:white;" cellspacing="1" cellpadding="0">	

-				<tr style="background-color:#999999; height:27px;">

-					<td colspan="50" style="vertical-align:middle; text-align:center;">

-		    			<a href="?op=calendar&month=<?php echo $previous_month.'&year='.$previous_year; ?>"><<</a>

-		    			<!-- Month Name and Year -->

-		    			&nbsp;&nbsp;<span class="monthTitle"><?php echo strtoupper($title).' '.$year; ?></span>&nbsp;&nbsp;

-						<a href="?op=calendar&month=<?php echo $next_month.'&year='.$next_year; ?>">>></a>

-					</td>

-				</tr>

-					

-				<tr>

-					<th class="weekday">Sun</th><th class="weekday">Mon</th><th class="weekday">Tue</th><th class="weekday">Wed</th>

-					<th class="weekday">Thu</th><th class="weekday">Fri</th><th class="weekday">Sat</th>

-				</tr>

-				

-				<tr>

-		<?php

-		

-			$day_count = 1; //holds the current day of the week 1-7

-			$day_num = 1; //holds the current day of the month 1-31

-		

-			$days_monthbefore = cal_days_in_month(0, $previous_month, $year);

-			//prints the numbers of days for the previous month

-			while($blank > 0){

-				$blank = $blank-1;

-				$days_before = $days_monthbefore-$blank;

-				echo '<td class="cal_notmonth">'.$days_before.'</td>'; //'.$days_before.'</td>';

-				$day_count++;

-			}

-		

-			//loop printing each day of the CURRENT month ONLY

-			while($day_num <= $days_in_month){

-		

-			   if($day_count==1 || $day_count==7){

-				echo '<td class="cal_weekend">';  //weekends

-		           }else{

-				echo '<td class="cal_weekday">';  //weekdays

-			   }

-			   			        

-		       $sqlDate = $year.'-'.$monthNum.'-'.$day_num;  //old way NOT unix

-		      

-		  	 	//checks to see if the current day has events

-		       $isEvent=false;

-			/*	$get_events = mysql_query("SELECT * FROM `mybb_events` WHERE `starttime` = $checkUnixTime ");

-				while($echo_events = mysql_fetch_array($get_events)){

-		                     $isEvent=true;

-				} */

-			 	global $db;

-		  		$result = $db->Query("SELECT title,color FROM bayonet_events WHERE `date` = '$sqlDate' LIMIT 1");

-				$events = $db->Fetch($result);

-				$isEvent = empty($events) ? false : true;

-				

-		  			if($useCurDate)

-		  				echo "<a href=\"?op=calendar&list={$year}-{$monthNum}-{$day_num}\">";

-	  				else

-		  				echo "<a href=\"?op=calendar&month={$monthNum}&year={$year}&list={$year}-{$monthNum}-{$day_num}\">";

-		  				

-						if($day_num == $today && $isEvent==true){

-						   echo '<div class="eventtoday">'.$day_num.'</div>'; 					

-						}else if($day_num == $today && $isEvent==false){

-		                   echo '<div class="monthtoday">'.$day_num.'</div>'; 

-		               	}else if($day_num != $today && $isEvent==true){

-		                   echo '<div class="event" id="event'.$day_num.'" onmouseover="highlightEvent(this.id)" onmouseout="normEvent(this.id)">';

-						   		echo $day_num;

-		   				   echo '</div>';                		               	

-		               	}else{

-		                   echo $day_num;

-		               	}

-           			echo "</a>";

-		

-			    echo '</td>';

-		

-				$day_num++;

-				$day_count++;

-		

-				if($day_count > 7){

-					echo '</tr><tr>';

-					$day_count = 1;

-				}

-			}

-		

-			$days_after = 1;

-			//loop for printing the days for the next month

-			while($day_count > 1 && $day_count <=7){

-				echo '<td class="cal_notmonth">'.$days_after.'</td>'; //'.$days_after.'</td>';

-		                $days_after++;

-				$day_count++;

-			}

-		

-		    ?>

-			 

-		 	</tr>

-		</table>

-		</center>

-<?php

-

- }

-  

+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  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/>.
+ */ 
+ 
+/**
+ * Note to anyone feeling the need to edit this file...
+ * You MUST declare $db as global inside your functions in order access MySQL from here.
+ */
+ 
+ /**
+  * SelectDate($date)
+  * Function for outputing an html form for selecting a month day and year
+  * @param date - formatted date string yyyy-mm-dd (optional)
+  */  
+  function SelectDate($date = NULL){
+  	
+ 	//function for adding to the db in sql 'datetime' format
+ 	//$date = date("Y-m-d h:i:s", mktime(8, 30, 0, 10, 26, 2009));
+ 	//$date = "2009-11-2";
+	//echo $date."<br />";	
+	//function for parsing our date format into an array
+	//echo "<pre>";
+	$date_arr = date_parse($date); //returns an associative array $array['year']
+	//print_r($date_arr);
+	//echo "</pre>";	
+	//echo $date_arr['year']."   ".$date_arr['month']."   ".$date_arr['day']."<br />";; 
+				
+		//List Months
+		echo '<select name="month">';
+		for($m = 1;$m <= 12; $m++){
+		    $month =  date("F", mktime(0, 0, 0, $m));
+		    if($date_arr['month'] == $m)
+		    	echo "<option value='$m' selected=\"selected\">$month</option>";
+	    	else
+	    		echo "<option value='$m'>$month</option>";
+		}
+		echo "</select>";
+		
+		//List Days
+		echo '<select name="day">';
+		for($d = 1;$d <= 31; $d++){
+		    if($date_arr['day'] == $d)
+		    	echo "<option value='$d' selected=\"selected\">$d</option>";
+	    	else
+	    		echo "<option value='$d'>$d</option>";
+		}
+		echo "</select>";
+		
+		//List Years [CurYear, CurYear+5]
+		echo '<select name="year">';
+		$y = date('Y', time());
+		$max = $y+5;
+		for(;$y<$max; $y++){
+			if($date_arr['year'] == $y)
+		    	echo "<option value='$y' selected=\"selected\">$y</option>";
+	    	else
+	    		echo "<option value='$y'>$y</option>";		
+		}
+		echo "</select>";
+  
+  }
+ 
+ function ListEvents($date){
+ 	
+ 	global $db;
+
+?> 	
+ 	<table width="100%"><tr><td>
+ 	<h3>Events for: <?php echo date_format(date_create($date),'F jS, Y'); ?></h3>
+ 	</td><td align="right">
+ 	<a href="?op=calendar&create=true&date=<?php echo $date; ?>"><img src="images/add.png" /> Add New Event</a>
+ 	</td></tr></table>
+<?php
+
+	echo "<table width=\"100%\">";
+ 	
+	$result = $db->Query("SELECT * FROM bayonet_events WHERE `date` = '$date' ORDER BY `time`");
+	$row = $db->Fetch($result);
+	foreach($row as $event)
+	{
+		$tmp = true;
+	 	
+	 	$datetime = date_create($date.' '.$event['time']);
+	 	$time = date_format($datetime, 'g:ia'); //gets time in hour:minutes am|pm	
+?>
+
+<tr>
+	<td><strong><?php echo $time." - ".$event['title']; ?></strong></td>
+	<td><span style="border:1px solid black;background-color:<?php echo $event['color'];?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>
+	<td>
+		<a href="?op=calendar&month=<?php echo $_GET['month']; ?>&year=<?php echo $_GET['year']; ?>&edit=<?php echo $event['event_id'];?>">Edit</a>
+		&nbsp;|&nbsp;
+		<a href="?op=calendar&delete=<?php echo $event['event_id']; ?>">Delete</a>
+	</td>
+</tr>
+<tr>
+	<td><?php echo BBCode($event['text']); ?><br /><br /></td>
+</tr>
+		
+<tr>
+	<td colspan="2" style="border-top:1px solid black;"><br /></td>
+</tr>
+<?php
+	}
+	if(!isset($tmp))
+		echo "<tr><td>There are no events posted for this day.</td></tr>";
+	
+	echo "</table>";
+
+ }
+ 
+ function EditEvent($event_id){
+ 	
+	//function for adding to the db in sql 'datetime' format
+	//$date = date("Y-m-d h:i:s", mktime(8, 30, 0, 10, 26, 2009));
+	/*
+	echo $date."<br />";
+	
+	//function for parsing our date format into an array
+	echo "<pre>";
+	$date_arr = date_parse($date); //returns an associative array $array['year']
+	print_r($date_arr);
+	echo "</pre>";
+	
+	echo $date_arr['year']; */
+	
+	global $db;
+	
+	if(isset($_POST['processed'])){
+		$title = addslashes($_POST['title']);
+	    $text = addslashes($_POST['text']);
+	    $year = addslashes($_POST['year']);
+	    $month = addslashes($_POST['month']);
+	    $day = addslashes($_POST['day']);
+	    $time = addslashes($_POST['time']);
+	    $color = addslashes($_POST['color']);
+	    
+	    $date = date("Y-m-d", mktime(0, 0, 0, $month, $day, $year));
+	    
+$db->Query("UPDATE `bayonet_events` SET `title` = '$title', `text` = '$text', `color` = '$color', `date` = '$date', `time` = '$time' WHERE `event_id` ='$event_id' LIMIT 1");
+
+	}
+	
+	$result = $db->Query("SELECT * FROM `bayonet_events` WHERE `event_id` = $event_id LIMIT 1");
+	$event = $db->FetchRow($result);
+  ?>
+  <h3>Edit Event</h3>
+  <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">
+  <table>
+  <tr><th>Title</th><td><input type="text" name="title" value="<?php echo $event['title']; ?>" /></td></tr>
+  <tr><th>Color</th><td><input type="text" name="color" value="<?php echo $event['color']; ?>" /></td></tr>
+  <tr><th>Date</th><td><?php SelectDate($event['date']); ?></td></tr>
+  <tr><th>Time</th><td><input type="text" name="time" value="<?php echo substr($event['time'],0,-3); ?>" maxlength="5" size="5" /></td></tr>
+  <tr><th>Text</th><td><textarea id="markItUp" rows="30" cols="80" name="text"><?php echo $event['text']; ?></textarea></td>
+  <tr><th colspan="2"><input type="submit" name="processed" value="Submit" /></th></tr>
+  </table>
+  </form>
+  <?php
+ }
+ 
+ function NewEvent(){
+ 	 	
+  global $db;
+  if(isset($_POST['processed']))
+  {
+    //Secure our data to prevent injection attacks.
+    $title = addslashes($_POST['title']);
+    $text = addslashes($_POST['text']);
+    $year = addslashes($_POST['year']);
+    $month = addslashes($_POST['month']);
+    $day = addslashes($_POST['day']);
+    $time = addslashes($_POST['time']);
+    $color = addslashes($_POST['color']);
+    
+    $date = date("Y-m-d", mktime(0, 0, 0, $month, $day, $year));
+    
+    if(empty($title) || empty($text))
+    {
+      echo "You must fill everything out before proceeding.";
+      return;
+    }
+    $sent = false;
+  
+    //Update the database with the new data.
+    if(!$sent){
+    	$sent = true;
+   		$db->Query("INSERT INTO `bayonet_events` (`event_id` ,`date` ,`time` ,`title` ,`text` ,`color`)VALUES (NULL , '$date', '$time', '$title', '$text', '$color')");	
+		   
+		  //echo '<script>location.href="?op=calendar&list='.$date.'";</script>'; 	    
+    }
+    
+   
+    echo "New event, '$title', has been added.\n";
+    PageRedirect(2,"?op=calendar");
+    //die, because we have completed what we wanted to do.
+    return;
+  }
+     
+  ?>
+  <h3>Add New Event</h3>
+  <form action="<?php $_SERVER['PHP_SELF']?>" method="post">
+  <table>
+  <tr><th>Title</th><td><input type="text" name="title" value="" /></td></tr>
+  <tr><th>Color</th><td><input type="text" name="color" value="" /></td></tr>
+  <tr><th>Date</th><td><?php SelectDate($_GET['date']); ?></td></tr>
+  <tr><th>Time</th><td><input type="text" name="time" value="12:00" maxlength="5" size="5" /></td></tr>
+  <tr><th>Text</th><td><textarea id="markItUp" rows="30" cols="80" name="text"></textarea></td>
+  <tr><th colspan="2"><input type="submit" name="processed" value="Submit" /></th></tr>
+  </table>
+  </form>
+  <?php
+ }
+ 
+ function DeleteEvent($event_id = 0){
+ 	
+  global $db;
+  
+  $result = $db->Query("SELECT title FROM bayonet_events WHERE event_id = '$event_id'");
+  $event = $db->Fetch($result);
+  
+  if(isset($_POST['proceed']))
+  {
+    echo "Event '{$event['title']}', was deleted.";
+    $db->Query("DELETE FROM bayonet_events WHERE event_id = '$event_id' LIMIT 1");
+    return;
+  }
+  if(isset($_POST['cancel']))
+  {
+    echo "User cancelled deletion of event: '{$event['title']}'";
+    return;
+  } 
+  if($event_id <= 0 || !is_numeric($event_id)) {
+  	echo "Invalid request to delete this event.";
+	return;  
+  }
+  ?>
+
+  <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">
+  <table>
+  <th>Are you SURE you want to delete the event titled: '<?php echo $event['title']?>'?</th>
+  <tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>
+  </table>
+  </form>
+  <?php	 
+ }
+ 
+ /**
+ * PrintCalendar() - prints the calendar with events 
+ */
+ function PrintCalendar(){
+ 	
+		$date = time();
+		date_default_timezone_set("America/New_York");  //EASTERN TIME ZONE
+		
+		//GET values for month and year
+		$month = $_GET['month'];
+		$year = $_GET['year'];
+		
+		$useCurDate = true;
+		
+		//check to makes sure month and year are in the desired ranges
+		if(!empty($month) && !empty($year) && $month > 0 && $month < 13 && $year > 1990){
+		    $useCurDate = false;
+		}		
+		//check to see if the get variables are for todays month
+		if($month == date('n', $date) && $year == date('Y', $date)){
+			$useCurDate = true;		
+		}
+									
+		//use current date unless GET values are set	
+		if($useCurDate)
+		{
+			$day = date('d', $date);
+		 	$today = date('j', $date);
+			$month = date('m', $date);
+			$monthNum = date('n', $date);
+			$year = date('Y', $date);
+		}
+		else
+		{
+			$monthNum = $month;
+			//if GET values are equal to curdate, set $today
+			if($year == date('Y', $date) && $monthNum == date('n', $date))
+				$today = date('j', $date);
+			else
+				$today = 0;
+		}   
+		
+		/* Accounts for the last couple days from the previous months */
+			$first_day = mktime(0,0,0,$monthNum, 1, $year); 
+		
+			$title = date('F', $first_day);
+		
+			$day_of_week = date('D', $first_day);
+		
+			switch($day_of_week){
+				case "Sun": $blank = 0; break;
+				case "Mon": $blank = 1; break;
+				case "Tue": $blank = 2; break;
+				case "Wed": $blank = 3; break;
+				case "Thu": $blank = 4; break;
+				case "Fri": $blank = 5; break;
+				case "Sat": $blank = 6; break;
+			}
+			
+		/* calculates the days in the current month */
+			$days_in_month = cal_days_in_month(0, $monthNum, $year);
+		
+				//makes sure that previous year is not year 0
+		        if($monthNum == 1){
+		            $previous_month = 12;
+		            $previous_year = $year-1;
+		        }else{
+		            $previous_month = $monthNum-1;
+		            $previous_year = $year;
+		        }
+		        //makes sure the next year is not year 13
+		        if($monthNum == 12){
+		            $next_month = 1;
+		            $next_year = $year+1;
+		        }else{
+		            $next_month = $monthNum+1;
+		            $next_year = $year;
+		        }  
+		?>		             
+		<center>
+			<table class="calendar" style="background-color:white;" cellspacing="1" cellpadding="0">	
+				<tr style="background-color:#999999; height:27px;">
+					<td colspan="50" style="vertical-align:middle; text-align:center;">
+		    			<a href="?op=calendar&month=<?php echo $previous_month.'&year='.$previous_year; ?>"><<</a>
+		    			<!-- Month Name and Year -->
+		    			&nbsp;&nbsp;<span class="monthTitle"><?php echo strtoupper($title).' '.$year; ?></span>&nbsp;&nbsp;
+						<a href="?op=calendar&month=<?php echo $next_month.'&year='.$next_year; ?>">>></a>
+					</td>
+				</tr>
+					
+				<tr>
+					<th class="weekday">Sun</th><th class="weekday">Mon</th><th class="weekday">Tue</th><th class="weekday">Wed</th>
+					<th class="weekday">Thu</th><th class="weekday">Fri</th><th class="weekday">Sat</th>
+				</tr>
+				
+				<tr>
+		<?php
+		
+			$day_count = 1; //holds the current day of the week 1-7
+			$day_num = 1; //holds the current day of the month 1-31
+		
+			$days_monthbefore = cal_days_in_month(0, $previous_month, $year);
+			//prints the numbers of days for the previous month
+			while($blank > 0){
+				$blank = $blank-1;
+				$days_before = $days_monthbefore-$blank;
+				echo '<td class="cal_notmonth">'.$days_before.'</td>'; //'.$days_before.'</td>';
+				$day_count++;
+			}
+		
+			//loop printing each day of the CURRENT month ONLY
+			while($day_num <= $days_in_month){
+		
+			   if($day_count==1 || $day_count==7){
+				echo '<td class="cal_weekend">';  //weekends
+		           }else{
+				echo '<td class="cal_weekday">';  //weekdays
+			   }
+			   			        
+		       $sqlDate = $year.'-'.$monthNum.'-'.$day_num;  //old way NOT unix
+		      
+		  	 	//checks to see if the current day has events
+		       $isEvent=false;
+			/*	$get_events = mysql_query("SELECT * FROM `mybb_events` WHERE `starttime` = $checkUnixTime ");
+				while($echo_events = mysql_fetch_array($get_events)){
+		                     $isEvent=true;
+				} */
+			 	global $db;
+		  		$result = $db->Query("SELECT title,color FROM bayonet_events WHERE `date` = '$sqlDate' LIMIT 1");
+				$events = $db->Fetch($result);
+				$isEvent = empty($events) ? false : true;
+				
+		  			if($useCurDate)
+		  				echo "<a href=\"?op=calendar&list={$year}-{$monthNum}-{$day_num}\">";
+	  				else
+		  				echo "<a href=\"?op=calendar&month={$monthNum}&year={$year}&list={$year}-{$monthNum}-{$day_num}\">";
+		  				
+						if($day_num == $today && $isEvent==true){
+						   echo '<div class="eventtoday">'.$day_num.'</div>'; 					
+						}else if($day_num == $today && $isEvent==false){
+		                   echo '<div class="monthtoday">'.$day_num.'</div>'; 
+		               	}else if($day_num != $today && $isEvent==true){
+		                   echo '<div class="event" id="event'.$day_num.'" onmouseover="highlightEvent(this.id)" onmouseout="normEvent(this.id)">';
+						   		echo $day_num;
+		   				   echo '</div>';                		               	
+		               	}else{
+		                   echo $day_num;
+		               	}
+           			echo "</a>";
+		
+			    echo '</td>';
+		
+				$day_num++;
+				$day_count++;
+		
+				if($day_count > 7){
+					echo '</tr><tr>';
+					$day_count = 1;
+				}
+			}
+		
+			$days_after = 1;
+			//loop for printing the days for the next month
+			while($day_count > 1 && $day_count <=7){
+				echo '<td class="cal_notmonth">'.$days_after.'</td>'; //'.$days_after.'</td>';
+		                $days_after++;
+				$day_count++;
+			}
+		
+		    ?>
+			 
+		 	</tr>
+		</table>
+		</center>
+<?php
+
+ }
+  
  ?>
\ No newline at end of file
diff --git a/admin/images/rudi.png b/admin/images/rudi.png
new file mode 100644
index 0000000..fbaf180
--- /dev/null
+++ b/admin/images/rudi.png
diff --git a/admin/index.php b/admin/index.php
index 773cbc9..e888b6d 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -79,7 +79,8 @@ include 'header.php';
           LinkInternal('<img src="images/modules.png" /><br />Modules','?op=modules'),
           LinkInternal('<img src="images/blocks.png" /><br />Blocks','?op=blocks'),
           LinkInternal('<img src="images/navigation.png" /><br />Navigation','?op=navigation'),
-		  LinkInternal('<img src="images/users_two.png" /><br />Edit Admins','?op=admins')      
+		  LinkInternal('<img src="images/users_two.png" /><br />Edit Admins','?op=admins'),
+		  LinkInternal('<img src="images/announcement.png" /><br />Announcements','?op=announcements')      
         );
         
         //render administration table
@@ -97,7 +98,7 @@ include 'header.php';
           LinkInternal('<img src="images/news.png" /><br />News','?op=news'),
           LinkInternal('<img src="images/calendar.png" /><br />Calendar','?op=calendar'),
           LinkInternal('<img src="images/box_download.png" /><br />Downloads', '?op=downloads'),
-		  LinkInternal('<img src="images/announcement.png" /><br />Announcements','?op=announcements')       
+		  LinkInternal('<img src="images/rudi.png" /><br />RUDI','?op=rudi')       
         );
         
         //render administration table
diff --git a/admin/news/functions.php b/admin/news/functions.php
index e8a7252..6feabcf 100644
--- a/admin/news/functions.php
+++ b/admin/news/functions.php
@@ -63,7 +63,7 @@ function EditNews($news_id){
   	<tr><th>Author</th><td><?php SelectAuthor($row['author_id']); ?></td></tr>
   	<tr><th>Title</th><td><input type="text" name="title" value="<?php echo $row['title']; ?>" /></td></tr>
   	<tr><th>Date</th><td><?php SelectDate($row['date']); ?></td></tr>
-  	<tr><th>Time</th><td><input type="text" name="time" value="<?php echo substr($row['time'],0,-3); ?>" maxlength="5" size="5" /></td></tr>
+  	<tr><th>Time</th><td><input type="text" name="time" value="<?php echo date('G:i', strtotime($row['date'])); ?>" maxlength="5" size="5" /></td></tr>
   	<tr><th>Text</th><td><textarea id="markItUp" rows="30" cols="80" name="text"><?php echo $row['message']; ?></textarea></td>
   	<tr><th colspan="2"><input type="submit" name="processed" value="Submit" /></th></tr>
   	</table>
diff --git a/admin/pages/index.php b/admin/pages/index.php
index 7fba032..20eaa3e 100644
--- a/admin/pages/index.php
+++ b/admin/pages/index.php
@@ -33,7 +33,7 @@ include $basedir.'pages/functions.php';
 ?>
 
    <table class="panel" width="100%" cellspacing="0">
-   		<tr>
+   		<tr style="height:435px;">
 	       <td class="panel-none">
 	       		<?php ListPages(0); ?>
 		   </td>
diff --git a/admin/style.css b/admin/style.css
index 54e671c..63055ab 100644
--- a/admin/style.css
+++ b/admin/style.css
@@ -1,298 +1,296 @@
-body {

-	background-color:#225eac;

-	text-align:center;

-	font-family:sans-serif;

-	font-size:10pt;

-}

-

-img {

-	border:0px;

-}

-

-a, a:visited, a:active {

-	font-family:sans-serif;

-	font-size:10pt;

-	color:black;

-	text-decoration:none;	

-}

-

-a:hover {

-	font-family:sans-serif;

-	font-size:10pt;

-	color: #225eac;

-	text-decoration:none;	

-}

-

-h1, h2, h3, h4, h5, h6 {

-	/* font-family: 'Century Gothic'; */

-	font-weight: normal;	

-}

-h2 {

-	font-size:26px;

-}

-h3 {

-	font-size:20px;

-}

-

-div.wrapper {

-	width:1024px;

-	background-color:white;

-	padding:15px;

-}

-

-td {

-	font-family:sans-serif;

-	font-size:10pt;

-	color:black;	

-}

-

-table.panel {

-	height:435px;

-	border:1px solid #848484;

-}

-

-.panel-none {

-	width:201px;

-	vertical-align:top;

-}

-

-.panel-shadow {

-	background-image:url("../images/rightshadow.png");

-	background-position: left;

-	background-repeat: repeat-y; 

-	width:201px;

-	padding-left: 10px;

-	vertical-align:top;

-}

-

-.panel-box {

-	background-image:url("../images/rightshadow.png");

-	background-position: left;

-	background-repeat: repeat-y; 

-	padding-left: 10px;

-	vertical-align:top;

-}

-

-.option-box {

-	background-color: #6f6f6f;

-}

-

-table.panelitems {

-	font-family:sans-serif;

-	font-size:10pt;

-	color:black;

-}

-

-table.panelitems tr {

-	height:20px;

-}

-

-table.panelitems tr.highlight {

-	background-color: #5b8dda;

-}

-

-/* Panel Links */

-table.panel a, table.panel a:hover, table.panel a:visited, table.panel a:active {

-    font-family:sans-serif;

-	font-size:10pt;

-	color:black;

-	text-decoration:none;

-}

-

-/* Panel Highlight Links << must be after Panel Links */

-tr.highlight a, tr.highlight a:visited, tr.highlight a:hover, tr.highlight a:active {

-	font-family:sans-serif;

-	font-size:10pt;

-	color:white;

-}

-fieldset {

-	padding:0px;

-	border: 1px solid #a1a1a1;

-}

-	/*********************************

- 	 **  	  Content Styles		**

- 	 *********************************/	

-	div.contentBorder1 {

-		background-color:white;

-		border:1px solid #3666ba;

-	}

-	div.contentBorder2 {

-		background-color:white;

-		border:1px solid #333333; 

-	}

- 	div.contentHeading {

-		background-repeat:repeat-x;

-		background-color:#112f50;

-		text-align:left;

-		height:25px;

-		padding-left:10px;

-		padding-right:10px;

-		padding-top:5px;

-		color:white;

-	}

-	div.content {

-		text-align:left;

-		padding:10px;

-		color:#333333;

-	}

-/* START>> CALENDAR STYLES*/

-		.monthTitle{

-  			color:black;

-            text-align:center;

-            font-size:12px;

-            font-weight:bold;

-			font-family:arial;			

-		}

-		td.weekday {

-			width:40px;

-			height:20px;

-            background-color:#cb2121;

-            color:green;

-            text-align:center;

-            font-size:10px;

-            font-weight:bold;

-		}

-		th.weekday {

-			width:40px;

-			height:29px;

-            background-color:white;

-            color:black;

-            text-align:center;

-            font-size:11px;

-            font-weight:bold;

-		}

-		.monthday {

-			width:40px;

-			height:20px;

-            background-color:#aea2a2;

-            color:white;

-            text-align:left;

-            font-size:10pt;

-            font-weight:bold;

-                        

-		}

-		.monthtoday {

-			width:38px;

-			height:38px;

-           /* background-color:#3666ba; */

-            color:#225eac;

-   			text-align:center;

-   			font-size:14px;

-            font-weight:bold;

-            border:1px solid #333333;

-		}

-		.event {

-			width:38px;

-			height:38px;

-            background-color:#225eac;

-   			text-align:center;

-            border:1px solid #333333;					

-		}

-		table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {

-			color:white;		

-		}

-		.eventtoday{

-		 	width:38px;

-			height:38px;

-            background-color:#225eac;

-            color:#ef8e25;

-   			text-align:center;

-   			font-size:14px;

-            font-weight:bold;

-            border:1px solid #333333;			

-		}

-		td.cal_weekday {

-			width:40px;

-			height:40px;

-            background-color:#a1a1a1;

-            vertical-align:top;

-            color:#eeeeee;

-            font-family:arial;

-            text-align:center;

-            font-size:14px;

-		}

-		td.cal_weekend {

-			width:40px;

-			height:40px;

-            background-color:#8f8f8f;

-            vertical-align:top;

-            color:#eeeeee;

-            font-family:arial;

-            text-align:center;

-            font-size:14px;

-		}

-		td.cal_notmonth {

-			width:40px;

-			height:40px;

-            background-color:#6e6e6e;

-            vertical-align:top;

-            color:#d4d4d4;

-            text-align:left;

-            font-size:11px;

-		}

-/* END>> CALENDAR STYLES */

-

-/* START>> PASSWORD STYLES */

-

-input{

-	font-family: "Lucida Grande", "Verdana", sans-serif;

-}

-

-#pwordCont{

-	font-family: "Lucida Grande", "Verdana", sans-serif;

-	width: 820px;

-	font-size:12px;

-	margin-left: auto;

-	margin-right: auto;

-	padding: 50px 0 0 0;

-}

-

-#complexity{

-	color: #000;

-	font-size: 10px;

-	text-align: center;

-}

-

-.outer {

-	width:180px;

-	height:5px;

-	background-color: #CCC;

-}

-

-.default {

-	height:5px;

-	background-color: #CCC; 

-	width:0px;

-}

-.short {

-	height:5px;

-	background-color: #aa0033; 

-	width:15px; 	

-}

-.weak {

-	height:5px;

-	background-color: #aa0033; 

-	width:45px; 

-}

-.good {

-	height:5px;

-	background-color: #6699cc; 

-	width:90px; 

-}

-.strong {

-	height:5px;

-	background-color: #008000; 

-	width:135px; 

-}

-.secure {

-	height:5px;

-	background-color: #008000; 

-	width:180px;

-}

-

-span.value{

-	font-weight:bold;

-	float: right;

-}

-

+body {
+	background-color:#225eac;
+	text-align:center;
+	font-family:sans-serif;
+	font-size:10pt;
+}
+
+img {
+	border:0px;
+}
+
+a, a:visited, a:active {
+	font-family:sans-serif;
+	font-size:10pt;
+	color:black;
+	text-decoration:none;	
+}
+
+a:hover {
+	font-family:sans-serif;
+	font-size:10pt;
+	color: #225eac;
+	text-decoration:none;	
+}
+
+h1, h2, h3, h4, h5, h6 {
+	/* font-family: 'Century Gothic'; */
+	font-weight: normal;	
+}
+h2 {
+	font-size:26px;
+}
+h3 {
+	font-size:20px;
+}
+
+div.wrapper {
+	width:1024px;
+	background-color:white;
+	padding:15px;
+}
+
+td {
+	font-family:sans-serif;
+	font-size:10pt;
+	color:black;	
+}
+
+table.panel {
+	height:350px;
+	border:1px solid #848484;
+}
+
+.panel-none {
+	width:201px;
+	vertical-align:top;
+}
+
+.panel-shadow {
+	background-image:url("../images/rightshadow.png");
+	background-position: left;
+	background-repeat: repeat-y; 
+	width:201px;
+	padding-left: 10px;
+	vertical-align:top;
+}
+
+.panel-box {
+	background-image:url("../images/rightshadow.png");
+	background-position: left;
+	background-repeat: repeat-y; 
+	padding-left: 10px;
+	vertical-align:top;
+}
+
+.option-box {
+	background-color: #6f6f6f;
+}
+
+table.panelitems {
+	font-family:sans-serif;
+	font-size:10pt;
+	color:black;
+}
+
+table.panelitems tr {
+	height:20px;
+}
+
+table.panelitems tr.highlight {
+	background-color: #5b8dda;
+}
+
+/* Panel Links */
+table.panel a, table.panel a:hover, table.panel a:visited, table.panel a:active {
+    font-family:sans-serif;
+	font-size:10pt;
+	color:black;
+	text-decoration:none;
+}
+
+/* Panel Highlight Links << must be after Panel Links */
+tr.highlight a, tr.highlight a:visited, tr.highlight a:hover, tr.highlight a:active {
+	font-family:sans-serif;
+	font-size:10pt;
+	color:white;
+}
+fieldset {
+	padding:0px;
+	border: 1px solid #a1a1a1;
+}
+	/*********************************
+ 	 **  	  Content Styles		**
+ 	 *********************************/	
+	div.contentBorder1 {
+	}
+	div.contentBorder2 {
+		border:1px solid #848484; 
+	}
+ 	div.contentHeading {
+		background-repeat:repeat-x;
+		background-color: #5b8dda;
+		text-align:left;
+		height:25px;
+		padding-left:10px;
+		padding-right:10px;
+		padding-top:5px;
+		color:white;
+	}
+	div.content {
+		text-align:left;
+		background-color:white;
+		padding:10px;
+		color:#333333;
+	}
+/* START>> CALENDAR STYLES*/
+		.monthTitle{
+  			color:black;
+            text-align:center;
+            font-size:12px;
+            font-weight:bold;
+			font-family:arial;			
+		}
+		td.weekday {
+			width:40px;
+			height:20px;
+            background-color:#cb2121;
+            color:green;
+            text-align:center;
+            font-size:10px;
+            font-weight:bold;
+		}
+		th.weekday {
+			width:40px;
+			height:29px;
+            background-color:white;
+            color:black;
+            text-align:center;
+            font-size:11px;
+            font-weight:bold;
+		}
+		.monthday {
+			width:40px;
+			height:20px;
+            background-color:#aea2a2;
+            color:white;
+            text-align:left;
+            font-size:10pt;
+            font-weight:bold;
+                        
+		}
+		.monthtoday {
+			width:38px;
+			height:38px;
+           /* background-color:#3666ba; */
+            color:#225eac;
+   			text-align:center;
+   			font-size:14px;
+            font-weight:bold;
+            border:1px solid #333333;
+		}
+		.event {
+			width:38px;
+			height:38px;
+            background-color:#225eac;
+   			text-align:center;
+            border:1px solid #333333;					
+		}
+		table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {
+			color:white;		
+		}
+		.eventtoday{
+		 	width:38px;
+			height:38px;
+            background-color:#225eac;
+            color:#ef8e25;
+   			text-align:center;
+   			font-size:14px;
+            font-weight:bold;
+            border:1px solid #333333;			
+		}
+		td.cal_weekday {
+			width:40px;
+			height:40px;
+            background-color:#a1a1a1;
+            vertical-align:top;
+            color:#eeeeee;
+            font-family:arial;
+            text-align:center;
+            font-size:14px;
+		}
+		td.cal_weekend {
+			width:40px;
+			height:40px;
+            background-color:#8f8f8f;
+            vertical-align:top;
+            color:#eeeeee;
+            font-family:arial;
+            text-align:center;
+            font-size:14px;
+		}
+		td.cal_notmonth {
+			width:40px;
+			height:40px;
+            background-color:#6e6e6e;
+            vertical-align:top;
+            color:#d4d4d4;
+            text-align:left;
+            font-size:11px;
+		}
+/* END>> CALENDAR STYLES */
+
+/* START>> PASSWORD STYLES */
+
+input{
+	font-family: "Lucida Grande", "Verdana", sans-serif;
+}
+
+#pwordCont{
+	font-family: "Lucida Grande", "Verdana", sans-serif;
+	width: 820px;
+	font-size:12px;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 50px 0 0 0;
+}
+
+#complexity{
+	color: #000;
+	font-size: 10px;
+	text-align: center;
+}
+
+.outer {
+	width:180px;
+	height:5px;
+	background-color: #CCC;
+}
+
+.default {
+	height:5px;
+	background-color: #CCC; 
+	width:0px;
+}
+.short {
+	height:5px;
+	background-color: #aa0033; 
+	width:15px; 	
+}
+.weak {
+	height:5px;
+	background-color: #aa0033; 
+	width:45px; 
+}
+.good {
+	height:5px;
+	background-color: #6699cc; 
+	width:90px; 
+}
+.strong {
+	height:5px;
+	background-color: #008000; 
+	width:135px; 
+}
+.secure {
+	height:5px;
+	background-color: #008000; 
+	width:180px;
+}
+
+span.value{
+	font-weight:bold;
+	float: right;
+}
+
 /* END>> PASSWORD STYLES */
\ No newline at end of file