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

[mac9416]

[mac9416 (mac9416)]

Improved sidebars, corrected background color, and added a theme control panel for quick editing of announcement and footer text.

[mac9416 (mac9416)]

Clarification: I did all that in the Wordpress theme. ;-)

On Wed, Sep 9, 2009 at 1:10 PM, mac9416<email address hidden> wrote:
> mac9416 has proposed merging lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn.
>
> Requested reviews:
>    TennesseeTeam (tennessee.team)
>
> Improved sidebars, corrected background color, and added a theme control panel for quick editing of announcement and footer text.
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11459
> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>

[Christopher Lunsford (binarymutant)]

Can you review my changes first, I've added wordpress to the repo under news/ and moved your theme into the correct wordpress directory

review: Needs Resubmitting

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

15. By mac9416 on 2009-09-09

WP theme: random code cleanup

16. By mac9416 on 2009-09-10

Merged with latest revisions

17. By mac9416 on 2009-09-10

WP theme: stopped content bg from seperating from footer bg

Unmerged revisions

17. By mac9416 on 2009-09-10

WP theme: stopped content bg from seperating from footer bg

16. By mac9416 on 2009-09-10

Merged with latest revisions

15. By mac9416 on 2009-09-09

WP theme: random code cleanup

14. By mac9416 on 2009-09-09

WP theme: added theme control panel

13. By mac9416 on 2009-09-09

WP theme: improved sidebars

12. By mac9416 on 2009-09-08

WP theme: changed content background color

11. By mac9416 on 2009-09-08

Added Wordpress theme

=== added directory 'wp-theme'
=== added directory 'wp-theme/ubuntu-us-tn'
=== added file 'wp-theme/ubuntu-us-tn/404.php'
--- wp-theme/ubuntu-us-tn/404.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/404.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,12 @@
+<?php get_header(); ?>
+
+<?php get_sidebar(); ?>
+
+<div class="text">
+
+	<h1 class="title">Not Found</h1>
+	<p>The page you are looking is not here..</p>
+
+</div>
+
+<?php get_footer(); ?>
\ No newline at end of file

=== added file 'wp-theme/ubuntu-us-tn/archive.php'
--- wp-theme/ubuntu-us-tn/archive.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/archive.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,68 @@
+<?php get_header(); ?>
+
+<?php get_sidebar(); ?>
+<div id="content"><a name="content"></a>
+<?php if (have_posts()) : ?>
+
+		 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
+<?php /* If this is a category archive */ if (is_category()) { ?>
+		<h2 class="pagetitle">Archive for the &#8216;<?php echo single_cat_title(); ?>&#8217; Category</h2>
+
+ 	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
+		<h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
+
+	 <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
+		<h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
+
+		<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
+		<h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
+
+	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
+		<h2 class="pagetitle">Author Archive</h2>
+
+		<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+		<h2 class="pagetitle">Blog Archives</h2>
+
+		<?php } ?>
+
+		<?php while (have_posts()) : the_post(); ?>
+<div class="post" id="post-<?php the_ID(); ?>">
+<div class="date">
+<?php the_time('M'); ?><br /><span class="day"><?php the_time('d'); ?></span></div>
+<div class="title">
+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+
+<div class="sub"><span>Posted by <?php the_author(); ?> under <?php the_category(', '); ?></span></div>	
+
+</div>
+<div class="cover">
+<div class="entry">
+					<?php the_content('Read the rest of this entry &raquo;'); ?>
+				
+</div>
+
+</div>
+<div class="postinfo">
+					<div class="edit"><?php edit_post_link('Edit this entry', '&#124; ', ''); ?> </div>
+					<div class="com"><?php comments_popup_link('ADD COMMENTS', '1 COMMENT', '% COMMENTS'); ?></div>
+</div>
+
+
+</div>
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
+			<div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+		</div>
+
+	<?php else : ?>
+
+		<h1 class="title">Not Found</h1>
+		<p>Sorry, but you are looking for something that isn't here.</p>
+
+	<?php endif; ?>
+
+</div>
+
+<?php get_footer(); ?>
\ No newline at end of file

