diff -r inove-orig/404.php inove-chad/404.php
1c1,2
< <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
---
> <?php get_header(); ?>
> <?php $options = get_option('inove_options'); ?>
3,31c4,6
< <html xmlns="http://www.w3.org/1999/xhtml">
< <head profile="http://gmpg.org/xfn/11">
< 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
< 
< 	<title><?php bloginfo('name'); ?><?php wp_title(); ?></title>
< 	<link rel="alternate" type="application/rss+xml" title="<?php _e('RSS 2.0 - all posts', 'inove'); ?>" href="<?php echo $feed; ?>" />
< 	<link rel="alternate" type="application/rss+xml" title="<?php _e('RSS 2.0 - all comments', 'inove'); ?>" href="<?php bloginfo('comments_rss2_url'); ?>" />
< 
< 	<!-- style START -->
< 	<link rel="stylesheet" href="<?php bloginfo('template_url'); ?>/404.css" type="text/css" media="screen" />
< 	<!-- style END -->
< 
< 	<?php wp_head(); ?>
< </head>
< 
< <body>
< 
< <div id="container">
< 	<div id="talker">
< 		<a href="http://www.neoease.com/"><img src="http://farm3.static.flickr.com/2114/2303427067_c817d7fb51_m.jpg" alt="<?php _e('Talker', 'inove'); ?>" /></a>
< 	</div>
< 	<div id="notice">
< 		<h1><?php _e('Welcome to 404 error page!', 'inove'); ?></h1>
< 		<p><?php _e("Welcome to this customized error page. You've reached this page because you've clicked on a link that does not exist. This is probably our fault... but instead of showing you the basic '404 Error' page that is confusing and doesn't really explain anything, we've created this page to explain what went wrong.", 'inove'); ?></p>
< 		<p><?php _e("You can either (a) click on the 'back' button in your browser and try to navigate through our site in a different direction, or (b) click on the following link to go to homepage.", 'inove'); ?></p>
< 		<div class="back">
< 			<a href="<?php bloginfo('url'); ?>/"><?php _e('Back to homepage &raquo;', 'inove'); ?></a>
< 		</div>
< 		<div class="fixed"></div>
---
> 	<div class="errorbox">
>         <?php //phpinfo(); ?>
> 		<?php _e('Sorry, cannot find what you are looking for.', 'inove'); ?>
32a8,15
> 
> <div id="pagenavi">
> 	<?php if(function_exists('wp_pagenavi')) : ?>
> 		<?php wp_pagenavi() ?>
> 	<?php else : ?>
> 		<span class="newer"><?php previous_posts_link(__('Newer Entries', 'inove')); ?></span>
> 		<span class="older"><?php next_posts_link(__('Older Entries', 'inove')); ?></span>
> 	<?php endif; ?>
36,37c19
< </body>
< </html>
---
> <?php get_footer(); ?>
diff -r inove-orig/archive.php inove-chad/archive.php
4,6c4,6
< <div class="boxcaption"><h3><?php _e('Archive', 'inove'); ?></h3></div>
< <div class="box">
< 	<?php
---
> <div class="boxcaption"><h3><?php
>     // old boxcaption h3:  _e('Archive', 'inove');   -chad
> 
9c9,10
< 		printf( __('Archive for the &#8216;%1$s&#8217; Category', 'inove'), single_cat_title('', false) );
---
> 		printf( __('Archive for the &#8216;%1$s&#8217; Category: <nobr>%2$s</nobr>', 'inove'), 
>                 single_cat_title('', false), strip_tags(category_description()) );
29c30,32
< 	?>
---
>     ?></h3></div>
> <div class="box">
> <?php include (TEMPLATEPATH . "/searchresultsummary.php"); ?>
38a42
>                     <? include(dirname(__FILE__).'/stub-tags-categories.php'); ?>
48,49d51
< 					<span class="categories"><?php the_category(', '); ?></span>
< 					<span class="tags"><?php the_tags('', ', ', ''); ?></span>
Only in inove-chad/: check_for_tag_404.php
diff -r inove-orig/footer.php inove-chad/footer.php
39a40
> <?php wp_footer(); ?>
diff -r inove-orig/functions.php inove-chad/functions.php
325a326,327
> add_action ('template_redirect', 'check_for_tag_404');
> include(dirname(__FILE__).'/check_for_tag_404.php');
diff -r inove-orig/header.php inove-chad/header.php
71a72,74
> <!--
> 	    <div id="captionright"> Latest: Covered in Snow, once again <a href="">1 day ago</a> </div>
> -->
95a99
> <!--
97a102,105
> -->
> <input type="text" class="textfield" name="s"  size="24" value="To search, type and hit enter" onfocus="if (this.value == 'To search, type and hit enter') {this.value = '';}" onblur="if (this.value == '') {this.value = 'To search, type and hit enter';}" />
> 					<a class="switcher" ><?php _e('Switcher', 'inove'); ?></a>
> 
diff -r inove-orig/index.php inove-chad/index.php
19a20
>                     <? include(dirname(__FILE__).'/stub-tags-categories.php'); ?>
29,30d29
< 					<?php if ($options['categories']) : ?><span class="categories"><?php the_category(', '); ?></span><?php endif; ?>
< 					<?php if ($options['tags']) : ?><span class="tags"><?php the_tags('', ', ', ''); ?></span><?php endif; ?>
diff -r inove-orig/page.php inove-chad/page.php
7c7
< 		<h2><?php the_title(); ?></h2>
---
> 		<h2><?php the_title(); ?></h2> 
8a9
> <!-- chad don't like pages to look like posts
15d15
< 				<?php edit_post_link(__('Edit', 'inove'), '<span class="editpost">', '</span>'); ?>
16a17
> 				<?php edit_post_link(__('Edit', 'inove'), '<span class="editpost">', '</span>'); ?>
17a19
> -->
30a33
> 				<?php edit_post_link(__('Edit', 'inove'), '<span class="editpost">', '</span>'); ?>
diff -r inove-orig/search.php inove-chad/search.php
4,5c4,10
< <div class="boxcaption"><h3><?php _e('Search Results', 'inove'); ?></h3></div>
< <div class="box"><?php printf( __('Keyword: &#8216;%1$s&#8217;', 'inove'), wp_specialchars($s, 1) ); ?></div>
---
> <div class="boxcaption"><h3><?php 
>   // old _e('Search Results', 'inove');  -chad
>   printf( __('Search Results for: &#8216;%1$s&#8217;', 'inove'), wp_specialchars($s, 1) ); 
> ?></h3></div>
> <div class="box">
> <?php include (TEMPLATEPATH . "/searchresultsummary.php"); ?>
> </div>
13a19
>                     <? include(dirname(__FILE__).'/stub-tags-categories.php'); ?>
23,24d28
< 					<span class="categories"><?php the_category(', '); ?></span>
< 					<span class="tags"><?php the_tags('', ', ', ''); ?></span>
Only in inove-chad/: searchresultsummary.php
diff -r inove-orig/sidebar.php inove-chad/sidebar.php
20,40c20,24
< 
< 	<!-- feeds -->
< 	<div class="widget feeds_weight">
< 		<div class="content">
< 			<a title="<?php _e('Subscribe to this blog...', 'inove'); ?>" id="feedrss" href="feed:<?php echo $feed; ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed', 'inove'); ?></a>
< 			<?php if($options['feed_email'] && $options['feed_url_email']) : ?>
< 				<a title="<?php _e('Subscribe to this blog via email...', 'inove'); ?>" id="feedemail" href="<?php echo $options['feed_url_email']; ?>"><?php _e('Email feed', 'inove'); ?></a>
< 			<?php endif; ?>
< 			<!--
< 			<div class="fixed"></div>
< 			<div id="feed_readers">
< 				<a class="reader first" title="<?php _e('Subscribe with ', 'inove'); _e('Google', 'inove'); ?>" href="http://fusion.google.com/add?feedurl=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_google.gif" alt="<?php _e('Google', 'inove'); ?>" /></a>
< 				<a class="reader" title="<?php _e('Subscribe with ', 'inove'); _e('Youdao', 'inove'); ?>" href="http://reader.youdao.com/#url=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_youdao.gif" alt="<?php _e('Youdao', 'inove'); ?>" /></a>
< 				<a class="reader" title="<?php _e('Subscribe with ', 'inove'); _e('Xian Guo', 'inove'); ?>" href="http://www.xianguo.com/subscribe.php?url=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_xianguo.gif" alt="<?php _e('Xian Guo', 'inove'); ?>" /></a>
< 				<a class="reader" title="<?php _e('Subscribe with ', 'inove'); _e('Zhua Xia', 'inove'); ?>" href="http://www.zhuaxia.com/add_channel.php?url=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_zhuaxia.gif" alt="<?php _e('Zhua Xia', 'inove'); ?>" /></a>
< 			</div>
< 			-->
< 			<div class="fixed"></div>
< 		</div>
< 	</div>
< 
---
>         <div class="widget widget_categories">
>           <strong><a href="http://twitter.com/chadnorwood">Latest</a></strong>: <?php aktt_latest_tweet(); ?>
>         </div>
> <!--
> -->
114a99
> <!-- don't autofill my sidebar!! -chad 
120a106
> -->
130a117
> <!-- don't autofill my sidebar!! -chad 
136a124
> -->
157a146,169
> 
> 
> 	<!-- feeds - moved from begining of sidebar north - chad -->
> 	<div class="widget feeds_weight">
> 		<div class="content">
> 			<a title="<?php _e('Subscribe to this blog...', 'inove'); ?>" id="feedrss" href="<?php echo $feed; ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed', 'inove'); ?></a>
> 			<?php if($options['feed_email'] && $options['feed_url_email']) : ?>
> 				<a title="<?php _e('Subscribe to this blog via email...', 'inove'); ?>" id="feedemail" href="<?php echo $options['feed_url_email']; ?>"><?php _e('Email feed', 'inove'); ?></a>
> 
> 			<?php endif; ?>
> 			<!--
> 			<div class="fixed"></div>
> 			<div id="feed_readers">
> 				<a class="reader first" title="<?php _e('Subscribe with ', 'inove'); _e('Google', 'inove'); ?>" href="http://fusion.google.com/add?feedurl=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_google.gif" alt="<?php _e('Google', 'inove'); ?>" /></a>
> 				<a class="reader" title="<?php _e('Subscribe with ', 'inove'); _e('Youdao', 'inove'); ?>" href="http://reader.youdao.com/#url=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_youdao.gif" alt="<?php _e('Youdao', 'inove'); ?>" /></a>
> 				<a class="reader" title="<?php _e('Subscribe with ', 'inove'); _e('Xian Guo', 'inove'); ?>" href="http://www.xianguo.com/subscribe.php?url=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_xianguo.gif" alt="<?php _e('Xian Guo', 'inove'); ?>" /></a>
> 				<a class="reader" title="<?php _e('Subscribe with ', 'inove'); _e('Zhua Xia', 'inove'); ?>" href="http://www.zhuaxia.com/add_channel.php?url=<?php echo $feed; ?>"><img src="<?php bloginfo('template_url'); ?>/img/feed_zhuaxia.gif" alt="<?php _e('Zhua Xia', 'inove'); ?>" /></a>
> 			</div>
> 			-->
> 			<div class="fixed"></div>
> 		</div>
> 	</div>
>     <!-- end feeds -->
> 
162c174
< <!-- sidebar END -->
---
> <!-- sidebar END -->
diff -r inove-orig/single.php inove-chad/single.php
5a6
> <!-- not a big fan of post path, since i moved tags/categories to top of post -chad
11c12
< 
---
> -->
16a18
> <!-- suppress comments links
20a23,24
> -->
> <? include(dirname(__FILE__).'/stub-tags-categories.php'); ?>
29,30c33
< 				<?php if ($options['categories']) : ?><span class="categories"><?php the_category(', '); ?></span><?php endif; ?>
< 				<?php if ($options['tags']) : ?><span class="tags"><?php the_tags('', ', ', ''); ?></span><?php endif; ?>
---
> <!-- tags and categories used to be here, moved to top of post -->
Only in inove-chad/: stub-tags-categories.php
diff -r inove-orig/style.css inove-chad/style.css
2c2
< Theme Name: iNove
---
> Theme Name: iNove-chad
4,6c4,6
< Description: Inspired by MacZone, created by <a href="http://www.neoease.com/">mg12</a>. It is very stylish, widget supported and doesn’t require any plugin.
< Version: 1.0.5
< Author: mg12
---
> Description: Inspired by MacZone, created by <a href="http://www.neoease.com/">mg12</a>. It is very stylish, widget supported and doesn’t require any plugin.  Modified slightly by chad
> Version: 1.0.5b
> Author: mg12, chad
182a183,185
> #captionright {
> 	float:right;
> }
361a365,371
> 
> 
> .post .content ul, 
> .post .content ol {
> 	padding-left:32px;
> 	padding-bottom:10px;
> }
363c373,380
< .post .content ol li {
---
> .post .contentl ol li {
> /*
> don't work
> 	display:inline;
> 	list-style:none;
> 	list-style-position:outside;
> 	padding:2px 0;
> moved the following orig functionality to ul ol above -chad
365a383
> */
840a859,874
> 
> .searchresults ol,
> .searchresults ul  {
> /*
> 	background:#F4F5F7 url(img/box.gif) 100% 100% no-repeat;
> 	background:url(img/icons.gif) 0 -160px no-repeat;
> 	background:none;
> */
> }
> .searchresults ul li {
> 	margin-top:2px;
> 	padding-left:21px;
> 	background:url(img/icons.gif) 0 -320px no-repeat;
> 	list-style:none;
> }
> 
