Merge lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn

[mac9416]

[mac9416 (mac9416)]

I'm rather new to bzr/Launchpad, so I only hope everything is in order to be merged. I merged, I pulled, I said the magic words, and I hope it turned out right. Cross your fingers ;-)

[lp:~mac9416/www-ubuntu-us-tn/trunk]

17. By mac9416 on 2009-09-10

WP theme: stopped content bg from seperating from footer bg

[Christopher Lunsford (binarymutant)]

is there a reason why I can't change wordpress/ to news/ on the server? It looks like it dropped the theme when I do. Anyways, check to see if this is right http://ubuntu-us-tn.info/wordpress/

review: Approve

[mac9416 (mac9416)]

I think it takes a little work to move WP because of the DB. Ask in
#wordpress, they'll know how it's done I'm sure.
Also, the link looks good. One question: why not do the entire site
with WP, not just the blog? I have made WP sites that don't even have
a blog, it's that much easier than hand-coding. It's a little bit of a
learning curve, but it makes it much easier to post quick updates,
add/edit pages in a hurry, etc. Of course, whatever the team says, I'm
cool with. I'm just thinking Wordpress would be the better way to go,
from what I know.

On Thu, Sep 10, 2009 at 1:37 PM, Christopher Lunsford
<email address hidden> wrote:
> Review: Approve
> is there a reason why I can't change wordpress/ to news/ on the server? It looks like it dropped the theme when I do. Anyways, check to see if this is right http://ubuntu-us-tn.info/wordpress/
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>

[Christopher Lunsford (binarymutant)]

Personally, I think hand coding gives it more of a team project
feeling. I'm sure other people prefer a finished project over a
never-ending one though, so I was kind of waiting for someone to bring
this up (Glad you did). I'd rather this be on the website thread
though to get other opinions as well. Or the mailing list, whichever
you prefer for discussions.

So, my stance is to have the team code on the root of the website, and
have a link that goes to WP, since it would be easier to see "the
fruit of everyone's labor". It would encourage more activity within
the team to have a never-ending project is what I'm thinking. But I
can also see both sides to this coin and can completely understand the
want for a finished software project.
So this is just another one of those things where I'm waiting for a
team decision.

On Thu, Sep 10, 2009 at 6:51 PM, mac9416 <email address hidden> wrote:
> I think it takes a little work to move WP because of the DB. Ask in
> #wordpress, they'll know how it's done I'm sure.
> Also, the link looks good. One question: why not do the entire site
> with WP, not just the blog? I have made WP sites that don't even have
> a blog, it's that much easier than hand-coding. It's a little bit of a
> learning curve, but it makes it much easier to post quick updates,
> add/edit pages in a hurry, etc. Of course, whatever the team says, I'm
> cool with. I'm just thinking Wordpress would be the better way to go,
> from what I know.
>
> On Thu, Sep 10, 2009 at 1:37 PM, Christopher Lunsford
> <email address hidden> wrote:
>> Review: Approve
>> is there a reason why I can't change wordpress/ to news/ on the server? It looks like it dropped the theme when I do. Anyways, check to see if this is right http://ubuntu-us-tn.info/wordpress/
>> --
>> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
>> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>>
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
> You are reviewing the proposed merge of lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn.
>

[mac9416 (mac9416)]

Well, it's not really a matter of having a finished product to me -
I'd really like to see the website be a constantly evolving project
that just keeps getting better, just like you. And I really think you
can have that with Wordpress. It's the speed at which you can
improve/evolve a website with Wordpress that appeals to me.
But I can also see what you're saying, that hand-coding allows
everyone to collaborate, not just those familiar with Wordpress. So
there are advantages and disadvantages to both. I'm obviously quite
biased because I've become accustomed to Wordpress and really like it
a lot.

But, as you say, the forums is the best place to talk about it. I'll
probably post something tomorrow as it's getting late today.

Thanks