=== added file 'wp-theme/ubuntu-us-tn/comments.php'
--- wp-theme/ubuntu-us-tn/comments.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/comments.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,100 @@
+<?php // Do not delete these lines
+	if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+		die ('Please do not load this page directly. Thanks!');
+
+	if (!empty($post->post_password)) { // if there's a password
+		if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
+			?>
+
+			<p class="nocomments">This post is password protected. Enter the password to view comments.<p>
+
+			<?php
+			return;
+		}
+	}
+
+	/* This variable is for alternating comment background */
+	$oddcomment = 'alt';
+?>
+
+<!-- You can start editing here. -->
+
+<div class="comments" id="comments">
+
+<?php if ($comments) : ?>
+	<ol>
+
+	<?php foreach ($comments as $comment) : ?>
+
+		<li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
+			<strong><?php comment_author_link() ?></strong> Said,
+			<?php if ($comment->comment_approved == '0') : ?>
+			<p><em>Your comment is awaiting moderation.</em></p>
+			<?php endif; ?>
+
+			<?php comment_text() ?>
+
+		</li>
+
+	<?php /* Changes every other comment to a different class */
+		if ('alt' == $oddcomment) $oddcomment = '';
+		else $oddcomment = 'alt';
+	?>
+
+	<?php endforeach; /* end for each comment */ ?>
+
+	</ol>
+
+ <?php else : // this is displayed if there are no comments so far ?>
+
+	<?php if ('open' == $post->comment_status) : ?>
+		<!-- If comments are open, but there are no comments. -->
+
+	 <?php else : // comments are closed ?>
+		<!-- If comments are closed. -->
+		<p class="nocomments">Comments are closed.</p>
+
+	<?php endif; ?>
+<?php endif; ?>
+
+
+<?php if ('open' == $post->comment_status) : ?>
+
+<h2 id="respond">Add A Comment</h2>
+
+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
+<?php else : ?>
+
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+
+<?php if ( $user_ID ) : ?>
+
+<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
+
+<?php else : ?>
+
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" /> <label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" /> <label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" /> <label for="url"><small>Website</small></label></p>
+
+<?php endif; ?>
+
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
+
+<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
+
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Post" />
+<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+</p>
+<?php do_action('comment_form', $post->ID); ?>
+
+</form>
+
+<?php endif; // If registration required and not logged in ?>
+
+<?php endif; // if you delete this the sky will fall on your head ?>
+
+</div>
\ No newline at end of file

=== added file 'wp-theme/ubuntu-us-tn/footer.php'
--- wp-theme/ubuntu-us-tn/footer.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/footer.php	2009-09-09 17:59:24 +0000
@@ -0,0 +1,27 @@
+<?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"><?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

=== added file 'wp-theme/ubuntu-us-tn/functions.php'
--- wp-theme/ubuntu-us-tn/functions.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/functions.php	2009-09-09 17:59:24 +0000
@@ -0,0 +1,189 @@
+<?php
+if ( function_exists('register_sidebar') )
+     register_sidebar(array('name'=>'Sidebar'));
+
+if ( !is_admin() ) wp_deregister_script('jquery');
+?>
+<?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'); ?>

=== added file 'wp-theme/ubuntu-us-tn/header.php'
--- wp-theme/ubuntu-us-tn/header.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/header.php	2009-09-09 17:59:24 +0000
@@ -0,0 +1,37 @@
+<?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'); ?>" />
+
+	<?php wp_get_archives('type=monthly&format=link'); ?>
+	<?php //comments_popup_script(); // off by default ?>
+	<?php wp_head(); ?>
+</head>
+<body>
+<div id="wrapper">
+<div id="top">
+	<a href="<?php bloginfo('siteurl');?>/"><img alt="Ubuntu Tennessee" src="<?php bloginfo('stylesheet_directory'); ?>/images/tnbanner.png" /></a>
+</div>
+	<div id="menu">
+			<ul>
+		<?php if (is_page()) { $highlight = "page_item"; } else {$highlight = "page_item current_page_item"; } ?>
+			<?php wp_list_pages('exclude='.get_page_by_title('Sitemap')->ID.','.get_page_by_title('Our Logo')->ID.'&sort_column=menu_order&depth=1&title_li='); ?>
+		</ul>
+	</div>
+<div class="content">
+<div id="announcement"><h3><?php print($ubuntu_us_tn_announcement_text); ?></h3></div>
\ No newline at end of file