On Thu, Sep 10, 2009 at 8:00 PM, Christopher Lunsford
<email address hidden> wrote:
> Personally, I think hand coding gives it more of a team project
> feeling. I'm sure other people prefer a finished project over a
> never-ending one though, so I was kind of waiting for someone to bring
> this up (Glad you did). I'd rather this be on the website thread
> though to get other opinions as well. Or the mailing list, whichever
> you prefer for discussions.
>
> So, my stance is to have the team code on the root of the website, and
> have a link that goes to WP, since it would be easier to see "the
> fruit of everyone's labor". It would encourage more activity within
> the team to have a never-ending project is what I'm thinking. But I
> can also see both sides to this coin and can completely understand the
> want for a finished software project.
> So this is just another one of those things where I'm waiting for a
> team decision.
>
> On Thu, Sep 10, 2009 at 6:51 PM, mac9416 <email address hidden> wrote:
>> I think it takes a little work to move WP because of the DB. Ask in
>> #wordpress, they'll know how it's done I'm sure.
>> Also, the link looks good. One question: why not do the entire site
>> with WP, not just the blog? I have made WP sites that don't even have
>> a blog, it's that much easier than hand-coding. It's a little bit of a
>> learning curve, but it makes it much easier to post quick updates,
>> add/edit pages in a hurry, etc. Of course, whatever the team says, I'm
>> cool with. I'm just thinking Wordpress would be the better way to go,
>> from what I know.
>>
>> On Thu, Sep 10, 2009 at 1:37 PM, Christopher Lunsford
>> <email address hidden> wrote:
>>> Review: Approve
>>> is there a reason why I can't change wordpress/ to news/ on the server? It looks like it dropped the theme when I do. Anyways, check to see if this is right http://ubuntu-us-tn.info/wordpress/
>>> --
>>> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
>>> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>>>
>> --
>> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
>> You are reviewing the proposed merge of lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn.
>>
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>

[Christopher Lunsford (binarymutant)]

feel free to copy paste this conversation if you want, might be quicker :D
Also, I've moved wordpress on the actual site to news/ now and am
looking at applying the plugin "Register Plus" on my branch to it. It
can do openid w/ launchpad

On Thu, Sep 10, 2009 at 10:48 PM, mac9416 <email address hidden> wrote:
> Well, it's not really a matter of having a finished product to me -
> I'd really like to see the website be a constantly evolving project
> that just keeps getting better, just like you. And I really think you
> can have that with Wordpress. It's the speed at which you can
> improve/evolve a website with Wordpress that appeals to me.
> But I can also see what you're saying, that hand-coding allows
> everyone to collaborate, not just those familiar with Wordpress. So
> there are advantages and disadvantages to both. I'm obviously quite
> biased because I've become accustomed to Wordpress and really like it
> a lot.
>
> But, as you say, the forums is the best place to talk about it. I'll
> probably post something tomorrow as it's getting late today.
>
> Thanks
>
> On Thu, Sep 10, 2009 at 8:00 PM, Christopher Lunsford
> <email address hidden> wrote:
>> Personally, I think hand coding gives it more of a team project
>> feeling. I'm sure other people prefer a finished project over a
>> never-ending one though, so I was kind of waiting for someone to bring
>> this up (Glad you did). I'd rather this be on the website thread
>> though to get other opinions as well. Or the mailing list, whichever
>> you prefer for discussions.
>>
>> So, my stance is to have the team code on the root of the website, and
>> have a link that goes to WP, since it would be easier to see "the
>> fruit of everyone's labor". It would encourage more activity within
>> the team to have a never-ending project is what I'm thinking. But I
>> can also see both sides to this coin and can completely understand the
>> want for a finished software project.
>> So this is just another one of those things where I'm waiting for a
>> team decision.
>>
>> On Thu, Sep 10, 2009 at 6:51 PM, mac9416 <email address hidden> wrote:
>>> I think it takes a little work to move WP because of the DB. Ask in
>>> #wordpress, they'll know how it's done I'm sure.
>>> Also, the link looks good. One question: why not do the entire site
>>> with WP, not just the blog? I have made WP sites that don't even have
>>> a blog, it's that much easier than hand-coding. It's a little bit of a
>>> learning curve, but it makes it much easier to post quick updates,
>>> add/edit pages in a hurry, etc. Of course, whatever the team says, I'm
>>> cool with. I'm just thinking Wordpress would be the better way to go,
>>> from what I know.
>>>
>>> On Thu, Sep 10, 2009 at 1:37 PM, Christopher Lunsford
>>> <email address hidden> wrote:
>>>> Review: Approve
>>>> is there a reason why I can't change wordpress/ to news/ on the server? It looks like it dropped the theme when I do. Anyways, check to see if this is right http://ubuntu-us-tn.info/wordpress/
>>>> --
>>>> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11523
>>>> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>>>>
>>> --
>>> ht...

=== modified file 'news/wp-content/themes/ubuntu-us-tn/footer.php'
--- news/wp-content/themes/ubuntu-us-tn/footer.php	2009-09-09 20:30:13 +0000
+++ news/wp-content/themes/ubuntu-us-tn/footer.php	2009-09-10 13:27:35 +0000
@@ -1,22 +1,16 @@
+<?php
+global $options;
+foreach ($options as $value) {
+    if (get_settings( $value['id'] ) === FALSE) { $$value['id'] = $value['std']; } else { $$value['id'] = get_settings( $value['id'] ); }
+}
+?>
 <div class="clear"></div> 
 		</div> 
 	
 <div id="footer"> 
-<div id="footer"> <small>Copyright 2009; ubuntu-us-tn.info is owned by Don Harper and maintained by the Ubuntu Tennessee Team. All code is licensed under the GPLv3. All Ubuntu logos are trademarked by Canonical. Hosting provided by <a href="http://www.000webhost.com/" target="_blank">000webhost.com</a></small>
- </div>
+<div id="footer"><?php print($ubuntu_us_tn_footer_phrase); ?></div>
 </div>	
 
 </div>
- 
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-10529254-1");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-
 </body> 
-</html>
\ No newline at end of file
+</html>

=== modified file 'news/wp-content/themes/ubuntu-us-tn/functions.php'
--- news/wp-content/themes/ubuntu-us-tn/functions.php	2009-09-09 20:30:13 +0000
+++ news/wp-content/themes/ubuntu-us-tn/functions.php	2009-09-10 13:27:35 +0000
@@ -2,12 +2,188 @@
 if ( function_exists('register_sidebar') )
      register_sidebar(array('name'=>'Sidebar'));
 
-add_action("edit_post","insert_theme_link");
-function insert_theme_link() {
-	global $wpdb;
-	if($wpdb->get_var("SELECT COUNT(link_id) FROM $wpdb->links WHERE link_url='http://www.amazingwordpressthemes.com/'")==0)
-		wp_insert_link(array("link_name" => "Wordpress Themes", "link_url" => "http://www.amazingwordpressthemes.com/" ));
-}
-
 if ( !is_admin() ) wp_deregister_script('jquery');