=== added directory 'wp-theme/ubuntu-us-tn/images'
=== added file 'wp-theme/ubuntu-us-tn/images/blank.gif'
Binary files wp-theme/ubuntu-us-tn/images/blank.gif	1970-01-01 00:00:00 +0000 and wp-theme/ubuntu-us-tn/images/blank.gif	2009-09-08 13:09:12 +0000 differ
=== added file 'wp-theme/ubuntu-us-tn/images/tnbanner.png'
Binary files wp-theme/ubuntu-us-tn/images/tnbanner.png	1970-01-01 00:00:00 +0000 and wp-theme/ubuntu-us-tn/images/tnbanner.png	2009-09-08 13:09:12 +0000 differ
=== added file 'wp-theme/ubuntu-us-tn/index.php'
--- wp-theme/ubuntu-us-tn/index.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/index.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,38 @@
+<?php get_header(); ?>
+<?php get_sidebar(); ?>
+<div id="content"><a name="content"></a>
+<?php if (have_posts()) : ?>
+
+<?php while (have_posts()) : the_post(); ?>
+<div class="post" id="post-<?php the_ID(); ?>">
+<div class="title">
+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+
+</div>
+<div class="cover">
+<div class="entry">
+					<?php the_content('Read the rest of this entry &raquo;'); ?>
+</div>
+</div>
+</div>
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
+			<div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+		</div>
+
+	<?php else : ?>
+
+		<div class="post">
+			<h1 class="title">Not Found</h1>
+			<p>YOU are looking for something that ISN'T HERE.</p>
+		</div>
+
+	<?php endif; ?>	
+
+</div>
+
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>

=== added file 'wp-theme/ubuntu-us-tn/page.php'
--- wp-theme/ubuntu-us-tn/page.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/page.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,27 @@
+<?php get_header(); ?>
+
+<?php get_sidebar(); ?>
+
+<div id="content"><a name="content"></a>
+<?php if (have_posts()) : ?>
+
+<?php while (have_posts()) : the_post(); ?>
+<div class="post" id="post-<?php the_ID(); ?>">
+<div class="title">
+<!--<h1><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h1>-->
+
+</div>
+<div class="cover">
+<div class="entry">
+					<?php the_content('Read the rest of this entry &raquo;'); ?>
+				
+</div>
+
+</div>
+<div class="postinfo"></div>
+</div>
+		<?php endwhile; endif; ?>
+						
+</div>
+
+<?php get_footer(); ?>
\ No newline at end of file

=== added file 'wp-theme/ubuntu-us-tn/screenshot.gif'
Binary files wp-theme/ubuntu-us-tn/screenshot.gif	1970-01-01 00:00:00 +0000 and wp-theme/ubuntu-us-tn/screenshot.gif	2009-09-08 13:09:12 +0000 differ
=== added file 'wp-theme/ubuntu-us-tn/search.php'
--- wp-theme/ubuntu-us-tn/search.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/search.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,49 @@
+<?php get_header(); ?>
+
+<?php get_sidebar(); ?>
+
+<div id="content"><a name="content"></a>
+<?php if (have_posts()) : ?>
+		<h2 class="pagetitle">Search Results</h2>
+<?php while (have_posts()) : the_post(); ?>
+<div class="post" id="post-<?php the_ID(); ?>">
+<div class="date">
+<?php the_time('M'); ?><br /><span class="day"><?php the_time('d'); ?></span></div>
+<div class="title">
+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+
+<div class="sub"><span>Posted by <?php the_author(); ?> under <?php the_category(', '); ?></span></div>	
+
+</div>
+<div class="cover">
+<div class="entry">
+					<?php the_content('Read the rest of this entry &raquo;'); ?>
+				
+</div>
+
+</div>
+<div class="postinfo">
+					<div class="edit"><?php edit_post_link('Edit this entry', '&#124; ', ''); ?> </div>
+					<div class="com"><?php comments_popup_link('ADD COMMENTS', '1 COMMENT', '% COMMENTS'); ?></div>
+</div>
+
+
+
+</div>
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
+			<div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
+		</div>
+
+	<?php else : ?>
+
+		<h1 class="title">Not Found</h1>
+		<p>Sorry, no post matched your criteria. Try a different search?</p>
+
+	<?php endif; ?>
+
+</div>
+
+<?php get_footer(); ?>
\ No newline at end of file

=== added file 'wp-theme/ubuntu-us-tn/sidebar.php'
--- wp-theme/ubuntu-us-tn/sidebar.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/sidebar.php	2009-09-09 01:44:01 +0000
@@ -0,0 +1,16 @@
+<?php if ( is_dynamic_sidebar() ) : ?>
+<div class="boxes">
+<div class="lbox">
+	<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