-?>
\ No newline at end of file
+?>
+<?php
+/* Function used to list pings separated from the comments */
+function list_pings($comment, $args, $depth) {
+       $GLOBALS['comment'] = $comment;
+?>
+        <li id="comment-<?php comment_ID(); ?>" class="ping"><?php comment_author_link(); ?>
+<?php } ?>
+<?php
+$themename = "Ubuntu-US-TN";
+$shortname = "ubuntu_us_tn";
+$options = array (
+array(  "name" => "Theme Options",
+        "type" => "title"),
+
+array(  "type" => "open"),
+
+array(  "name" => "Announcement Text",
+        "desc" => "Choose some the text that will appear at the top of the page. Leave empty for noe.",
+        "id" => $shortname."_announcement_text",
+        "type" => "text",
+        "std" => "Announcement here!"),
+
+array(  "name" => "Footer Phrase",
+        "desc" => "Choose the phrase that will appear at the bottom of the page. Use the <tt>br</tt> tag to force the line break.",
+        "id" => $shortname."_footer_phrase",
+        "type" => "text",
+        "std" => "Powered by Wordpress"),
+
+array(  "type" => "close")
+
+);
+
+
+function mytheme_add_admin() {
+
+    global $themename, $shortname, $options;
+
+    if ( $_GET['page'] == basename(__FILE__) ) {
+
+        if ( 'save' == $_REQUEST['action'] ) {
+
+                foreach ($options as $value) {
+                    update_option( $value['id'], $_REQUEST[ $value['id'] ] ); }
+
+                foreach ($options as $value) {
+                    if( isset( $_REQUEST[ $value['id'] ] ) ) { update_option( $value['id'], $_REQUEST[ $value['id'] ]  ); } else { delete_option( $value['id'] ); } }
+
+                header("Location: themes.php?page=functions.php&saved=true");
+                die;
+
+        } else if( 'reset' == $_REQUEST['action'] ) {
+
+            foreach ($options as $value) {
+                delete_option( $value['id'] ); }
+
+            header("Location: themes.php?page=functions.php&reset=true");
+            die;
+
+        }
+    }
+
+    add_theme_page($themename." Options", "".$themename." Options", 'edit_themes', basename(__FILE__), 'mytheme_admin');
+
+}
+
+function mytheme_admin() {
+
+    global $themename, $shortname, $options;
+
+    if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' settings saved.</strong></p></div>';
+    if ( $_REQUEST['reset'] ) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' settings reset.</strong></p></div>';
+
+?>
+<div class="wrap">
+<h2><?php echo $themename; ?> settings</h2>
+
+<form method="post">
+
+<?php foreach ($options as $value) {
+switch ( $value['type'] ) {
+
+case "open":
+?>
+<table width="100%" border="0" style="background-color:#eef5fb; padding:10px;">
+
+<?php break;
+
+case "close":
+?>
+
+</table><br />
+
+<?php break;
+
+case "title":
+?>
+<table width="100%" border="0" style="background-color:#dceefc; padding:5px 10px;"><tr>
+    <td colspan="2"><h3 style="font-family:Georgia,'Times New Roman',Times,serif;"><?php echo $value['name']; ?></h3></td>
+</tr>
+
+<?php break;
+
+case 'text':
+?>
+
+<tr>
+    <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
+    <td width="80%"><input style="width:400px;" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" type="<?php echo $value['type']; ?>" value="<?php if ( get_settings( $value['id'] ) != "") { echo get_settings( $value['id'] ); } else { echo $value['std']; } ?>" /></td>
+</tr>
+
+<tr>
+    <td><small><?php echo $value['desc']; ?></small></td>
+</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
+
+<?php
+break;
+
+case 'textarea':
+?>
+
+<tr>
+    <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
+    <td width="80%"><textarea name="<?php echo $value['id']; ?>" style="width:400px; height:200px;" type="<?php echo $value['type']; ?>" cols="" rows=""><?php if ( get_settings( $value['id'] ) != "") { echo get_settings( $value['id'] ); } else { echo $value['std']; } ?></textarea></td>
+
+</tr>
+
+<tr>
+    <td><small><?php echo $value['desc']; ?></small></td>
+</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
+
+<?php
+break;
+
+case 'select':
+?>
+<tr>
+    <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
+    <?php $isOptionSelected = false; ?>
+    <td width="80%"><select style="width:240px;" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>"><?php foreach ($value['options'] as $option) { ?><option<?php if ( get_settings( $value['id'] ) == $option) { echo ' selected="selected"'; $isOptionSelected = true; } elseif ($option == $value['std'] && !$isOptionSelected ) { echo ' selected="selected"'; } ?>><?php echo $option; ?></option><?php } ?></select></td>
+</tr>
+
+<tr>
+    <td><small><?php echo $value['desc']; ?></small></td>
+</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
+
+<?php
+break;
+
+case "checkbox":
+?>
+    <tr>
+    <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
+        <td width="80%"><? if(get_settings($value['id'])){ $checked = "checked=\"checked\""; }else{ $checked = ""; } ?>
+                <input type="checkbox" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" value="true" <?php echo $checked; ?> />
+                </td>
+    </tr>
+
+    <tr>
+        <td><small><?php echo $value['desc']; ?></small></td>
+   </tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
+
+<?php         break;
+
+}
+}
+?>
+
+<p class="submit">
+<input name="save" type="submit" value="Save changes" />
+<input type="hidden" name="action" value="save" />
+</p>
+</form>
+<form method="post">
+<p class="submit">
+<input name="reset" type="submit" value="Reset" />
+<input type="hidden" name="action" value="reset" />
+</p>
+</form>
+
+<?php
+}
+
+add_action('admin_menu', 'mytheme_add_admin'); ?>

=== modified file 'news/wp-content/themes/ubuntu-us-tn/header.php'
--- news/wp-content/themes/ubuntu-us-tn/header.php	2009-09-09 20:30:13 +0000
+++ news/wp-content/themes/ubuntu-us-tn/header.php	2009-09-10 13:27:35 +0000
@@ -1,13 +1,16 @@
+<?php
+global $options;
+foreach ($options as $value) {
+    if (get_settings( $value['id'] ) === FALSE) { $$value['id'] = $value['std']; } else { $$value['id'] = get_settings( $value['id'] ); }
+}
+?>
 <!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" <?php language_attributes(); ?>>
 <head profile="http://gmpg.org/xfn/11">
 <link rel="icon" href="favicon.ico" type="image/x-icon"> 
-<meta name="verify-v1" content="c2F4BIhbzzY3xg1R58p8rOuYxaF4K7xr3qcQMH8v3PA=" />
-<meta name="msvalidate.01" content="0D691860E18010B8D23550E0E9C190CD" />
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
 <title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title>
 <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
-<meta name="verify-v1" content="n63oSkyWHnaocf2whEYQzxOXIECYXsU9Zk1vK/iSfx4=" />
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="all" />
 <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
@@ -28,4 +31,4 @@
 		</ul>
 	</div>
 <div class="content">
-<div id="announcement"><h3>NEXT TEAM MEETING: October 7th 8PM EST 7PM CST </h3></div>
\ No newline at end of file
+<div id="announcement"><h3><?php print($ubuntu_us_tn_announcement_text); ?></h3></div>

=== added file 'news/wp-content/themes/ubuntu-us-tn/screenshot.gif'
Binary files news/wp-content/themes/ubuntu-us-tn/screenshot.gif	1970-01-01 00:00:00 +0000 and news/wp-content/themes/ubuntu-us-tn/screenshot.gif	2009-09-10 13:27:35 +0000 differ
=== modified file 'news/wp-content/themes/ubuntu-us-tn/sidebar.php'
--- news/wp-content/themes/ubuntu-us-tn/sidebar.php	2009-09-09 20:30:13 +0000
+++ news/wp-content/themes/ubuntu-us-tn/sidebar.php	2009-09-10 13:27:35 +0000
@@ -1,10 +1,16 @@
 <?php if ( is_dynamic_sidebar() ) : ?>
+<div class="boxes">
 <div class="lbox">
-	<h3>Lbox</h3>
-	<p>Do something with me!</p>
+	<h3>Quick Links</h3>
+	<ul>
+	<li>Launchpad</li>
+	<li>etc.</li>
+	<li>etc.</li>
+	</ul>
 </div>
 <div class="rbox">
 	<h3>Rbox</h3>
 	<p>Do something with me!</p>
 </div>