=== added file 'wp-theme/ubuntu-us-tn/single.php'
--- wp-theme/ubuntu-us-tn/single.php	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/single.php	2009-09-08 13:09:12 +0000
@@ -0,0 +1,35 @@
+<?php get_header(); ?>
+
+<?php get_sidebar(); ?>
+<div id="content"><a name="content"></a>
+<?php if (have_posts()) : ?>
+
+<?php while (have_posts()) : the_post(); ?>
+<div class="post" id="post-<?php the_ID(); ?>">
+<div class="title">
+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+
+</div>
+<div class="cover">
+<div class="entry">
+					<?php the_content('Read the rest of this entry &raquo;'); ?>
+</div>
+</div>
+<div class="postinfo">
+				<div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
+			<div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
+</div>
+
+
+</div>
+<?php comments_template(); ?>
+	<?php endwhile; else: ?>
+
+		<h1 class="title">Not Found</h1>
+		<p>I'm Sorry,  YOU are looking for something that ISN'T HERE. </p>
+
+<?php endif; ?>
+
+</div>
+
+<?php get_footer(); ?>
\ No newline at end of file

=== added file 'wp-theme/ubuntu-us-tn/style.css'
--- wp-theme/ubuntu-us-tn/style.css	1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/style.css	2009-09-09 01:44:01 +0000
@@ -0,0 +1,163 @@
+/*
+Theme Name: Ubuntu-US-TN
+Description: 2-column Ubuntu-esque theme
+Author: mac9416
+*/
+
+body {
+	margin: 0;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 15px;
+	padding-right: 15px;
+	background-color: #DCD4B0;
+	font-family: serif;
+	font-size: 13px;
+	}
+img {
+	border: 0;
+	}
+blockquote {
+	padding-left: 10px;
+	color: #555;
+	font-style: normal;
+	}
+
+/* The Wrapper */
+
+#wrapper {
+	padding-left: 20px;
+	padding-right: 20px;
+	margin: 0 auto;
+	}
+
+/* The Top */
+
+#top {
+	height: 210px;
+	margin: auto;    
+	background-color: #F1F1DD;
+	border-radius-topleft: 15px; 
+	border-radius-topright: 15px; 
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+	-moz-border-radius-topleft: 15px; 
+	-moz-border-radius-topright: 15px; 
+	}
+#top img {    
+	display: block;
+	padding-top: 5px;
+	margin-left: auto;
+	margin-right: auto;
+	border: none;
+	}
+
+#announcement {
+	display: block;
+	width: 100%;
+	background-color: #F5CD2E;
+	text-align: center;
+	margin: 0px;
+	padding: 0px;
+	font-weight: bold;
+}
+
+.content {
+	background-color: #F1F1DD;
+	padding-top: 25px;
+	padding-left: 20px;
+	padding-right: 20px;
+	min-height: 350px;
+	}	
+
+/* The Menu */
+
+#menu {
+	display: block;
+	width: 100%;
+	margin: 0px;
+	}
+#menu ul {
+	margin: 0px;
+	list-style-type: none;
+	width: auto;
+	float: left;
+	}
+#menu ul li{
+	display: block;
+	float: left;
+	margin: 0 0 0 2px;
+	width: auto;
+	}
+#menu ul li a{
+	display: block;
+	float: left;
+	color: #D3000E;
+	text-align: center;
+	text-decoration: none;
+	padding: 5px 10px 0 10px;
+	width: auto;
+	font-family: sans-serif;
+	font-size: 14pt;
+	font-weight: bold;
+	}
+#menu ul li a:hover,#menu ul li.current_page_item a {
+	color: #FF6209; 
+	text-align: center;
+	}
+
+#content {
+	margin: auto;
+	width: 60%;
+	}
+
+/* The Sidebar */
+.boxes h1, .boxes h2, .boxes h3{
+	margin: 0;
+	background-color: #808080;
+	-moz-border-radius: 5px;
+	padding: 3px;
+	}
+.lbox {
+	float: left;
+	width: 16%;
+	font-family: sans-serif;
+	}
+.rbox {
+	float: right;
+	width: 16%;
+	font-family: sans-serif;
+	}
+/* --- FOOTER --- */
+
+#footer {
+	color: white;
+	background-color: #2f2f2f;
+	font-size: 8pt;
+	font-weight: normal;
+	text-align: center;
+	border-radius-bottomleft: 15px; 
+	border-radius-bottomright: 15px; 
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+	-moz-border-radius-bottomleft: 15px; 
+	-moz-border-radius-bottomright: 15px; 
+	}
+
+/* The Page Title */
+
+h2.pagetitle {
+	padding: 0;
+	margin: 0 0 20px 0;
+	font-size: 25px;
+	text-align: center;
+	}
+
+.alignright {
+	float: right;
+	width: auto;
+	}
+.alignleft {
+	float: left;
+	width: auto;
+}
\ No newline at end of file