+</div>
 <?php endif; ?>	
\ No newline at end of file

=== modified file 'news/wp-content/themes/ubuntu-us-tn/style.css'
--- news/wp-content/themes/ubuntu-us-tn/style.css	2009-09-09 20:30:13 +0000
+++ news/wp-content/themes/ubuntu-us-tn/style.css	2009-09-10 13:27:35 +0000
@@ -7,10 +7,11 @@
 body {
 	margin: 0;
 	padding-top: 10px;
-	padding-left: 10px;
-	padding-right: 10px;
+	padding-bottom: 10px;
+	padding-left: 15px;
+	padding-right: 15px;
+	background-color: #DCD4B0;
 	font-family: serif;
-	background-color: #DCD4B0;
 	font-size: 13px;
 	}
 img {
@@ -21,9 +22,6 @@
 	color: #555;
 	font-style: normal;
 	}
-.clear {
-	clear: both;
-	}
 
 /* The Wrapper */
 
@@ -37,8 +35,8 @@
 
 #top {
 	height: 210px;
-	margin: auto;
-	background-color: white;
+	margin: auto;    
+	background-color: #F1F1DD;
 	border-radius-topleft: 15px; 
 	border-radius-topright: 15px; 
 	-webkit-border-top-right-radius: 15px;
@@ -65,10 +63,10 @@
 }
 
 .content {
-	padding-top: 30px;
+	background-color: #F1F1DD;
+	padding-top: 25px;
 	padding-left: 20px;
 	padding-right: 20px;
-	background: white;
 	min-height: 350px;
 	}	
 
@@ -77,7 +75,6 @@
 #menu {
 	display: block;
 	width: 100%;
-	background-color: white;
 	margin: 0px;
 	}
 #menu ul {
@@ -98,48 +95,37 @@
 	color: #D3000E;
 	text-align: center;
 	text-decoration: none;
-	padding: 7px 10px 0 10px;
+	padding: 5px 10px 0 10px;
 	width: auto;
-	height: 20px;
 	font-family: sans-serif;
-	font-size: 16pt;
+	font-size: 14pt;
 	font-weight: bold;
 	}
 #menu ul li a:hover,#menu ul li.current_page_item a {
 	color: #FF6209; 
-	background-color: white;
 	text-align: center;
 	}
-#menu ul li .current_page_item a,#menu ul li .current_page_item a:hover{
-	color: white;
-	}
 
 #content {
 	margin: auto;
-	width: 70%;
+	width: 60%;
 	}
 
-.sub {
-	float: left;
-	width: auto;
-	height: 14px;
-	font-size: 14px;
-	font-family: sans-serif;
-	padding-left: 0px;
-	padding-top: 0px;
-	font-weight: normal;
-   	color: #83730a;
-	}	
-	
 /* The Sidebar */
+.boxes h1, .boxes h2, .boxes h3{
+	margin: 0;
+	background-color: #808080;
+	-moz-border-radius: 5px;
+	padding: 3px;
+	}
 .lbox {
 	float: left;
-	width: 15%;
+	width: 16%;
 	font-family: sans-serif;
 	}
 .rbox {
 	float: right;
-	width: 15%;
+	width: 16%;
 	font-family: sans-serif;
 	}
 /* --- FOOTER --- */
@@ -158,22 +144,6 @@
 	-moz-border-radius-bottomright: 15px; 
 	}
 
-/* The Navigation */
-
-.navigation {
-	height: 25px;
-	padding: 0 20px;
-	}
-.navigation a {
-	font-weight: bold;
-	text-decoration: none;
-	font-size: 14px;
-	color: #1459a7;
-	}
-.navigation a:hover {
-	color: #3f5d65;
-	}
-
 /* The Page Title */
 
 h2.pagetitle {